Merge branch 'everglades-refactor' into dev

src/main/java/gtPlusPlus/core/item/ModItems.java

@@ -83,10 +83,10 @@
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.everglades.GTPPEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems;
+import toxiceverglades.GTPPEverglades;
 
 public final class ModItems {
 

src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java

@@ -19,7 +19,8 @@
 import gtPlusPlus.core.material.MaterialStack;
 import gtPlusPlus.core.util.minecraft.EntityUtils;
 import gtPlusPlus.core.util.sys.KeyboardUtils;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
+import toxiceverglades.gen.WorldGenEvergladesOreLayer;
+import toxiceverglades.gen.WorldGenEvergladesOres;
 
 public class ItemBlockOre extends ItemBlock {
 
@@ -49,7 +50,7 @@ public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, fi
         final boolean bool) {
 
         if (!mInitOres_Everglades) {
-            for (WorldGen_GT_Ore_Layer f : gtPlusPlus.everglades.gen.gt.WorldGen_Ores.validOreveins.values()) {
+            for (WorldGenEvergladesOreLayer f : WorldGenEvergladesOres.validOreveins.values()) {
                 Material[] m2 = new Material[] { f.mPrimary, f.mSecondary, f.mBetween, f.mSporadic };
                 for (Material m1 : m2) {
                     HashSet<String> aMap = mMapOreBlockItemToDimName.get(

src/main/java/gtPlusPlus/core/lib/GTPPCore.java

@@ -57,12 +57,6 @@ public class GTPPCore {
 
     public static final GT_Materials[] sMU_GeneratedMaterials = new GT_Materials[1000];
 
-    public static class Everglades {
-
-        public static final String NAME = "GT++ Toxic Everglades";
-        public static final String VERSION = GT_Version.VERSION;
-    }
-
     public static void crash() {
         crash("Generic Crash");
     }

src/main/java/gtPlusPlus/core/recipe/RecipesLaserEngraver.java

@@ -16,8 +16,8 @@
 import gregtech.api.util.GTOreDictUnificator;
 import gregtech.api.util.GTUtility;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.everglades.dimension.DimensionEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import toxiceverglades.dimension.DimensionEverglades;
 
 public class RecipesLaserEngraver implements IOreRecipeRegistrator {
 

src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java

@@ -55,12 +55,12 @@
 import gtPlusPlus.core.recipe.common.CI;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.RecipeUtils;
-import gtPlusPlus.everglades.dimension.DimensionEverglades;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import gtPlusPlus.xmod.gregtech.common.covers.CoverManager;
 import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper;
 import tectech.recipe.TTRecipeAdder;
 import tectech.thing.CustomItemList;
+import toxiceverglades.dimension.DimensionEverglades;
 
 public class RecipesMachines {
 

src/main/java/gtPlusPlus/xmod/gregtech/HandlerGT.java

@@ -7,7 +7,6 @@
 import gregtech.api.items.MetaGeneratedTool;
 import gregtech.api.util.GTConfig;
 import gtPlusPlus.core.handler.CompatHandler;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT;
 import gtPlusPlus.recipes.CokeAndPyrolyseOven;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
 import gtPlusPlus.xmod.gregtech.common.MetaGTProxy;
@@ -21,11 +20,12 @@
 import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoaderTreeFarm;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechAdvancedBoilers;
 import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechConduits;
+import toxiceverglades.gen.WorldGenEverglades;
 
 public class HandlerGT {
 
     public static GTConfig mMaterialProperties = null;
-    public static final List<WorldGen_GT> sWorldgenListEverglades = new ArrayList<>();
+    public static final List<WorldGenEverglades> sWorldgenListEverglades = new ArrayList<>();
     public static MetaGeneratedTool sMetaGeneratedToolInstance;
 
     public static void preInit() {

src/main/java/gtPlusPlus/everglades/GTPPEverglades.java → src/main/java/toxiceverglades/GTPPEverglades.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades;
+package toxiceverglades;
 
 import static gregtech.api.enums.Mods.GTPlusPlusEverglades;
 
@@ -11,29 +11,31 @@
 import cpw.mods.fml.common.event.FMLInitializationEvent;
 import cpw.mods.fml.common.event.FMLPostInitializationEvent;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.common.registry.GameRegistry;
+import gregtech.GT_Version;
 import gregtech.api.enums.Mods;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.config.ASMConfiguration;
 import gtPlusPlus.core.lib.GTPPCore;
-import gtPlusPlus.core.lib.GTPPCore.Everglades;
 import gtPlusPlus.core.material.MaterialGenerator;
 import gtPlusPlus.core.material.MaterialsOres;
-import gtPlusPlus.everglades.biome.BiomeEverglades;
-import gtPlusPlus.everglades.block.DarkWorldContentLoader;
-import gtPlusPlus.everglades.dimension.DimensionEverglades;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base;
-import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Ore_Layer;
-import gtPlusPlus.everglades.gen.gt.WorldGen_Ores;
+import toxiceverglades.biome.BiomeEverglades;
+import toxiceverglades.block.DarkWorldContentLoader;
+import toxiceverglades.dimension.DimensionEverglades;
+import toxiceverglades.gen.WorldGenEvergladesBase;
+import toxiceverglades.gen.WorldGenEvergladesOreLayer;
+import toxiceverglades.gen.WorldGenEvergladesOres;
 
 @Mod(
     modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES,
-    name = Everglades.NAME,
-    version = Everglades.VERSION,
+    name = GTPPEverglades.NAME,
+    version = GTPPEverglades.VERSION,
     dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;")
 public class GTPPEverglades {
 
+    public static final String NAME = "GT++ Toxic Everglades";
+    public static final String VERSION = GT_Version.VERSION;
+
     // Mod Instance
     @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES)
     public static GTPPEverglades instance;
@@ -45,7 +47,7 @@ public class GTPPEverglades {
     // Pre-Init
     @Mod.EventHandler
     public void preInit(final FMLPreInitializationEvent event) {
-        Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION);
+        Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + VERSION);
 
         // Setup
         setVars(event);
@@ -56,15 +58,14 @@ public void preInit(final FMLPreInitializationEvent event) {
         // Load Dark World
         getEvergladesBiome().instance = instance;
         Everglades_Dimension.instance = instance;
-        getEvergladesBiome().preInit(event);
     }
 
     @EventHandler
     public void load(final FMLInitializationEvent e) {
-        Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION);
+        Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + VERSION);
 
         // Load World and Biome
-        GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE);
+        GameRegistry.registerWorldGenerator(new WorldGenEvergladesBase(), Short.MAX_VALUE);
         getEvergladesBiome().load();
         Everglades_Dimension.load();
         addToVoidMinerDrops();
@@ -127,18 +128,18 @@ protected synchronized void setVars(FMLPreInitializationEvent event) {
         /*
          * Set World Generation Values
          */
-        WorldGen_Ores.generateValidOreVeins();
-        WorldGen_GT_Base.oreveinPercentage = 64;
-        WorldGen_GT_Base.oreveinAttempts = 16;
-        WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4;
+        WorldGenEvergladesOres.generateValidOreVeins();
+        WorldGenEvergladesBase.oreveinPercentage = 64;
+        WorldGenEvergladesBase.oreveinAttempts = 16;
+        WorldGenEvergladesBase.oreveinMaxPlacementAttempts = 4;
         if (ASMConfiguration.debug.debugMode || GTPPCore.DEVENV) {
-            WorldGen_GT_Base.debugWorldGen = true;
+            WorldGenEvergladesBase.debugWorldGen = true;
         }
         DarkWorldContentLoader.run();
     }
 
     public void addToVoidMinerDrops() {
-        for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) {
+        for (WorldGenEvergladesOreLayer t : WorldGenEvergladesOres.validOreveins.values()) {
             addVMDrop(t.mPrimaryMeta, 0, t.mWeight);
             addVMDrop(t.mSecondaryMeta, 0, t.mWeight);
             addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f);
@@ -151,11 +152,6 @@ public void addVMDrop(Block block, int meta, float weight) {
             .addBlockToDimensionList(gtPlusPlus.core.config.Configuration.worldgen.EVERGLADES_ID, block, meta, weight);
     }
 
-    @EventHandler
-    public void serverLoad(FMLServerStartingEvent event) {
-        getEvergladesBiome().serverLoad(event);
-    }
-
     @EventHandler
     public static void postInit(final FMLPostInitializationEvent e) {
         Logger.INFO("Finished loading Everglades plugin for GT++.");

src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java → src/main/java/toxiceverglades/biome/BiomeEverglades.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.biome;
+package toxiceverglades.biome;
 
 import net.minecraft.entity.EntityLiving;
 import net.minecraft.entity.monster.EntityPigZombie;
@@ -8,14 +8,12 @@
 import net.minecraftforge.common.BiomeDictionary;
 import net.minecraftforge.common.BiomeManager;
 
-import cpw.mods.fml.common.event.FMLPreInitializationEvent;
-import cpw.mods.fml.common.event.FMLServerStartingEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gtPlusPlus.core.config.Configuration;
 import gtPlusPlus.core.entity.monster.EntitySickBlaze;
 import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct;
-import gtPlusPlus.everglades.dimension.DimensionEverglades;
+import toxiceverglades.dimension.DimensionEverglades;
 
 public class BiomeEverglades {
 
@@ -30,10 +28,6 @@ public void load() {
         BiomeManager.addSpawnBiome(biome);
     }
 
-    public void serverLoad(FMLServerStartingEvent event) {}
-
-    public void preInit(FMLPreInitializationEvent event) {}
-
     static class BiomeGenEverglades extends BiomeGenBase {
 
         public BiomeGenEverglades() {

src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java → src/main/java/toxiceverglades/biome/CustomBiomeGenerator.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.biome;
+package toxiceverglades.biome;
 
 import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.BIG_SHROOM;
 import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CACTUS;
@@ -45,13 +45,11 @@
 import net.minecraftforge.event.terraingen.OreGenEvent;
 import net.minecraftforge.event.terraingen.TerrainGen;
 
-import gtPlusPlus.everglades.gen.WorldGenDeadLilly;
-import gtPlusPlus.everglades.gen.WorldGenMinableCustom;
+import toxiceverglades.gen.WorldGenDeadLilly;
+import toxiceverglades.gen.WorldGenMinableCustom;
 
 public class CustomBiomeGenerator extends BiomeDecorator {
 
-    public WorldGenerator fluoriteGen;
-
     public CustomBiomeGenerator() {
         // Basic Blocks
         this.sandGen = new WorldGenMinableCustom(Blocks.sand, 12);

src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java → src/main/java/toxiceverglades/biome/GenLayerBiomes.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.biome;
+package toxiceverglades.biome;
 
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.layer.GenLayer;

src/main/java/gtPlusPlus/everglades/biome/GenLayerEverglades.java → src/main/java/toxiceverglades/biome/GenLayerEverglades.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.biome;
+package toxiceverglades.biome;
 
 import net.minecraft.world.WorldType;
 import net.minecraft.world.gen.layer.GenLayer;

src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java → src/main/java/toxiceverglades/block/BlockDarkWorldGround.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.block;
+package toxiceverglades.block;
 
 import static gregtech.api.enums.Mods.Minecraft;
 

src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java → src/main/java/toxiceverglades/block/BlockDarkWorldPollutedDirt.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.block;
+package toxiceverglades.block;
 
 import static gregtech.api.enums.Mods.Minecraft;
 

src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java → src/main/java/toxiceverglades/block/BlockDarkWorldPortalFrame.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.block;
+package toxiceverglades.block;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 

src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java → src/main/java/toxiceverglades/block/BlockDarkWorldSludgeFluid.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.block;
+package toxiceverglades.block;
 
 import net.minecraft.block.material.MapColor;
 import net.minecraft.block.material.Material;
@@ -46,14 +46,6 @@ public BlockDarkWorldSludgeFluid setAlpha(float parOverlayAlpha) {
         return this;
     }
 
-    /*
-     * public blockDarkWorldSludgeFluid setEmptySound(SoundEvent parSound) { emptySound = parSound; return this; }
-     * public SoundEvent getEmptySound() { return emptySound; }
-     * @Override public blockDarkWorldSludgeFluid setFillSound(SoundEvent parSound) { fillSound = parSound; return this;
-     * }
-     * @Override public SoundEvent getFillSound() { return fillSound; }
-     */
-
     public BlockDarkWorldSludgeFluid setMaterial(Material parMaterial) {
         material = parMaterial;
         return this;
@@ -62,9 +54,4 @@ public BlockDarkWorldSludgeFluid setMaterial(Material parMaterial) {
     public Material getMaterial() {
         return material;
     }
-
-    /*
-     * @Override public boolean doesVaporize(FluidStack fluidStack) { if (block == null) return false; return
-     * block.getDefaultState().getMaterial() == getMaterial(); }
-     */
 }

src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java → src/main/java/toxiceverglades/block/BlockEvergladesPortal.java

@@ -1,4 +1,4 @@
-package gtPlusPlus.everglades.block;
+package toxiceverglades.block;
 
 import java.util.Random;
 
@@ -22,8 +22,8 @@
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.GTPPCore;
 import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.everglades.dimension.DimensionEverglades;
-import gtPlusPlus.everglades.world.TeleporterDimensionMod;
+import toxiceverglades.dimension.DimensionEverglades;
+import toxiceverglades.world.TeleporterDimensionMod;
 
 public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip {