Add retrogen and fix converter

iLexiconn · iLexiconn · commit db7c20a7bd75 · 2016-08-29T21:11:07.000+02:00
diff --git a/src/main/java/mmd/orespawn/EventHandler.java b/src/main/java/mmd/orespawn/EventHandler.java
@@ -1,12 +1,84 @@
 package mmd.orespawn;
 
+import mmd.orespawn.world.OreSpawnData;
+import mmd.orespawn.world.OreSpawnWorldGenerator;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.NBTTagString;
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraft.world.chunk.IChunkGenerator;
+import net.minecraft.world.gen.ChunkProviderServer;
 import net.minecraftforge.event.terraingen.OreGenEvent;
+import net.minecraftforge.event.terraingen.PopulateChunkEvent;
+import net.minecraftforge.event.world.ChunkDataEvent;
 import net.minecraftforge.fml.common.eventhandler.Event;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+
 public enum EventHandler {
     INSTANCE;
 
+    @SubscribeEvent
+    public void onChunkLoad(ChunkDataEvent.Load event) {
+        if (OreSpawn.DO_RETRO_GENERATION) {
+            WorldServer world = (WorldServer) event.getWorld();
+            Chunk chunk = event.getChunk();
+
+            this.generateChunk(world, chunk);
+        }
+    }
+
+    @SubscribeEvent
+    public void onPopulateChunk(PopulateChunkEvent event) {
+        if (OreSpawn.DO_RETRO_GENERATION) {
+            WorldServer world = (WorldServer) event.getWorld();
+            Chunk chunk = world.getChunkFromChunkCoords(event.getChunkX(), event.getChunkZ());
+
+            this.generateChunk(world, chunk);
+        }
+    }
+
+    public void generateChunk(WorldServer world, Chunk chunk) {
+        OreSpawnData data = OreSpawnData.getData(world);
+        NBTTagList dataList = data.chunkData.get(chunk.getChunkCoordIntPair());
+        List<String> generatedIDs = new ArrayList<>();
+
+        if (dataList == null) {
+            dataList = new NBTTagList();
+        }
+
+        for (int i = 0; i < dataList.tagCount(); i++) {
+            generatedIDs.add(dataList.getStringTagAt(i));
+        }
+
+        for (Map.Entry<String, List<OreSpawnWorldGenerator>> entry : OreSpawn.API.getWorldGenerators().entrySet()) {
+            if (!generatedIDs.contains(entry.getKey())) {
+                long worldSeed = world.getSeed();
+                Random random = new Random(worldSeed);
+                long xSeed = random.nextLong() >> 2 + 1L;
+                long zSeed = random.nextLong() >> 2 + 1L;
+                long chunkSeed = (xSeed * chunk.xPosition + zSeed * chunk.zPosition) ^ worldSeed;
+
+                ChunkProviderServer chunkProvider = world.getChunkProvider();
+                IChunkGenerator chunkGenerator = chunkProvider.chunkGenerator;
+
+                for (OreSpawnWorldGenerator generator : entry.getValue()) {
+                    random.setSeed(chunkSeed);
+                    generator.generate(random, chunk.xPosition, chunk.zPosition, world, chunkGenerator, chunkProvider);
+                }
+
+                dataList.appendTag(new NBTTagString(entry.getKey()));
+            }
+        }
+
+        data.chunkData.put(chunk.getChunkCoordIntPair(), dataList);
+        data.markDirty();
+    }
+
     @SubscribeEvent
     public void onGenerateMinable(OreGenEvent.GenerateMinable event) {
         event.setResult(Event.Result.DENY);
diff --git a/src/main/java/mmd/orespawn/OreSpawn.java b/src/main/java/mmd/orespawn/OreSpawn.java
@@ -8,6 +8,7 @@
 import mmd.orespawn.json.OreSpawnReader;
 import mmd.orespawn.json.OreSpawnWriter;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.config.Configuration;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLInterModComms;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
@@ -22,17 +23,24 @@ public class OreSpawn {
     public static final Logger LOGGER = LogManager.getLogger("OreSpawn");
     public static final OreSpawnImpl API = new OreSpawnImpl();
 
+    public static boolean DO_RETRO_GENERATION = true;
+
     @Mod.EventHandler
     public void onPreInit(FMLPreInitializationEvent event) {
+        Configuration config = new Configuration(event.getSuggestedConfigurationFile());
+        OreSpawn.DO_RETRO_GENERATION = config.getBoolean("retrogen", Configuration.CATEGORY_GENERAL, true, "Generate ores in pre-existing chunks");
+        config.save();
+
+        MinecraftForge.EVENT_BUS.register(EventHandler.INSTANCE);
         MinecraftForge.ORE_GEN_BUS.register(EventHandler.INSTANCE);
         OreSpawnReader.INSTANCE.readSpawnEntries();
-        OreSpawnReader.INSTANCE.convertOldSpawnEntries();
 
         FMLInterModComms.sendFunctionMessage("orespawn", "api", "mmd.orespawn.VanillaOreSpawn");
     }
 
     @Mod.EventHandler
     public void onPostInit(FMLPostInitializationEvent event) {
+        OreSpawnReader.INSTANCE.convertOldSpawnEntries();
         OreSpawnWriter.INSTANCE.writeSpawnEntries();
     }
 
diff --git a/src/main/java/mmd/orespawn/impl/OreSpawnImpl.java b/src/main/java/mmd/orespawn/impl/OreSpawnImpl.java
@@ -9,12 +9,11 @@
 import mmd.orespawn.world.OreSpawnWorldGenerator;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 
 public class OreSpawnImpl implements OreSpawnAPI {
     private final Map<String, SpawnLogic> spawnLogic = new HashMap<>();
+    private final Map<String, List<OreSpawnWorldGenerator>> worldGenerators = new HashMap<>();
 
     @Override
     public SpawnLogic createSpawnLogic() {
@@ -36,12 +35,22 @@ public void registerSpawnLogic(String id, SpawnLogic spawnLogic) {
 
         Random random = new Random();
 
+        List<OreSpawnWorldGenerator> list = new ArrayList<>();
         for (Map.Entry<Integer, DimensionLogic> dimension : spawnLogic.getAllDimensions().entrySet()) {
             for (SpawnEntry entry : dimension.getValue().getEntries()) {
-                GameRegistry.registerWorldGenerator(new OreSpawnWorldGenerator(entry, dimension.getKey(), random.nextLong()), 100);
+                OreSpawnWorldGenerator generator = new OreSpawnWorldGenerator(entry, dimension.getKey(), random.nextLong());
+                list.add(generator);
+                if (!OreSpawn.DO_RETRO_GENERATION) {
+                    GameRegistry.registerWorldGenerator(generator, 100);
+                }
             }
         }
+        this.worldGenerators.put(id, list);
 
         OreSpawn.LOGGER.info("Registered spawn logic for mod " + id);
     }
+
+    public Map<String, List<OreSpawnWorldGenerator>> getWorldGenerators() {
+        return ImmutableMap.copyOf(this.worldGenerators);
+    }
 }
diff --git a/src/main/java/mmd/orespawn/world/OreSpawnData.java b/src/main/java/mmd/orespawn/world/OreSpawnData.java
@@ -0,0 +1,70 @@
+package mmd.orespawn.world;
+
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
+import net.minecraft.util.math.ChunkPos;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldSavedData;
+import net.minecraft.world.storage.MapStorage;
+import net.minecraftforge.common.util.Constants;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class OreSpawnData extends WorldSavedData {
+    public final Map<ChunkPos, NBTTagList> chunkData = new HashMap<>();
+
+    public OreSpawnData(String tag) {
+        super(tag);
+    }
+
+    @Override
+    public void readFromNBT(NBTTagCompound compound) {
+        this.chunkData.clear();
+
+        NBTTagList list = compound.getTagList("List", Constants.NBT.TAG_COMPOUND);
+
+        for (int i = 0; i < list.tagCount(); i++) {
+            NBTTagCompound data = list.getCompoundTagAt(i);
+
+            int chunkX = data.getInteger("ChunkX");
+            int chunkZ = data.getInteger("ChunkZ");
+            NBTTagList generatedIDs = data.getTagList("GeneratedIDs", Constants.NBT.TAG_STRING);
+
+            this.chunkData.put(new ChunkPos(chunkX, chunkZ), generatedIDs);
+        }
+    }
+
+    @Override
+    public NBTTagCompound writeToNBT(NBTTagCompound compound) {
+        NBTTagList list = new NBTTagList();
+
+        for (Map.Entry<ChunkPos, NBTTagList> entry : this.chunkData.entrySet()) {
+            NBTTagCompound data = new NBTTagCompound();
+
+            data.setInteger("ChunkX", entry.getKey().chunkXPos);
+            data.setInteger("ChunkZ", entry.getKey().chunkZPos);
+            data.setTag("GeneratedIDs", entry.getValue());
+
+            list.appendTag(data);
+        }
+
+        compound.setTag("List", list);
+
+        return compound;
+    }
+
+    public static OreSpawnData getData(World world) {
+        String tag = "orespawn";
+
+        MapStorage storage = world.getPerWorldStorage();
+        OreSpawnData data = (OreSpawnData) storage.getOrLoadData(OreSpawnData.class, tag);
+
+        if (data == null) {
+            data = new OreSpawnData(tag);
+            storage.setData(tag, data);
+        }
+
+        return data;
+    }
+}
diff --git a/src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java b/src/main/java/mmd/orespawn/world/OreSpawnWorldGenerator.java
@@ -91,7 +91,16 @@ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkG
 
         if (this.spawnEntry.getBiomes().length != 0) {
             Biome biome = world.getBiome(pos);
-            if (!Arrays.stream(this.spawnEntry.getBiomes()).map(Biome::getRegistryName).collect(Collectors.toList()).contains(biome.getRegistryName())) {
+            boolean flag = false;
+
+            for (Biome b : this.spawnEntry.getBiomes()) {
+                if (b == biome) {
+                    flag = true;
+                    break;
+                }
+            }
+
+            if (!flag) {
                 return;
             }
         }
