Add json converter and relicense to lgpl2.1

iLexiconn · iLexiconn · commit 6886a65a3e15 · 2016-08-28T23:17:33.000+02:00
diff --git a/LICENSE b/LICENSE
diff --git a/build.gradle b/build.gradle
@@ -31,11 +31,11 @@ archivesBaseName = "orespawn"
 sourceCompatibility = targetCompatibility = "1.8"
 
 class Secrets {
-	def data = null
+    def data = null
 
-	def getProperty(String key) {
-		return data ? data[key] : ""
-	}
+    def getProperty(String key) {
+        return data ? data[key] : ""
+    }
 }
 
 import groovy.json.JsonSlurper
@@ -49,9 +49,9 @@ if (System.getenv().SECRET_FILE) {
 
 project.ext.secret = new Secrets()
 if (secretFile.exists()) {
-	secretFile.withReader {
-		project.ext.secret.data = new JsonSlurper().parse it
-	}
+    secretFile.withReader {
+        project.ext.secret.data = new JsonSlurper().parse it
+    }
 }
 
 minecraft {
@@ -145,6 +145,9 @@ curseforge {
         releaseType = "alpha"
         addGameVersion("1.10.2")
         def displayVersion = getVersion("VERSION", mod_file)
+        if (System.getenv().BUILD_NUMBER) {
+            displayVersion += "." + System.getenv().BUILD_NUMBER
+        }
         mainArtifact(jar) {
             displayName = "OreSpawn $displayVersion"
         }
diff --git a/src/main/java/mmd/orespawn/OreSpawn.java b/src/main/java/mmd/orespawn/OreSpawn.java
@@ -26,6 +26,7 @@ public class OreSpawn {
     public void onPreInit(FMLPreInitializationEvent event) {
         MinecraftForge.ORE_GEN_BUS.register(EventHandler.INSTANCE);
         OreSpawnReader.INSTANCE.readSpawnEntries();
+        OreSpawnReader.INSTANCE.convertOldSpawnEntries();
 
         FMLInterModComms.sendFunctionMessage("orespawn", "api", "mmd.orespawn.VanillaOreSpawn");
     }
diff --git a/src/main/java/mmd/orespawn/api/OreSpawnAPI.java b/src/main/java/mmd/orespawn/api/OreSpawnAPI.java
@@ -1,9 +1,13 @@
 package mmd.orespawn.api;
 
+import java.util.Map;
+
 public interface OreSpawnAPI {
     int DIMENSION_WILDCARD = "DIMENSION_WILDCARD".hashCode();
 
     SpawnLogic createSpawnLogic();
 
     SpawnLogic getSpawnLogic(String id);
+
+    Map<String, SpawnLogic> getAllSpawnLogic();
 }
diff --git a/src/main/java/mmd/orespawn/impl/DimensionLogicImpl.java b/src/main/java/mmd/orespawn/impl/DimensionLogicImpl.java
@@ -15,7 +15,7 @@ public class DimensionLogicImpl implements DimensionLogic {
     private final List<SpawnEntry> logic = new ArrayList<>();
     private final SpawnLogic parent;
 
-    DimensionLogicImpl(SpawnLogic parent) {
+    public DimensionLogicImpl(SpawnLogic parent) {
         this.parent = parent;
     }
 
@@ -34,5 +34,4 @@ public Collection<SpawnEntry> getEntries() {
     public SpawnLogic end() {
         return this.parent;
     }
-
 }
diff --git a/src/main/java/mmd/orespawn/impl/OreSpawnImpl.java b/src/main/java/mmd/orespawn/impl/OreSpawnImpl.java
@@ -1,5 +1,6 @@
 package mmd.orespawn.impl;
 
+import com.google.common.collect.ImmutableMap;
 import mmd.orespawn.OreSpawn;
 import mmd.orespawn.api.DimensionLogic;
 import mmd.orespawn.api.OreSpawnAPI;
@@ -25,6 +26,11 @@ public SpawnLogic getSpawnLogic(String id) {
         return this.spawnLogic.get(id);
     }
 
+    @Override
+    public Map<String, SpawnLogic> getAllSpawnLogic() {
+        return ImmutableMap.copyOf(this.spawnLogic);
+    }
+
     public void registerSpawnLogic(String id, SpawnLogic spawnLogic) {
         this.spawnLogic.put(id, spawnLogic);
 
diff --git a/src/main/java/mmd/orespawn/json/OreSpawnReader.java b/src/main/java/mmd/orespawn/json/OreSpawnReader.java
@@ -1,9 +1,6 @@
 package mmd.orespawn.json;
 
-import com.google.gson.JsonArray;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
+import com.google.gson.*;
 import mmd.orespawn.OreSpawn;
 import mmd.orespawn.api.DimensionLogic;
 import mmd.orespawn.api.OreSpawnAPI;
@@ -123,4 +120,106 @@ public void readSpawnEntries() {
             }
         });
     }
+
+    @Deprecated //planned for removal in 2.1.0
+    public void convertOldSpawnEntries() {
+        File directory = new File(".", "config" + File.separator + "orespawn");
+        JsonParser parser = new JsonParser();
+
+        if (!directory.exists() || !directory.isDirectory()) {
+            return;
+        }
+
+        File[] files = directory.listFiles();
+
+        if (files == null) {
+            return;
+        }
+
+        Arrays.stream(files).filter(file -> file.getName().endsWith(".json")).forEach(file -> {
+            try {
+                OreSpawn.LOGGER.info("Converting JSON " + file.getName());
+
+                JsonElement element = parser.parse(FileUtils.readFileToString(file));
+                JsonObject object = element.getAsJsonObject();
+                JsonArray dimensions = object.get("dimensions").getAsJsonArray();
+
+                SpawnLogic spawnLogic = OreSpawn.API.createSpawnLogic();
+
+                for (JsonElement dimensionsEntry : dimensions) {
+                    JsonObject dimension = dimensionsEntry.getAsJsonObject();
+
+                    int newDimension = OreSpawnAPI.DIMENSION_WILDCARD;
+
+                    JsonPrimitive id = dimension.get("dimension").getAsJsonPrimitive();
+                    if (id.isNumber()) {
+                        newDimension = id.getAsInt();
+                    }
+
+                    DimensionLogic dimensionLogic = spawnLogic.getDimension(newDimension);
+
+                    JsonArray ores = dimension.get("ores").getAsJsonArray();
+
+                    for (JsonElement oreEntry : ores) {
+                        JsonObject ore = oreEntry.getAsJsonObject();
+
+                        Block block = ForgeRegistries.BLOCKS.getValue(new ResourceLocation(ore.get("blockID").getAsString()));
+
+                        if (block == null) {
+                            continue;
+                        }
+
+                        IBlockState state = block.getDefaultState();
+
+                        if (ore.has("blockMeta")) {
+                            state = block.getStateFromMeta(ore.get("blockMeta").getAsInt());
+                        }
+
+                        int size = ore.get("size").getAsInt();
+                        int variation = ore.get("variation").getAsInt();
+                        int frequency = ore.get("frequency").getAsInt();
+                        int minHeight = ore.get("minHeight").getAsInt();
+                        int maxHeight = ore.get("maxHeight").getAsInt();
+                        List<Biome> biomes = new ArrayList<>();
+
+                        if (ore.has("biomes")) {
+                            JsonArray biomesArray = ore.get("biomes").getAsJsonArray();
+
+                            for (JsonElement biomeEntry : biomesArray) {
+                                String biome = biomeEntry.getAsString();
+
+                                try {
+                                    int biomeID = Integer.parseInt(biome);
+                                    Biome result = Biome.getBiome(biomeID);
+
+                                    if (result != null) {
+                                        biomes.add(result);
+                                    }
+                                } catch (NumberFormatException e) {
+                                    for (Biome result : ForgeRegistries.BIOMES) {
+                                        if (result.getBiomeName().equals(biome)) {
+                                            biomes.add(result);
+                                            break;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        dimensionLogic.addOre(state, size, variation, frequency, minHeight, maxHeight, biomes.toArray(new Biome[biomes.size()]));
+                    }
+
+                }
+
+                OreSpawn.API.registerSpawnLogic(file.getName().substring(0, file.getName().lastIndexOf(".")), spawnLogic);
+                file.delete();
+            } catch (Exception e) {
+                CrashReport report = CrashReport.makeCrashReport(e, "Failed reading config " + file.getName());
+                report.getCategory().addCrashSection("OreSpawn Version", OreSpawn.VERSION);
+                OreSpawn.LOGGER.info(report.getCompleteReport());
+            }
+        });
+
+        directory.delete();
+    }
 }
diff --git a/src/main/java/mmd/orespawn/json/OreSpawnWriter.java b/src/main/java/mmd/orespawn/json/OreSpawnWriter.java
@@ -3,13 +3,11 @@
 import com.google.gson.*;
 import mmd.orespawn.OreSpawn;
 import mmd.orespawn.api.DimensionLogic;
-import mmd.orespawn.api.SpawnEntry;
 import mmd.orespawn.api.OreSpawnAPI;
+import mmd.orespawn.api.SpawnEntry;
 import mmd.orespawn.api.SpawnLogic;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.world.biome.Biome;
-import net.minecraftforge.fml.common.Loader;
-import net.minecraftforge.fml.common.ModContainer;
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
@@ -25,68 +23,64 @@ public enum OreSpawnWriter {
     public void writeSpawnEntries() {
         Gson gson = new GsonBuilder().setPrettyPrinting().create();
 
-        Loader.instance().getActiveModList().stream().map(ModContainer::getModId).forEach(id -> {
-            SpawnLogic logic = OreSpawn.API.getSpawnLogic(id);
+        for (Map.Entry<String, SpawnLogic> entry : OreSpawn.API.getAllSpawnLogic().entrySet()) {
+            Map<Integer, DimensionLogic> dimensions = entry.getValue().getAllDimensions();
 
-            if (logic != null) {
-                Map<Integer, DimensionLogic> dimensions = logic.getAllDimensions();
+            JsonArray array = new JsonArray();
 
-                JsonArray array = new JsonArray();
+            for (Map.Entry<Integer, DimensionLogic> dimension : dimensions.entrySet()) {
+                JsonObject object = new JsonObject();
 
-                for (Map.Entry<Integer, DimensionLogic> dimension : dimensions.entrySet()) {
-                    JsonObject object = new JsonObject();
-
-                    if (dimension.getKey() != OreSpawnAPI.DIMENSION_WILDCARD) {
-                        object.addProperty("dimension", dimension.getKey());
-                    }
-
-                    JsonArray ores = new JsonArray();
-                    Collection<SpawnEntry> entries = dimension.getValue().getEntries();
+                if (dimension.getKey() != OreSpawnAPI.DIMENSION_WILDCARD) {
+                    object.addProperty("dimension", dimension.getKey());
+                }
 
-                    for (SpawnEntry entry : entries) {
-                        JsonObject ore = new JsonObject();
+                JsonArray ores = new JsonArray();
+                Collection<SpawnEntry> entries = dimension.getValue().getEntries();
 
-                        ore.addProperty("block", entry.getState().getBlock().getRegistryName().toString());
+                for (SpawnEntry spawnEntry : entries) {
+                    JsonObject ore = new JsonObject();
 
-                        if (entry.getState() != entry.getState().getBlock().getDefaultState()) {
-                            ore.addProperty("state", this.serializeBlockState(entry.getState()));
-                        }
+                    ore.addProperty("block", spawnEntry.getState().getBlock().getRegistryName().toString());
 
-                        ore.addProperty("size", entry.getSize());
-                        ore.addProperty("variation", entry.getVariation());
-                        ore.addProperty("frequency", entry.getFrequency());
-                        ore.addProperty("min_height", entry.getMinHeight());
-                        ore.addProperty("max_height", entry.getMaxHeight());
+                    if (spawnEntry.getState() != spawnEntry.getState().getBlock().getDefaultState()) {
+                        ore.addProperty("state", this.serializeBlockState(spawnEntry.getState()));
+                    }
 
-                        Biome[] biomeArray = entry.getBiomes();
+                    ore.addProperty("size", spawnEntry.getSize());
+                    ore.addProperty("variation", spawnEntry.getVariation());
+                    ore.addProperty("frequency", spawnEntry.getFrequency());
+                    ore.addProperty("min_height", spawnEntry.getMinHeight());
+                    ore.addProperty("max_height", spawnEntry.getMaxHeight());
 
-                        if (biomeArray != null && biomeArray.length != 0) {
-                            JsonArray biomes = new JsonArray();
+                    Biome[] biomeArray = spawnEntry.getBiomes();
 
-                            for (Biome biome : biomeArray) {
-                                biomes.add(new JsonPrimitive(biome.getRegistryName().toString()));
-                            }
+                    if (biomeArray != null && biomeArray.length != 0) {
+                        JsonArray biomes = new JsonArray();
 
-                            ore.add("biomes", biomes);
+                        for (Biome biome : biomeArray) {
+                            biomes.add(new JsonPrimitive(biome.getRegistryName().toString()));
                         }
 
-                        ores.add(ore);
+                        ore.add("biomes", biomes);
                     }
 
-                    object.add("ores", ores);
-
-                    array.add(object);
+                    ores.add(ore);
                 }
 
-                String json = gson.toJson(array);
+                object.add("ores", ores);
 
-                try {
-                    FileUtils.writeStringToFile(new File("." + File.separator + "orespawn", id + ".json"), StringEscapeUtils.unescapeJson(json), Charsets.UTF_8);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
+                array.add(object);
             }
-        });
+
+            String json = gson.toJson(array);
+
+            try {
+                FileUtils.writeStringToFile(new File("." + File.separator + "orespawn", entry.getKey() + ".json"), StringEscapeUtils.unescapeJson(json), Charsets.UTF_8);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     private String serializeBlockState(IBlockState state) {

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public class OreSpawn {`
`26`	`26`	`public void onPreInit(FMLPreInitializationEvent event) {`
`27`	`27`	`MinecraftForge.ORE_GEN_BUS.register(EventHandler.INSTANCE);`
`28`	`28`	`OreSpawnReader.INSTANCE.readSpawnEntries();`
	`29`	`+ OreSpawnReader.INSTANCE.convertOldSpawnEntries();`
`29`	`30`
`30`	`31`	`FMLInterModComms.sendFunctionMessage("orespawn", "api", "mmd.orespawn.VanillaOreSpawn");`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class DimensionLogicImpl implements DimensionLogic {`
`15`	`15`	`private final List<SpawnEntry> logic = new ArrayList<>();`
`16`	`16`	`private final SpawnLogic parent;`
`17`	`17`
`18`		`- DimensionLogicImpl(SpawnLogic parent) {`
	`18`	`+ public DimensionLogicImpl(SpawnLogic parent) {`
`19`	`19`	`this.parent = parent;`
`20`	`20`	`}`
`21`	`21`
`@@ -34,5 +34,4 @@ public Collection<SpawnEntry> getEntries() {`
`34`	`34`	`public SpawnLogic end() {`
`35`	`35`	`return this.parent;`
`36`	`36`	`}`
`37`		`-`
`38`	`37`	`}`