diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades')
11 files changed, 84 insertions, 32 deletions
diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index ac3665e855..00c6f7deec 100644 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades; +import static gregtech.api.enums.Mods.GTPlusPlusEverglades; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.io.File; @@ -15,11 +17,10 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; +import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.Everglades; -import gtPlusPlus.core.lib.LoadedMods; -import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.ORES; import gtPlusPlus.everglades.biome.Biome_Everglades; @@ -33,14 +34,14 @@ import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; @MCVersion(value = "1.7.10") @Mod( - modid = Everglades.MODID, + modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, name = Everglades.NAME, version = Everglades.VERSION, - dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; required-after:miscutils;") + dependencies = "required-after:Forge; after:dreamcraft; after:IC2; required-after:gregtech; required-after:miscutils;") public class GTplusplus_Everglades implements ActionListener { // Mod Instance - @Mod.Instance(Everglades.MODID) + @Mod.Instance(Mods.Names.G_T_PLUS_PLUS_EVERGLADES) public static GTplusplus_Everglades instance; // Dark World Handler @@ -51,7 +52,7 @@ public class GTplusplus_Everglades implements ActionListener { // Pre-Init @Mod.EventHandler public void preInit(final FMLPreInitializationEvent event) { - Logger.INFO("Loading " + Everglades.MODID + " V" + Everglades.VERSION); + Logger.INFO("Loading " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); // Setup setVars(event); @@ -72,7 +73,7 @@ public class GTplusplus_Everglades implements ActionListener { @EventHandler public void load(final FMLInitializationEvent e) { - Logger.INFO("Begin resource allocation for " + Everglades.MODID + " V" + Everglades.VERSION); + Logger.INFO("Begin resource allocation for " + GTPlusPlusEverglades.ID + " V" + Everglades.VERSION); // Load World and Biome GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); @@ -127,15 +128,6 @@ public class GTplusplus_Everglades implements ActionListener { MaterialGenerator.generateOreMaterial(ORES.RADIOBARITE); MaterialGenerator.generateOreMaterial(ORES.DEEP_EARTH_REACTOR_FUEL_DEPOSIT); - // Custom Ores - if (LoadedMods.Big_Reactors) { - MaterialGenerator.generateOreMaterial( - ELEMENT.getInstance().YELLORIUM, - false, - false, - true, - new short[] { 255, 242, 10 }); - } } protected synchronized void setVars(FMLPreInitializationEvent event) { diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java index 2ea16a553a..b0139b2252 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java @@ -1,7 +1,27 @@ package gtPlusPlus.everglades.biome; -import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*; -import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.BIG_SHROOM; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CACTUS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.CLAY; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.DEAD_BUSH; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.FLOWERS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.GRASS; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LAKE; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.LILYPAD; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.PUMPKIN; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.REED; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SAND_PASS2; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.SHROOM; +import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.TREE; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.COAL; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIAMOND; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.DIRT; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.GOLD; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.GRAVEL; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.IRON; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.LAPIS; +import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.REDSTONE; import java.util.Random; @@ -11,7 +31,15 @@ import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.biome.BiomeDecorator; import net.minecraft.world.biome.BiomeGenBase; -import net.minecraft.world.gen.feature.*; +import net.minecraft.world.gen.feature.WorldGenAbstractTree; +import net.minecraft.world.gen.feature.WorldGenBigMushroom; +import net.minecraft.world.gen.feature.WorldGenCactus; +import net.minecraft.world.gen.feature.WorldGenDeadBush; +import net.minecraft.world.gen.feature.WorldGenFlowers; +import net.minecraft.world.gen.feature.WorldGenLiquids; +import net.minecraft.world.gen.feature.WorldGenPumpkin; +import net.minecraft.world.gen.feature.WorldGenReed; +import net.minecraft.world.gen.feature.WorldGenerator; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.OreGenEvent; diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java index 0d3b59e166..a91ed0cd84 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.block.BlockGrass; import gtPlusPlus.api.interfaces.ITileTooltip; @@ -11,7 +13,7 @@ public class BlockDarkWorldGround extends BlockGrass implements ITileTooltip { this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround"); this.setHardness(1.0F); - this.setBlockTextureName("minecraft" + ":" + "grass"); + this.setBlockTextureName(Minecraft.ID + ":" + "grass"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java index 7590af19ef..43bb2ecac0 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.Minecraft; + import net.minecraft.block.BlockDirt; import net.minecraft.world.ColorizerGrass; import net.minecraft.world.IBlockAccess; @@ -15,7 +17,7 @@ public class BlockDarkWorldPollutedDirt extends BlockDirt implements ITileToolti this.setCreativeTab(AddToCreativeTab.tabBOP); this.setBlockName("blockDarkWorldGround2"); this.setHardness(0.5F); - this.setBlockTextureName("minecraft" + ":" + "dirt"); + this.setBlockTextureName(Minecraft.ID + ":" + "dirt"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java index e034d3e09e..1f8b82e9ca 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java @@ -1,11 +1,12 @@ package gtPlusPlus.everglades.block; +import static gregtech.api.enums.Mods.GTPlusPlus; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import gtPlusPlus.api.interfaces.ITileTooltip; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { @@ -15,7 +16,7 @@ public class BlockDarkWorldPortalFrame extends Block implements ITileTooltip { this.setBlockName("blockDarkWorldPortalFrame"); this.setHardness(3.0F); this.setLightLevel(0.5F); - this.setBlockTextureName(CORE.MODID + ":" + "metro/TEXTURE_TECH_PANEL_A"); + this.setBlockTextureName(GTPlusPlus.ID + ":" + "metro/TEXTURE_TECH_PANEL_A"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index 66e03d8a77..4e1ca32dd0 100644 --- a/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java +++ b/src/main/java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -1,6 +1,11 @@ package gtPlusPlus.everglades.block; -import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*; +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 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 f9dcba5df4..6fafb08a31 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -9,11 +9,19 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.MathHelper; -import net.minecraft.world.*; +import net.minecraft.world.ChunkPosition; +import net.minecraft.world.SpawnerAnimals; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.*; +import net.minecraft.world.gen.MapGenBase; +import net.minecraft.world.gen.MapGenCaves; +import net.minecraft.world.gen.MapGenRavine; +import net.minecraft.world.gen.NoiseGenerator; +import net.minecraft.world.gen.NoiseGeneratorOctaves; +import net.minecraft.world.gen.NoiseGeneratorPerlin; import net.minecraft.world.gen.feature.WorldGenLakes; import net.minecraft.world.gen.structure.MapGenMineshaft; import net.minecraft.world.gen.structure.MapGenScatteredFeature; 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 eeb45cee22..fcc7c05ae2 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 @@ -1,6 +1,10 @@ package gtPlusPlus.everglades.gen.gt; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Hashtable; +import java.util.List; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; 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 0489cec91e..fa34803054 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 @@ -4,7 +4,10 @@ import static gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base.debugWorldGen; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; +import java.util.Random; import net.minecraft.block.Block; import net.minecraft.init.Blocks; diff --git a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java index 5e3d82a4b4..2f85fa50e9 100644 --- a/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java +++ b/src/main/java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java @@ -1,5 +1,7 @@ package gtPlusPlus.everglades.item; +import static gregtech.api.enums.Mods.GTPlusPlus; + import java.util.List; import net.minecraft.block.Block; @@ -13,7 +15,6 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; @@ -24,7 +25,7 @@ public class ItemEvergladesPortalTrigger extends Item { this.maxStackSize = 1; setMaxDamage(64); setCreativeTab(CreativeTabs.tabTools); - this.setTextureName(CORE.MODID + ":" + "itemAlkalusDisk"); + this.setTextureName(GTPlusPlus.ID + ":" + "itemAlkalusDisk"); } @Override diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 1d700b16b0..2951ed3a57 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -1,10 +1,16 @@ package gtPlusPlus.everglades.world; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Random; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; -import net.minecraft.util.*; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.util.Direction; +import net.minecraft.util.LongHashMap; +import net.minecraft.util.MathHelper; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; |