diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades')
17 files changed, 423 insertions, 425 deletions
diff --git a/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java new file mode 100644 index 0000000000..403198d6df --- /dev/null +++ b/src/main/java/gtPlusPlus/everglades/GTPPEverglades.java @@ -0,0 +1,193 @@ +package gtPlusPlus.everglades; + +import static gregtech.api.enums.Mods.GTPlusPlusEverglades; + +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.io.File; + +import net.minecraft.block.Block; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.config.Configuration; + +import bwcrossmod.galacticgreg.MTEVoidMinerBase; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +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.api.enums.Mods; +import gtPlusPlus.api.objects.Logger; +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 gtPlusPlus.preloader.PreloaderCore; +import gtPlusPlus.xmod.gregtech.HandlerGT; +import gtPlusPlus.xmod.gregtech.api.util.GTPPConfig; + +@Mod( + modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, + name = Everglades.NAME, + version = Everglades.VERSION, + dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;") +public class GTPPEverglades implements ActionListener { + + // Mod Instance + @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES) + public static GTPPEverglades instance; + + // Dark World Handler + protected static volatile BiomeEverglades Everglades_Biome; + protected static volatile DimensionEverglades Everglades_Dimension; + + // Pre-Init + @Mod.EventHandler + public void preInit(final FMLPreInitializationEvent event) { + Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); + + // Setup + setVars(event); + + setEvergladesBiome(new BiomeEverglades()); + Everglades_Dimension = new DimensionEverglades(); + + // Load Dark World + getEvergladesBiome().instance = instance; + Everglades_Dimension.instance = instance; + getEvergladesBiome().preInit(event); + + // Load/Set Custom Ore Gen + HandlerGT.sCustomWorldgenFile = new GTPPConfig( + new Configuration( + new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); + } + + @EventHandler + public void load(final FMLInitializationEvent e) { + Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); + + // Load World and Biome + GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); + getEvergladesBiome().load(); + Everglades_Dimension.load(); + addToVoidMinerDrops(); + } + + public static synchronized void GenerateOreMaterials() { + MaterialGenerator.generateOreMaterial(MaterialsOres.CROCROITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GEIKIELITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.NICHROMITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.TITANITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIMBABWEITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCONILITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GADOLINITE_CE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GADOLINITE_Y); + MaterialGenerator.generateOreMaterial(MaterialsOres.LEPERSONNITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.SAMARSKITE_Y); + MaterialGenerator.generateOreMaterial(MaterialsOres.SAMARSKITE_YB); + MaterialGenerator.generateOreMaterial(MaterialsOres.XENOTIME); + MaterialGenerator.generateOreMaterial(MaterialsOres.YTTRIAITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.YTTRIALITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.YTTROCERITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCON); + MaterialGenerator.generateOreMaterial(MaterialsOres.POLYCRASE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRCOPHYLLITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ZIRKELITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_LA); + MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_CE); + MaterialGenerator.generateOreMaterial(MaterialsOres.LANTHANITE_ND); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_Y); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_CD); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_LA); + MaterialGenerator.generateOreMaterial(MaterialsOres.AGARDITE_ND); + MaterialGenerator.generateOreMaterial(MaterialsOres.HIBONITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.CERITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.FLUORCAPHITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.FLORENCITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.CRYOLITE); + + MaterialGenerator.generateOreMaterial(MaterialsOres.LAUTARITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.LAFOSSAITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.DEMICHELEITE_BR); + MaterialGenerator.generateOreMaterial(MaterialsOres.COMANCHEITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.PERROUDITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.HONEAITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.ALBURNITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.MIESSIITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.KASHINITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.IRARSITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.GREENOCKITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.RADIOBARITE); + MaterialGenerator.generateOreMaterial(MaterialsOres.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); + + } + + protected synchronized void setVars(FMLPreInitializationEvent event) { + // Init WorldGen config. + HandlerGT.sCustomWorldgenFile = new GTPPConfig( + new Configuration( + new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); + + if (DimensionManager.isDimensionRegistered(DimensionEverglades.DIMID)) { + DimensionEverglades.DIMID = DimensionManager.getNextFreeDimId(); + } + + /* + * Set World Generation Values + */ + WorldGen_Ores.generateValidOreVeins(); + WorldGen_GT_Base.oreveinPercentage = 64; + WorldGen_GT_Base.oreveinAttempts = 16; + WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4; + if (PreloaderCore.DEBUG_MODE || GTPPCore.DEVENV) { + WorldGen_GT_Base.debugWorldGen = true; + } + DarkWorldContentLoader.run(); + } + + public void addToVoidMinerDrops() { + for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) { + addVMDrop(t.mPrimaryMeta, 0, t.mWeight); + addVMDrop(t.mSecondaryMeta, 0, t.mWeight); + addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f); + addVMDrop(t.mSporadicMeta, 0, t.mWeight / 8f); + } + } + + public void addVMDrop(Block block, int meta, float weight) { + MTEVoidMinerBase.addBlockToDimensionList(GTPPCore.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++."); + } + + public static synchronized BiomeEverglades getEvergladesBiome() { + return Everglades_Biome; + } + + public static synchronized void setEvergladesBiome(BiomeEverglades darkWorld_Biome) { + Everglades_Biome = darkWorld_Biome; + } + + @Override + public void actionPerformed(ActionEvent arg0) { + // TODO Auto-generated method stub + + } +} diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java deleted file mode 100644 index 3cb8893b16..0000000000 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ /dev/null @@ -1,194 +0,0 @@ -package gtPlusPlus.everglades; - -import static gregtech.api.enums.Mods.GTPlusPlusEverglades; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.io.File; - -import net.minecraft.block.Block; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.config.Configuration; - -import com.github.bartimaeusnek.crossmod.galacticgreg.GT_TileEntity_VoidMiner_Base; - -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -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.api.enums.Mods; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.Everglades; -import gtPlusPlus.core.material.MaterialGenerator; -import gtPlusPlus.core.material.ORES; -import gtPlusPlus.everglades.biome.Biome_Everglades; -import gtPlusPlus.everglades.block.DarkWorldContentLoader; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -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 gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; -import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; - -@Mod( - modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, - name = Everglades.NAME, - version = Everglades.VERSION, - dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;") -public class GTplusplus_Everglades implements ActionListener { - - // Mod Instance - @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES) - public static GTplusplus_Everglades instance; - - // Dark World Handler - protected static volatile Biome_Everglades Everglades_Biome; - protected static volatile Dimension_Everglades Everglades_Dimension; - - // Pre-Init - @Mod.EventHandler - public void preInit(final FMLPreInitializationEvent event) { - Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); - - // Setup - setVars(event); - - setEvergladesBiome(new Biome_Everglades()); - Everglades_Dimension = new Dimension_Everglades(); - - // Load Dark World - getEvergladesBiome().instance = instance; - Everglades_Dimension.instance = instance; - getEvergladesBiome().preInit(event); - - // Load/Set Custom Ore Gen - HANDLER_GT.sCustomWorldgenFile = new GTPP_Config( - new Configuration( - new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); - } - - @EventHandler - public void load(final FMLInitializationEvent e) { - Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); - - // Load World and Biome - GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); - getEvergladesBiome().load(); - Everglades_Dimension.load(); - addToVoidMinerDrops(); - } - - public static synchronized void GenerateOreMaterials() { - MaterialGenerator.generateOreMaterial(ORES.CROCROITE); - MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE); - MaterialGenerator.generateOreMaterial(ORES.NICHROMITE); - MaterialGenerator.generateOreMaterial(ORES.TITANITE); - MaterialGenerator.generateOreMaterial(ORES.ZIMBABWEITE); - MaterialGenerator.generateOreMaterial(ORES.ZIRCONILITE); - MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_CE); - MaterialGenerator.generateOreMaterial(ORES.GADOLINITE_Y); - MaterialGenerator.generateOreMaterial(ORES.LEPERSONNITE); - MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_Y); - MaterialGenerator.generateOreMaterial(ORES.SAMARSKITE_YB); - MaterialGenerator.generateOreMaterial(ORES.XENOTIME); - MaterialGenerator.generateOreMaterial(ORES.YTTRIAITE); - MaterialGenerator.generateOreMaterial(ORES.YTTRIALITE); - MaterialGenerator.generateOreMaterial(ORES.YTTROCERITE); - MaterialGenerator.generateOreMaterial(ORES.ZIRCON); - MaterialGenerator.generateOreMaterial(ORES.POLYCRASE); - MaterialGenerator.generateOreMaterial(ORES.ZIRCOPHYLLITE); - MaterialGenerator.generateOreMaterial(ORES.ZIRKELITE); - MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_LA); - MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_CE); - MaterialGenerator.generateOreMaterial(ORES.LANTHANITE_ND); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_Y); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_CD); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_LA); - MaterialGenerator.generateOreMaterial(ORES.AGARDITE_ND); - MaterialGenerator.generateOreMaterial(ORES.HIBONITE); - MaterialGenerator.generateOreMaterial(ORES.CERITE); - MaterialGenerator.generateOreMaterial(ORES.FLUORCAPHITE); - MaterialGenerator.generateOreMaterial(ORES.FLORENCITE); - MaterialGenerator.generateOreMaterial(ORES.CRYOLITE); - - MaterialGenerator.generateOreMaterial(ORES.LAUTARITE); - MaterialGenerator.generateOreMaterial(ORES.LAFOSSAITE); - MaterialGenerator.generateOreMaterial(ORES.DEMICHELEITE_BR); - MaterialGenerator.generateOreMaterial(ORES.COMANCHEITE); - MaterialGenerator.generateOreMaterial(ORES.PERROUDITE); - MaterialGenerator.generateOreMaterial(ORES.HONEAITE); - MaterialGenerator.generateOreMaterial(ORES.ALBURNITE); - MaterialGenerator.generateOreMaterial(ORES.MIESSIITE); - MaterialGenerator.generateOreMaterial(ORES.KASHINITE); - MaterialGenerator.generateOreMaterial(ORES.IRARSITE); - MaterialGenerator.generateOreMaterial(ORES.GREENOCKITE); - MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE); - MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); - - } - - protected synchronized void setVars(FMLPreInitializationEvent event) { - // Init WorldGen config. - HANDLER_GT.sCustomWorldgenFile = new GTPP_Config( - new Configuration( - new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); - - if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)) { - Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId(); - } - - /* - * Set World Generation Values - */ - WorldGen_Ores.generateValidOreVeins(); - WorldGen_GT_Base.oreveinPercentage = 64; - WorldGen_GT_Base.oreveinAttempts = 16; - WorldGen_GT_Base.oreveinMaxPlacementAttempts = 4; - if (CORE_Preloader.DEBUG_MODE || CORE.DEVENV) { - WorldGen_GT_Base.debugWorldGen = true; - } - DarkWorldContentLoader.run(); - } - - public void addToVoidMinerDrops() { - for (WorldGen_GT_Ore_Layer t : WorldGen_Ores.validOreveins.values()) { - addVMDrop(t.mPrimaryMeta, 0, t.mWeight); - addVMDrop(t.mSecondaryMeta, 0, t.mWeight); - addVMDrop(t.mBetweenMeta, 0, t.mWeight / 8f); - addVMDrop(t.mSporadicMeta, 0, t.mWeight / 8f); - } - } - - public void addVMDrop(Block block, int meta, float weight) { - GT_TileEntity_VoidMiner_Base.addBlockToDimensionList(CORE.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++."); - } - - public static synchronized Biome_Everglades getEvergladesBiome() { - return Everglades_Biome; - } - - public static synchronized void setEvergladesBiome(Biome_Everglades darkWorld_Biome) { - Everglades_Biome = darkWorld_Biome; - } - - @Override - public void actionPerformed(ActionEvent arg0) { - // TODO Auto-generated method stub - - } -} diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java index f9b57b14c8..8394bd8385 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeEverglades.java @@ -14,16 +14,16 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.core.lib.GTPPCore; +import gtPlusPlus.everglades.dimension.DimensionEverglades; -public class Biome_Everglades { +public class BiomeEverglades { public static BiomeGenEverglades biome = new BiomeGenEverglades(); public Object instance; - public Biome_Everglades() {} + public BiomeEverglades() {} public void load() { BiomeDictionary.registerBiomeType(biome, BiomeDictionary.Type.DEAD); @@ -38,14 +38,14 @@ public class Biome_Everglades { @SuppressWarnings("unchecked") public BiomeGenEverglades() { - super(CORE.EVERGLADESBIOME_ID); + super(GTPPCore.EVERGLADESBIOME_ID); // this.setBiomeID(); - this.theBiomeDecorator = new BiomeGenerator_Custom(); + this.theBiomeDecorator = new CustomBiomeGenerator(); this.theBiomeDecorator.treesPerChunk = 10; // Logger.INFO("Dark World Temperature Category: "+getTempCategory()); this.setBiomeName("Toxic Everglades"); - this.topBlock = Dimension_Everglades.blockTopLayer; - this.fillerBlock = Dimension_Everglades.blockSecondLayer; + this.topBlock = DimensionEverglades.blockTopLayer; + this.fillerBlock = DimensionEverglades.blockSecondLayer; this.enableRain = true; this.enableSnow = false; this.rainfall = 0.7F; diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java index fce5efca36..4df290b560 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/CustomBiomeGenerator.java @@ -46,26 +46,26 @@ import net.minecraftforge.event.terraingen.OreGenEvent; import net.minecraftforge.event.terraingen.TerrainGen; import gtPlusPlus.everglades.gen.WorldGenDeadLilly; -import gtPlusPlus.everglades.gen.WorldGenMinable_Custom; +import gtPlusPlus.everglades.gen.WorldGenMinableCustom; -public class BiomeGenerator_Custom extends BiomeDecorator { +public class CustomBiomeGenerator extends BiomeDecorator { public WorldGenerator fluoriteGen; - public BiomeGenerator_Custom() { + public CustomBiomeGenerator() { // Basic Blocks - this.sandGen = new WorldGenMinable_Custom(Blocks.sand, 12); - this.gravelAsSandGen = new WorldGenMinable_Custom(Blocks.gravel, 8); - this.dirtGen = new WorldGenMinable_Custom(Blocks.dirt, 32); - this.gravelGen = new WorldGenMinable_Custom(Blocks.gravel, 12); + this.sandGen = new WorldGenMinableCustom(Blocks.sand, 12); + this.gravelAsSandGen = new WorldGenMinableCustom(Blocks.gravel, 8); + this.dirtGen = new WorldGenMinableCustom(Blocks.dirt, 32); + this.gravelGen = new WorldGenMinableCustom(Blocks.gravel, 12); // Oregen - this.coalGen = new WorldGenMinable_Custom(Blocks.coal_ore, 16); - this.ironGen = new WorldGenMinable_Custom(Blocks.iron_ore, 12); - this.goldGen = new WorldGenMinable_Custom(Blocks.gold_ore, 12); - this.redstoneGen = new WorldGenMinable_Custom(Blocks.redstone_ore, 10); - this.diamondGen = new WorldGenMinable_Custom(Blocks.diamond_ore, 12); - this.lapisGen = new WorldGenMinable_Custom(Blocks.lapis_ore, 8); + this.coalGen = new WorldGenMinableCustom(Blocks.coal_ore, 16); + this.ironGen = new WorldGenMinableCustom(Blocks.iron_ore, 12); + this.goldGen = new WorldGenMinableCustom(Blocks.gold_ore, 12); + this.redstoneGen = new WorldGenMinableCustom(Blocks.redstone_ore, 10); + this.diamondGen = new WorldGenMinableCustom(Blocks.diamond_ore, 12); + this.lapisGen = new WorldGenMinableCustom(Blocks.lapis_ore, 8); // Nature this.yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower); diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java index fe799fbe42..e0c96d88b4 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java +++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java @@ -6,7 +6,7 @@ import net.minecraft.world.gen.layer.IntCache; public class GenLayerBiomes extends GenLayer { - protected BiomeGenBase[] allowedBiomes = { Biome_Everglades.biome, }; + protected BiomeGenBase[] allowedBiomes = { BiomeEverglades.biome, }; public GenLayerBiomes(long seed) { super(seed); diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index eafa67980d..16ad852e75 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -21,9 +21,9 @@ import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; import gtPlusPlus.everglades.world.TeleporterDimensionMod; public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip { @@ -75,7 +75,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti for (BlockPos side : portal.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); - if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) { + if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) { blockCount++; } } @@ -135,12 +135,12 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti public boolean tryToCreatePortal(World par1World, int par2, int par3, int par4) { byte b0 = 0; byte b1 = 0; - if (par1World.getBlock(par2 - 1, par3, par4) == Dimension_Everglades.blockPortalFrame - || par1World.getBlock(par2 + 1, par3, par4) == Dimension_Everglades.blockPortalFrame) { + if (par1World.getBlock(par2 - 1, par3, par4) == DimensionEverglades.blockPortalFrame + || par1World.getBlock(par2 + 1, par3, par4) == DimensionEverglades.blockPortalFrame) { b0 = 1; } - if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_Everglades.blockPortalFrame - || par1World.getBlock(par2, par3, par4 + 1) == Dimension_Everglades.blockPortalFrame) { + if (par1World.getBlock(par2, par3, par4 - 1) == DimensionEverglades.blockPortalFrame + || par1World.getBlock(par2, par3, par4 + 1) == DimensionEverglades.blockPortalFrame) { b1 = 1; } if (b0 == b1) { @@ -158,7 +158,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti if (l != -1 && l != 2 || i1 != -1 && i1 != 3) { Block j1 = par1World.getBlock(par2 + b0 * l, par3 + i1, par4 + b1 * l); if (flag) { - if (j1 != Dimension_Everglades.blockPortalFrame) { + if (j1 != DimensionEverglades.blockPortalFrame) { return false; } } @@ -189,7 +189,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti World par1World = portal.world; for (BlockPos side : portal.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); - if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) { + if (b == DimensionEverglades.blockPortalFrame || b == DimensionEverglades.portalBlock) { blockCount++; } } @@ -208,22 +208,22 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) { ; } - if (par1World.getBlock(x, i1 - 1, z) != Dimension_Everglades.blockPortalFrame) { + if (par1World.getBlock(x, i1 - 1, z) != DimensionEverglades.blockPortalFrame) { par1World.setBlockToAir(x, y, z); } else { int j1; for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) { ; } - if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == Dimension_Everglades.blockPortalFrame) { + if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == DimensionEverglades.blockPortalFrame) { boolean flag = par1World.getBlock(x - 1, y, z) == this || par1World.getBlock(x + 1, y, z) == this; boolean flag1 = par1World.getBlock(x, y, z - 1) == this || par1World.getBlock(x, y, z + 1) == this; if (flag && flag1) { par1World.setBlockToAir(x, y, z); } else { - if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_Everglades.blockPortalFrame + if ((par1World.getBlock(x + b0, y, z + b1) != DimensionEverglades.blockPortalFrame || par1World.getBlock(x - b0, y, z - b1) != this) - && (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame + && (par1World.getBlock(x - b0, y, z - b1) != DimensionEverglades.blockPortalFrame || par1World.getBlock(x + b0, y, z + b1) != this)) { par1World.setBlockToAir(x, y, z); } @@ -288,14 +288,14 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti && ((par5Entity instanceof EntityPlayerMP thePlayer))) { if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; - } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { + } else if (thePlayer.dimension != DimensionEverglades.DIMID) { thePlayer.timeUntilPortal = 100; thePlayer.mcServer.getConfigurationManager() .transferPlayerToDimension( thePlayer, - Dimension_Everglades.DIMID, + DimensionEverglades.DIMID, new TeleporterDimensionMod( - thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID))); + thePlayer.mcServer.worldServerForDimension(DimensionEverglades.DIMID))); } else { thePlayer.timeUntilPortal = 100; thePlayer.mcServer.getConfigurationManager() @@ -322,33 +322,33 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti * A randomly called display update to be able to add particles or other items for display */ public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) { - if (CORE.RANDOM.nextInt(100) == 0) { + if (GTPPCore.RANDOM.nextInt(100) == 0) { par1World.playSound( par2 + 0.5D, par3 + 0.5D, par4 + 0.5D, "portal.portal", 0.5F, - CORE.RANDOM.nextFloat() * 0.4F + 0.8F, + GTPPCore.RANDOM.nextFloat() * 0.4F + 0.8F, false); } for (int l = 0; l < 4; ++l) { - double d0 = par2 + CORE.RANDOM.nextFloat(); - double d1 = par3 + CORE.RANDOM.nextFloat(); - double d2 = par4 + CORE.RANDOM.nextFloat(); + double d0 = par2 + GTPPCore.RANDOM.nextFloat(); + double d1 = par3 + GTPPCore.RANDOM.nextFloat(); + double d2 = par4 + GTPPCore.RANDOM.nextFloat(); double d3 = 0.0D; double d4 = 0.0D; double d5 = 0.0D; - int i1 = CORE.RANDOM.nextInt(2) * 2 - 1; - d3 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; - d4 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; - d5 = (CORE.RANDOM.nextFloat() - 0.5D) * 0.5D; + int i1 = GTPPCore.RANDOM.nextInt(2) * 2 - 1; + d3 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D; + d4 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D; + d5 = (GTPPCore.RANDOM.nextFloat() - 0.5D) * 0.5D; if (par1World.getBlock(par2 - 1, par3, par4) != this && par1World.getBlock(par2 + 1, par3, par4) != this) { d0 = par2 + 0.5D + 0.25D * i1; - d3 = CORE.RANDOM.nextFloat() * 2.0F * i1; + d3 = GTPPCore.RANDOM.nextFloat() * 2.0F * i1; } else { d2 = par4 + 0.5D + 0.25D * i1; - d5 = CORE.RANDOM.nextFloat() * 2.0F * i1; + d5 = GTPPCore.RANDOM.nextFloat() * 2.0F * i1; } par1World.spawnParticle("reddust", d0 + 0.1D, d1, d2, d3, d4, d5); par1World.spawnParticle("smoke", d0, d1 + 0.1D, d2, 0, 0, 0); diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 7cbc1cb5e0..dd6a35d008 100644 --- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -1,11 +1,11 @@ package gtPlusPlus.everglades.block; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockFluidLakes; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockPortalFrame; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockSecondLayer; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.blockTopLayer; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalBlock; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.portalItem; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockFluidLakes; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockPortalFrame; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockSecondLayer; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.blockTopLayer; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.portalBlock; +import static gtPlusPlus.everglades.dimension.DimensionEverglades.portalItem; import net.minecraft.init.Blocks; import net.minecraftforge.fluids.FluidRegistry; diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index ad0c601092..f49046cd2b 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -32,7 +32,7 @@ import net.minecraftforge.event.terraingen.PopulateChunkEvent; import net.minecraftforge.event.terraingen.TerrainGen; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class ChunkProviderModded implements IChunkProvider { @@ -181,11 +181,11 @@ public class ChunkProviderModded implements IChunkProvider { for (int k3 = 0; k3 < 4; ++k3) { if ((d15 += d16) > 0.0D) { - p_147424_3_[j3 += short1] = Dimension_Everglades.blockMainFiller; + p_147424_3_[j3 += short1] = DimensionEverglades.blockMainFiller; } else if (k2 * 8 + l2 < b0) { try { - p_147424_3_[j3 += short1] = Dimension_Everglades.blockFluidLakes; // River Fluid - // . + p_147424_3_[j3 += short1] = DimensionEverglades.blockFluidLakes; // River Fluid + // . } catch (Throwable t) { p_147424_3_[j3 += short1] = Blocks.water; // River Fluid Fallback } @@ -446,8 +446,7 @@ public class ChunkProviderModded implements IChunkProvider { l1 = this.rand.nextInt(256); i2 = l + this.rand.nextInt(16) + 8; try { - (new WorldGenLakes(Dimension_Everglades.blockFluidLakes)) - .generate(this.worldObj, this.rand, k1, l1, i2); + (new WorldGenLakes(DimensionEverglades.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2); } catch (NullPointerException n) { n.getStackTrace(); (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2); diff --git a/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java index 0520c5850b..702a3210a2 100644 --- a/src/main/java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/dimension/DimensionEverglades.java @@ -4,15 +4,15 @@ import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraftforge.common.DimensionManager; -import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.lib.GTPPCore; import gtPlusPlus.everglades.block.BlockEvergladesPortal; import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger; import gtPlusPlus.everglades.world.WorldProviderMod; -public class Dimension_Everglades { +public class DimensionEverglades { public Object instance; - public static int DIMID = CORE.EVERGLADES_ID; + public static int DIMID = GTPPCore.EVERGLADES_ID; public static BlockEvergladesPortal portalBlock; public static ItemEvergladesPortalTrigger portalItem; public static Block blockTopLayer; diff --git a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinableCustom.java index e3ce830f27..0b2062ca88 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/gen/WorldGenMinableCustom.java @@ -1,6 +1,6 @@ package gtPlusPlus.everglades.gen; -import static gtPlusPlus.core.lib.CORE.PI; +import static gtPlusPlus.core.lib.GTPPCore.PI; import java.util.Random; @@ -12,7 +12,7 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import gtPlusPlus.api.objects.Logger; -public class WorldGenMinable_Custom extends WorldGenMinable { +public class WorldGenMinableCustom extends WorldGenMinable { /** The block to generate. */ private Block oreToGenerate; @@ -23,18 +23,18 @@ public class WorldGenMinable_Custom extends WorldGenMinable { /** The meta of the block. */ private int mineableBlockMeta; - public WorldGenMinable_Custom(final Block block, final int count) { + public WorldGenMinableCustom(final Block block, final int count) { super(block, count, Blocks.stone); } - public WorldGenMinable_Custom(final Block block, final int count, final Block target) { + public WorldGenMinableCustom(final Block block, final int count, final Block target) { super(block, count, target); this.oreToGenerate = block; this.numberOfBlocks = count; this.blockToReplace = target; } - public WorldGenMinable_Custom(final Block block, final int meta, final int number, final Block target) { + public WorldGenMinableCustom(final Block block, final int meta, final int number, final Block target) { this(block, number, target); this.mineableBlockMeta = meta; } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index a35b528726..9ce91e3e4d 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java @@ -8,7 +8,7 @@ import java.util.concurrent.ConcurrentHashMap; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; +import gtPlusPlus.xmod.gregtech.HandlerGT; public abstract class WorldGen_GT { @@ -18,7 +18,7 @@ public abstract class WorldGen_GT { public WorldGen_GT(String aName, List aList, boolean aDefault) { this.mWorldGenName = aName; - this.mEnabled = HANDLER_GT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault); + this.mEnabled = HandlerGT.sCustomWorldgenFile.get("worldgen", this.mWorldGenName, aDefault); if (this.mEnabled) { aList.add(this); } @@ -38,7 +38,7 @@ public abstract class WorldGen_GT { String aDimName = aWorld.provider.getDimensionName(); Boolean tAllowed = (Boolean) this.mDimensionMap.get(aDimName); if (tAllowed == null) { - boolean tValue = HANDLER_GT.sCustomWorldgenFile + boolean tValue = HandlerGT.sCustomWorldgenFile .get("worldgen.dimensions." + this.mWorldGenName, aDimName, aDimensionType == aAllowedDimensionType); this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue)); return tValue; diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index ac93a847fa..d7f0815368 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -14,12 +14,12 @@ import net.minecraft.world.gen.feature.WorldGenMinable; import cpw.mods.fml.common.IWorldGenerator; import gregtech.api.objects.XSTR; -import gregtech.api.util.GT_Log; -import gregtech.common.GT_Worldgenerator; +import gregtech.api.util.GTLog; +import gregtech.common.GTWorldgenerator; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.everglades.dimension.DimensionEverglades; +import gtPlusPlus.xmod.gregtech.HandlerGT; public class WorldGen_GT_Base implements IWorldGenerator { @@ -60,10 +60,10 @@ public class WorldGen_GT_Base implements IWorldGenerator { 0, 0, 0, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON); + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON); public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); @@ -73,21 +73,21 @@ public class WorldGen_GT_Base implements IWorldGenerator { public WorldGen_GT_Base() { if (debugWorldGen) { - GT_Log.out.println("GTPP_Worldgenerator created"); + GTLog.out.println("GTPP_Worldgenerator created"); } } @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - if (world.provider.dimensionId == Dimension_Everglades.DIMID) { + if (world.provider.dimensionId == DimensionEverglades.DIMID) { generateSafely(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); } } public synchronized void generateSafely(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - int xDim = Dimension_Everglades.DIMID; + int xDim = DimensionEverglades.DIMID; switch (world.provider.dimensionId) { case -1: // Nether // generateNether(world, random, chunkX * 16, chunkZ * 16); @@ -118,7 +118,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { new XSTR(Math.abs(aRandom.nextInt()) + 1), aX, aZ, - Dimension_Everglades.DIMID, + DimensionEverglades.DIMID, aWorld, aChunkGenerator, aChunkProvider, @@ -127,7 +127,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } else { Logger.WORLD("Locked List addition. Fail."); } - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( "ADD WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId @@ -149,7 +149,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // chunks get done later. for (int i = 0; i < mList_sS; i++) { WorldGenContainer toRun = (WorldGenContainer) WorldGen_GT_Base.mList.get(0); - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( "RUN WorldSeed:" + aWorld.getSeed() + " DimId" + aWorld.provider.dimensionId @@ -269,7 +269,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } if (debugWorldGen) { - GT_Log.out.println( + GTLog.out.println( " Finding oreveins for oreveinSeed=" + oreveinSeed + " mX=" + this.mX @@ -341,7 +341,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkProvider); switch (placementResult) { case WorldGen_GT_Ore_Layer.ORE_PLACED -> { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Added oreveinSeed=" + oreveinSeed + " tries at oremix=" + i @@ -365,7 +365,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Orevein didn't reach this chunk, // can't add it yet to the hash Logger.INFO("[World Generation Debug] NO_OVERLAP"); - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Added far oreveinSeed=" + oreveinSeed + " " + (tWorldGen).mWorldGenName @@ -379,7 +379,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { oreveinFound = true; } case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " No overlap and air block in test spot=" + oreveinSeed + " " + (tWorldGen).mWorldGenName @@ -396,7 +396,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } break; // Try the next orevein } catch (Throwable e) { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( "Exception occurred on oreVein" + tWorldGen + " oreveinSeed=" + oreveinSeed @@ -408,7 +408,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { + oreseedX + " oreseedZ=" + oreseedZ); - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } } } @@ -416,7 +416,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Only add an empty orevein if are unable to place a vein // at the oreseed chunk. if ((!oreveinFound) && (this.mX == oreseedX) && (this.mZ == oreseedZ)) { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Empty oreveinSeed=" + oreveinSeed + " mX=" + this.mX @@ -435,7 +435,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { validOreveins.put(oreveinSeed, noOresInVein); } } else if (oreveinPercentageRoll >= oreveinPercentage) { - if (debugWorldGen) GT_Log.out.println( + if (debugWorldGen) GTLog.out.println( " Skipped oreveinSeed=" + oreveinSeed + " mX=" + this.mX @@ -455,7 +455,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } } else { // oreseed is located in the previously processed table - if (debugWorldGen) GT_Log.out + if (debugWorldGen) GTLog.out .print(" Valid oreveinSeed=" + oreveinSeed + " validOreveins.size()=" + validOreveins.size() + " "); WorldGen_GT_Ore_Layer tWorldGen = validOreveins.get(oreveinSeed); oreveinRNG.setSeed(oreveinSeed ^ (Block.getIdFromBlock(tWorldGen.mPrimaryMeta))); // Reset @@ -484,10 +484,10 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkProvider); switch (placementResult) { case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { - if (debugWorldGen) GT_Log.out.println(" No ore in bottom layer"); + if (debugWorldGen) GTLog.out.println(" No ore in bottom layer"); } case WorldGen_GT_Ore_Layer.NO_OVERLAP -> { - if (debugWorldGen) GT_Log.out.println(" No overlap"); + if (debugWorldGen) GTLog.out.println(" No overlap"); } } } @@ -522,8 +522,8 @@ public class WorldGen_GT_Base implements IWorldGenerator { for (int x = wXbox; x < eXbox; x++) { for (int z = nZbox; z < sZbox; z++) { // Determine if this X/Z is an orevein seed - if (GT_Worldgenerator.isOreChunk(x, z)) { - if (debugWorldGen) GT_Log.out.println("Adding seed x=" + x + " z=" + z); + if (GTWorldgenerator.isOreChunk(x, z)) { + if (debugWorldGen) GTLog.out.println("Adding seed x=" + x + " z=" + z); seedList.add(new NearbySeeds(x, z)); } } @@ -532,7 +532,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Now process each oreseed vs this requested chunk for (; seedList.size() != 0; seedList.remove(0)) { if (debugWorldGen) - GT_Log.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ); + GTLog.out.println("Processing seed x=" + seedList.get(0).mX + " z=" + seedList.get(0).mZ); worldGenFindVein(seedList.get(0).mX, seedList.get(0).mZ); } @@ -540,9 +540,9 @@ public class WorldGen_GT_Base implements IWorldGenerator { // Do leftover worldgen for this chunk (GT_Stones and GT_small_ores) try { - for (WorldGen_GT tWorldGen : HANDLER_GT.sWorldgenListEverglades) { + for (WorldGen_GT tWorldGen : HandlerGT.sWorldgenListEverglades) { /* - * if (debugWorldGen) GT_Log.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName ); + * if (debugWorldGen) GTLog.out.println( "tWorldGen.mWorldGenName="+tWorldGen.mWorldGenName ); */ tWorldGen.executeWorldgen( this.mWorld, @@ -555,7 +555,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkProvider); } } catch (Throwable e) { - e.printStackTrace(GT_Log.err); + e.printStackTrace(GTLog.err); } long leftOverTime = System.nanoTime(); @@ -567,7 +567,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { long endTime = System.nanoTime(); long duration = (endTime - startTime); if (debugWorldGen) { - GT_Log.out.println( + GTLog.out.println( " Oregen took " + (oregenTime - startTime) + " Leftover gen took " + (leftOverTime - oregenTime) diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index 90aea7b71a..bfeeff8910 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -15,16 +15,16 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; -import gregtech.api.GregTech_API; +import gregtech.api.GregTechAPI; import gregtech.api.enums.Materials; -import gregtech.api.util.GT_Log; -import gregtech.common.blocks.GT_Block_Ores; -import gregtech.common.blocks.GT_TileEntity_Ores; +import gregtech.api.util.GTLog; +import gregtech.common.blocks.BlockOres; +import gregtech.common.blocks.TileEntityOres; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; -import gtPlusPlus.xmod.gregtech.HANDLER_GT; +import gtPlusPlus.everglades.dimension.DimensionEverglades; +import gtPlusPlus.xmod.gregtech.HandlerGT; public class WorldGen_GT_Ore_Layer extends WorldGen_GT { @@ -85,23 +85,23 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { boolean GC_UNUSED3, Material aPrimary, Material aSecondary, Material aBetween, Material aSporadic) { super(aName, sList, aDefault); Logger.WORLD("Creating Ore Layer Object"); - this.mOverworld = HANDLER_GT.sCustomWorldgenFile + this.mOverworld = HandlerGT.sCustomWorldgenFile .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); - this.mNether = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); - this.mEnd = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); + this.mNether = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); + this.mEnd = HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); this.mMinY = 5; short mMaxY = 14; if (mMaxY < (this.mMinY + 7)) { - GT_Log.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!"); + GTLog.out.println("Oremix " + this.mWorldGenName + " has invalid Min/Max heights!"); mMaxY = (short) (this.mMinY + 7); } this.mMaxY = mMaxY; - this.mWeight = ((short) HANDLER_GT.sCustomWorldgenFile + this.mWeight = ((short) HandlerGT.sCustomWorldgenFile .get(aTextWorldgen + this.mWorldGenName, "RandomWeight", aWeight)); - this.mDensity = ((short) HANDLER_GT.sCustomWorldgenFile + this.mDensity = ((short) HandlerGT.sCustomWorldgenFile .get(aTextWorldgen + this.mWorldGenName, "Density", aDensity)); this.mSize = ((short) Math - .max(1, HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); + .max(1, HandlerGT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Size", aSize))); this.mPrimary = aPrimary; this.mSecondary = aSecondary; this.mBetween = aBetween; @@ -136,14 +136,14 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } if (mWorldGenName.equals("vein0")) { - if (debugWorldGen) GT_Log.out.println(" NoOresInVein-vein0"); + if (debugWorldGen) GTLog.out.println(" NoOresInVein-vein0"); // This is a special empty orevein Logger.WORLD("[World Generation Debug] Special Empty Vein placed."); return ORE_PLACED; } - if (aDimensionType != Dimension_Everglades.DIMID) { + if (aDimensionType != DimensionEverglades.DIMID) { /* - * // Debug code, but spams log if (debugWorldGen) { GT_Log.out.println( "Wrong dimension" ); } + * // Debug code, but spams log if (debugWorldGen) { GTLog.out.println( "Wrong dimension" ); } */ Logger.WORLD("[World Generation Debug] Wrong dimension."); return WRONG_DIMENSION; @@ -164,19 +164,19 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { Block tBlock = aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8); if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone) || tBlock - .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondLayer) + .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, DimensionEverglades.blockSecondLayer) || tBlock - .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Dimension_Everglades.blockMainFiller) + .isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, DimensionEverglades.blockMainFiller) || tBlock.isReplaceableOreGen( aWorld, aChunkX + 8, tMinY, aChunkZ + 8, - Dimension_Everglades.blockSecondaryFiller) + DimensionEverglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockStones)) { + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockGranites) + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockStones)) { // Didn't reach, but could have placed. Save orevein for future use. return NO_OVERLAP; } else { @@ -195,8 +195,8 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.netherrack) || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, Blocks.end_stone) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites) - || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTech_API.sBlockStones)) { + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockGranites) + || tBlock.isReplaceableOreGen(aWorld, aChunkX + 8, tMinY, aChunkZ + 8, GregTechAPI.sBlockStones)) { // Didn't reach, but could have placed. Save orevein for future use. return NO_OVERLAP; } else { @@ -207,7 +207,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (debugWorldGen) { String tDimensionName = aWorld.provider.getDimensionName(); - GT_Log.out.print( + GTLog.out.print( "Trying Orevein:" + this.mWorldGenName + " Dimension=" + tDimensionName @@ -254,7 +254,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } } /* - * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GT_Log.out.println( " No ore in bottom layer" ); + * if ((placeCount[1]+placeCount[3])==0) { if (debugWorldGen) GTLog.out.println( " No ore in bottom layer" ); * return NO_ORE_IN_BOTTOM_LAYER; // Exit early, didn't place anything in the bottom layer } */ Logger.WORLD("[World Generation Debug] Trying to set Ores?"); @@ -359,7 +359,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } if (debugWorldGen) { String tDimensionName = aWorld.provider.getDimensionName(); - GT_Log.out.println( + GTLog.out.println( "Generated Orevein:" + this.mWorldGenName + " Dimension=" + tDimensionName @@ -408,7 +408,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { } // Set GT ORE - if (aMetaData instanceof GT_Block_Ores) { + if (aMetaData instanceof BlockOres) { if (ore1String.equals("unset")) { ore1String = Utils.sanitizeString( this.mPrimary.getLocalizedName() @@ -527,11 +527,11 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { if (tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sand) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockStones) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondLayer) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockMainFiller) - || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondaryFiller) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockGranites) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTechAPI.sBlockStones) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondLayer) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockMainFiller) + || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, DimensionEverglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) { if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)) { @@ -550,7 +550,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { Method setOres = null; try { - setOres = GT_TileEntity_Ores.class.getDeclaredMethod( + setOres = TileEntityOres.class.getDeclaredMethod( "setOreBlock", World.class, int.class, diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index e45b4bcd20..6ccdcaf115 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java @@ -2,9 +2,9 @@ package gtPlusPlus.everglades.gen.gt; import java.util.Hashtable; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.material.ORES; -import gtPlusPlus.core.material.nuclear.FLUORIDES; +import gtPlusPlus.core.material.MaterialsElements; +import gtPlusPlus.core.material.MaterialsOres; +import gtPlusPlus.core.material.nuclear.MaterialsFluorides; public class WorldGen_Ores { @@ -15,10 +15,10 @@ public class WorldGen_Ores { 1, 1, 128, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON, - ELEMENT.getInstance().IRON); + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON, + MaterialsElements.getInstance().IRON); /** * Custom ore Veins @@ -30,10 +30,10 @@ public class WorldGen_Ores { 30, 2, 16, - ORES.AGARDITE_CD, - ORES.AGARDITE_LA, - ORES.DEMICHELEITE_BR, - ORES.IRARSITE); + MaterialsOres.AGARDITE_CD, + MaterialsOres.AGARDITE_LA, + MaterialsOres.DEMICHELEITE_BR, + MaterialsOres.IRARSITE); public static WorldGen_GT_Ore_Layer Vein2 = new WorldGen_GT_Ore_Layer( "vein2", @@ -42,10 +42,10 @@ public class WorldGen_Ores { 30, 2, 16, - ORES.AGARDITE_ND, - ORES.AGARDITE_Y, - ORES.KASHINITE, - ORES.CERITE); + MaterialsOres.AGARDITE_ND, + MaterialsOres.AGARDITE_Y, + MaterialsOres.KASHINITE, + MaterialsOres.CERITE); public static WorldGen_GT_Ore_Layer Vein3 = new WorldGen_GT_Ore_Layer( "vein3", @@ -54,10 +54,10 @@ public class WorldGen_Ores { 30, 3, 32, - ORES.CERITE, - ORES.NICHROMITE, - ORES.XENOTIME, - ORES.HIBONITE); + MaterialsOres.CERITE, + MaterialsOres.NICHROMITE, + MaterialsOres.XENOTIME, + MaterialsOres.HIBONITE); public static WorldGen_GT_Ore_Layer Vein4 = new WorldGen_GT_Ore_Layer( "vein4", @@ -66,10 +66,10 @@ public class WorldGen_Ores { 40, 3, 32, - ORES.GEIKIELITE, - ORES.CRYOLITE, - ORES.GADOLINITE_CE, - ORES.AGARDITE_ND); + MaterialsOres.GEIKIELITE, + MaterialsOres.CRYOLITE, + MaterialsOres.GADOLINITE_CE, + MaterialsOres.AGARDITE_ND); public static WorldGen_GT_Ore_Layer Vein5 = new WorldGen_GT_Ore_Layer( "vein5", @@ -78,10 +78,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.HIBONITE, - ORES.YTTRIALITE, - ORES.ZIRCONILITE, - ORES.CERITE); + MaterialsOres.HIBONITE, + MaterialsOres.YTTRIALITE, + MaterialsOres.ZIRCONILITE, + MaterialsOres.CERITE); public static WorldGen_GT_Ore_Layer Vein6 = new WorldGen_GT_Ore_Layer( "vein6", 0, @@ -89,10 +89,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.XENOTIME, - ORES.ZIRKELITE, - ORES.CROCROITE, - ORES.IRARSITE); + MaterialsOres.XENOTIME, + MaterialsOres.ZIRKELITE, + MaterialsOres.CROCROITE, + MaterialsOres.IRARSITE); public static WorldGen_GT_Ore_Layer Vein7 = new WorldGen_GT_Ore_Layer( "vein7", 40, @@ -100,10 +100,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.HONEAITE, - ORES.MIESSIITE, - ORES.SAMARSKITE_Y, - ORES.SAMARSKITE_YB); + MaterialsOres.HONEAITE, + MaterialsOres.MIESSIITE, + MaterialsOres.SAMARSKITE_Y, + MaterialsOres.SAMARSKITE_YB); public static WorldGen_GT_Ore_Layer Vein8 = new WorldGen_GT_Ore_Layer( "vein8", 0, @@ -111,10 +111,10 @@ public class WorldGen_Ores { 20, 2, 48, - ORES.TITANITE, - ORES.ZIMBABWEITE, - ORES.ZIRCON, - ORES.FLORENCITE); + MaterialsOres.TITANITE, + MaterialsOres.ZIMBABWEITE, + MaterialsOres.ZIRCON, + MaterialsOres.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein9 = new WorldGen_GT_Ore_Layer( "vein9", @@ -123,10 +123,10 @@ public class WorldGen_Ores { 20, 1, 48, - ORES.LANTHANITE_CE, - FLUORIDES.FLUORITE, - ORES.LAFOSSAITE, - ORES.FLORENCITE); + MaterialsOres.LANTHANITE_CE, + MaterialsFluorides.FLUORITE, + MaterialsOres.LAFOSSAITE, + MaterialsOres.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein10 = new WorldGen_GT_Ore_Layer( "vein10", 20, @@ -134,10 +134,10 @@ public class WorldGen_Ores { 20, 2, 32, - ORES.GEIKIELITE, - ORES.YTTROCERITE, - ORES.LANTHANITE_LA, - ORES.RADIOBARITE); + MaterialsOres.GEIKIELITE, + MaterialsOres.YTTROCERITE, + MaterialsOres.LANTHANITE_LA, + MaterialsOres.RADIOBARITE); public static WorldGen_GT_Ore_Layer Vein11 = new WorldGen_GT_Ore_Layer( "vein11", 30, @@ -145,10 +145,10 @@ public class WorldGen_Ores { 20, 1, 48, - FLUORIDES.FLUORITE, - ORES.KASHINITE, - ORES.ZIRCON, - ORES.CRYOLITE); + MaterialsFluorides.FLUORITE, + MaterialsOres.KASHINITE, + MaterialsOres.ZIRCON, + MaterialsOres.CRYOLITE); public static WorldGen_GT_Ore_Layer Vein12 = new WorldGen_GT_Ore_Layer( "vein12", 40, @@ -156,10 +156,10 @@ public class WorldGen_Ores { 20, 3, 32, - ORES.CERITE, - ORES.ALBURNITE, - ORES.MIESSIITE, - ORES.HIBONITE); + MaterialsOres.CERITE, + MaterialsOres.ALBURNITE, + MaterialsOres.MIESSIITE, + MaterialsOres.HIBONITE); /** * Best Rarest Veins 2017 @@ -171,10 +171,10 @@ public class WorldGen_Ores { 5, 1, 16, - ORES.CRYOLITE, - ORES.RADIOBARITE, - ORES.HONEAITE, - ORES.FLORENCITE); + MaterialsOres.CRYOLITE, + MaterialsOres.RADIOBARITE, + MaterialsOres.HONEAITE, + MaterialsOres.FLORENCITE); public static WorldGen_GT_Ore_Layer Vein14 = new WorldGen_GT_Ore_Layer( "vein14", @@ -183,10 +183,10 @@ public class WorldGen_Ores { 8, 2, 16, - ORES.DEMICHELEITE_BR, - ORES.PERROUDITE, - ORES.IRARSITE, - ORES.RADIOBARITE); + MaterialsOres.DEMICHELEITE_BR, + MaterialsOres.PERROUDITE, + MaterialsOres.IRARSITE, + MaterialsOres.RADIOBARITE); public static WorldGen_GT_Ore_Layer Vein15 = new WorldGen_GT_Ore_Layer( "vein15", @@ -195,10 +195,10 @@ public class WorldGen_Ores { 5, 3, 24, - ORES.FLUORCAPHITE, - ORES.LAFOSSAITE, - ORES.GADOLINITE_CE, - ORES.GADOLINITE_Y); + MaterialsOres.FLUORCAPHITE, + MaterialsOres.LAFOSSAITE, + MaterialsOres.GADOLINITE_CE, + MaterialsOres.GADOLINITE_Y); public static WorldGen_GT_Ore_Layer Vein16 = new WorldGen_GT_Ore_Layer( "vein16", @@ -207,10 +207,10 @@ public class WorldGen_Ores { 4, 2, 32, - ORES.YTTROCERITE, - ORES.LEPERSONNITE, - ORES.LAUTARITE, - FLUORIDES.FLUORITE); + MaterialsOres.YTTROCERITE, + MaterialsOres.LEPERSONNITE, + MaterialsOres.LAUTARITE, + MaterialsFluorides.FLUORITE); public static WorldGen_GT_Ore_Layer Vein17 = new WorldGen_GT_Ore_Layer( "vein17", @@ -219,10 +219,10 @@ public class WorldGen_Ores { 4, 1, 32, - ORES.FLORENCITE, - ORES.LAUTARITE, - ORES.SAMARSKITE_YB, - ORES.POLYCRASE); + MaterialsOres.FLORENCITE, + MaterialsOres.LAUTARITE, + MaterialsOres.SAMARSKITE_YB, + MaterialsOres.POLYCRASE); public static WorldGen_GT_Ore_Layer Vein18 = new WorldGen_GT_Ore_Layer( "vein18", 15, @@ -230,10 +230,10 @@ public class WorldGen_Ores { 4, 1, 48, - ORES.GADOLINITE_CE, - ORES.GADOLINITE_Y, - ORES.AGARDITE_LA, - ORES.AGARDITE_CD); + MaterialsOres.GADOLINITE_CE, + MaterialsOres.GADOLINITE_Y, + MaterialsOres.AGARDITE_LA, + MaterialsOres.AGARDITE_CD); public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); diff --git a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java index be15c2a0d2..a39a863cfc 100644 --- a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java +++ b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java @@ -16,7 +16,7 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class ItemEvergladesPortalTrigger extends Item { @@ -99,7 +99,7 @@ public class ItemEvergladesPortalTrigger extends Item { "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - if (Dimension_Everglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)) { + if (DimensionEverglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)) { // Make a Portal } else { if (!par3World.isRemote) { diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 51f549ad9c..7e463e194c 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -15,7 +15,7 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class TeleporterDimensionMod extends Teleporter { @@ -66,7 +66,7 @@ public class TeleporterDimensionMod extends Teleporter { int i2 = k + i1 * b1 - l * b0; boolean flag = j1 < 0; this.worldServerInstance - .setBlock(k1, l1, i2, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air); + .setBlock(k1, l1, i2, flag ? DimensionEverglades.blockPortalFrame : Blocks.air); } } } @@ -110,9 +110,9 @@ public class TeleporterDimensionMod extends Teleporter { double d5 = l1 + 0.5D - par1Entity.posZ; for (int i2 = this.worldServerInstance.getActualHeight() - 1; i2 >= 0; --i2) { - if (this.worldServerInstance.getBlock(l3, i2, l1) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(l3, i2, l1) == DimensionEverglades.portalBlock) { while (this.worldServerInstance.getBlock(l3, i2 - 1, l1) - == Dimension_Everglades.portalBlock) { + == DimensionEverglades.portalBlock) { --i2; } @@ -143,19 +143,19 @@ public class TeleporterDimensionMod extends Teleporter { d7 = k + 0.5D; int i4 = -1; - if (this.worldServerInstance.getBlock(i - 1, j, k) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i - 1, j, k) == DimensionEverglades.portalBlock) { i4 = 2; } - if (this.worldServerInstance.getBlock(i + 1, j, k) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i + 1, j, k) == DimensionEverglades.portalBlock) { i4 = 0; } - if (this.worldServerInstance.getBlock(i, j, k - 1) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i, j, k - 1) == DimensionEverglades.portalBlock) { i4 = 3; } - if (this.worldServerInstance.getBlock(i, j, k + 1) == Dimension_Everglades.portalBlock) { + if (this.worldServerInstance.getBlock(i, j, k + 1) == DimensionEverglades.portalBlock) { i4 = 1; } @@ -396,7 +396,7 @@ public class TeleporterDimensionMod extends Teleporter { j4 = k2 + (j3 - 1) * l2 - i3 * l5; flag = k3 < 0; this.worldServerInstance - .setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air); + .setBlock(l3, i4, j4, flag ? DimensionEverglades.blockPortalFrame : Blocks.air); } } } @@ -413,7 +413,7 @@ public class TeleporterDimensionMod extends Teleporter { l3, i4, j4, - flag ? Dimension_Everglades.blockPortalFrame : Dimension_Everglades.portalBlock, + flag ? DimensionEverglades.blockPortalFrame : DimensionEverglades.portalBlock, 0, 2); } diff --git a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java index c8a69a3b0e..2b36246e49 100644 --- a/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/WorldProviderMod.java @@ -8,7 +8,7 @@ import net.minecraft.world.chunk.IChunkProvider; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.everglades.chunk.ChunkProviderModded; -import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.dimension.DimensionEverglades; public class WorldProviderMod extends WorldProvider { @@ -17,7 +17,7 @@ public class WorldProviderMod extends WorldProvider { this.worldChunkMgr = new WorldChunkManagerCustom(this.worldObj.getSeed(), WorldType.AMPLIFIED); this.isHellWorld = false; this.hasNoSky = false; - this.dimensionId = Dimension_Everglades.DIMID; + this.dimensionId = DimensionEverglades.DIMID; } @Override |