diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index fb254b95d..d8232099f 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -182,21 +182,21 @@ public class CommonProxy */ public void loadConfiguration() { - Mekanism.osmiumGenerationEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumGenerationEnabled", true).getBoolean(true); - Mekanism.copperGenerationEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperGenerationEnabled", true).getBoolean(true); - Mekanism.tinGenerationEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinGenerationEnabled", true).getBoolean(true); Mekanism.updateNotifications = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpdateNotifications", true).getBoolean(true); Mekanism.controlCircuitOreDict = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ControlCircuitOreDict", true).getBoolean(true); Mekanism.logPackets = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "LogPackets", false).getBoolean(false); - Mekanism.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean(true); + Mekanism.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean(false); Mekanism.voiceServerEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoiceServerEnabled", true).getBoolean(true); Mekanism.cardboardSpawners = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowSpawnerBoxPickup", true).getBoolean(true); + Mekanism.enableWorldRegeneration = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false).getBoolean(false); Mekanism.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); Mekanism.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); Mekanism.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt(); - Mekanism.osmiumGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumGenerationAmount", 12).getInt(); - Mekanism.copperGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperGenerationAmount", 16).getInt(); - Mekanism.tinGenerationAmount = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinGenerationAmount", 14).getInt(); + Mekanism.osmiumPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumPerChunk", 12).getInt(); + Mekanism.copperPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperPerChunk", 16).getInt(); + Mekanism.tinPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinPerChunk", 14).getInt(); + Mekanism.saltPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SaltPerChunk", 2).getInt(); + Mekanism.userWorldGenVersion = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "WorldRegenVersion", 0).getInt(); Mekanism.FROM_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToEU", 10D).getDouble(10D); Mekanism.TO_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EUToJoules", .1D).getDouble(.1D); Mekanism.FROM_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToMJ", 25D).getDouble(25D); @@ -263,7 +263,9 @@ public class CommonProxy Mekanism.fluidicPlenisherUsage = Mekanism.configuration.get("usage", "FluidicPlenisherUsage", 100D).getDouble(100D); if(Mekanism.configuration.hasChanged()) + { Mekanism.configuration.save(); + } } /** @@ -271,7 +273,7 @@ public class CommonProxy */ public void loadUtilities() { - FMLCommonHandler.instance().bus().register(new CommonWorldTickHandler()); + FMLCommonHandler.instance().bus().register(Mekanism.worldTickHandler); } /** diff --git a/src/main/java/mekanism/common/CommonWorldTickHandler.java b/src/main/java/mekanism/common/CommonWorldTickHandler.java index 0707151ab..0349b25ae 100644 --- a/src/main/java/mekanism/common/CommonWorldTickHandler.java +++ b/src/main/java/mekanism/common/CommonWorldTickHandler.java @@ -3,13 +3,17 @@ package mekanism.common; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedList; import java.util.Map; +import java.util.Queue; +import java.util.Random; import mekanism.api.Coord4D; import mekanism.common.tank.DynamicTankCache; import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.World; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; @@ -18,6 +22,39 @@ import cpw.mods.fml.relauncher.Side; public class CommonWorldTickHandler { + private static final long maximumDeltaTimeNanoSecs = 16000000; // 16 milliseconds + + private HashMap> chunkRegenMap; + + public void addRegenChunk(int dimensionId, ChunkCoordIntPair chunkCoord) + { + if(chunkRegenMap == null) + { + chunkRegenMap = new HashMap>(); + } + + if(!chunkRegenMap.containsKey(dimensionId)) + { + LinkedList list = new LinkedList(); + list.add(chunkCoord); + chunkRegenMap.put(dimensionId, list); + } + else { + if(!chunkRegenMap.get(dimensionId).contains(chunkCoord)) + { + chunkRegenMap.get(dimensionId).add(chunkCoord); + } + } + } + + public void resetRegenChunks() + { + if(chunkRegenMap != null) + { + chunkRegenMap.clear(); + } + } + @SubscribeEvent public void onTick(WorldTickEvent event) { @@ -86,6 +123,42 @@ public class CommonWorldTickHandler Mekanism.dynamicInventories.remove(inventoryID); } + + if(chunkRegenMap == null) + { + return; + } + + int dimensionId = world.provider.dimensionId; + + //Credit to E. Beef :) + if(chunkRegenMap.containsKey(dimensionId)) + { + Queue chunksToGen = chunkRegenMap.get(dimensionId); + long startTime = System.nanoTime(); + + while(System.nanoTime() - startTime < maximumDeltaTimeNanoSecs && !chunksToGen.isEmpty()) + { + ChunkCoordIntPair nextChunk = chunksToGen.poll(); + + if(nextChunk == null) + { + break; + } + + Random fmlRandom = new Random(world.getSeed()); + long xSeed = fmlRandom.nextLong() >> 2 + 1L; + long zSeed = fmlRandom.nextLong() >> 2 + 1L; + fmlRandom.setSeed((xSeed*nextChunk.chunkXPos + zSeed*nextChunk.chunkZPos) ^ world.getSeed()); + + Mekanism.genHandler.generate(fmlRandom, nextChunk.chunkXPos, nextChunk.chunkZPos, world, world.getChunkProvider(), world.getChunkProvider()); + } + + if(chunksToGen.isEmpty()) + { + chunkRegenMap.remove(dimensionId); + } + } } } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 49f97de95..d9ccaa2f1 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -48,6 +48,7 @@ import mekanism.common.block.BlockObsidianTNT; import mekanism.common.block.BlockOre; import mekanism.common.block.BlockPlastic; import mekanism.common.block.BlockPlasticFence; +import mekanism.common.block.BlockSalt; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; @@ -64,6 +65,7 @@ import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; import mekanism.common.item.ItemClump; import mekanism.common.item.ItemConfigurator; +import mekanism.common.item.ItemControlCircuit; import mekanism.common.item.ItemCrystal; import mekanism.common.item.ItemDictionary; import mekanism.common.item.ItemDirtyDust; @@ -107,6 +109,7 @@ import mekanism.common.transporter.TransporterManager; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.common.voice.VoiceServerManager; +import mekanism.common.world.GenHandler; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -114,9 +117,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.ChunkCoordIntPair; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.event.world.ChunkDataEvent; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -210,6 +216,14 @@ public class Mekanism /** A list of the usernames of players who have donated to Mekanism. */ public static List donators = new ArrayList(); + public static CommonWorldTickHandler worldTickHandler = new CommonWorldTickHandler(); + + /** The Mekanism world generation handler. */ + public static GenHandler genHandler = new GenHandler(); + + /** The version of ore generation in this version of Mekanism. Increment this every time the default ore generation changes. */ + public static int baseWorldGenVersion = 0; + public static KeySync keyMap = new KeySync(); public static Set jetpackOn = new HashSet(); @@ -228,7 +242,6 @@ public class Mekanism public static ItemRobit Robit; public static ItemAtomicDisassembler AtomicDisassembler; public static Item AtomicCore; - public static Item ControlCircuit; public static Item EnrichedIron; public static Item CompressedCarbon; public static Item PortableTeleporter; @@ -274,6 +287,7 @@ public class Mekanism public static Block BlockReinforcedHDPE; public static Block BlockRoadHDPE; public static Block BlockHDPEFence; + public static Block SaltBlock; //Multi-ID Items public static Item Dust; @@ -282,11 +296,9 @@ public class Mekanism public static Item DirtyDust; public static Item Shard; public static Item Crystal; + public static Item ControlCircuit; //General Configuration - public static boolean osmiumGenerationEnabled = true; - public static boolean copperGenerationEnabled = true; - public static boolean tinGenerationEnabled = true; public static boolean updateNotifications = true; public static boolean controlCircuitOreDict = true; public static boolean logPackets = false; @@ -294,14 +306,17 @@ public class Mekanism public static boolean voiceServerEnabled = true; public static boolean cardboardSpawners = true; public static boolean machineEffects = true; + public static boolean enableWorldRegeneration = true; public static int obsidianTNTBlastRadius = 12; - public static int osmiumGenerationAmount = 12; - public static int copperGenerationAmount = 16; - public static int tinGenerationAmount = 14; + public static int osmiumPerChunk = 12; + public static int copperPerChunk = 16; + public static int tinPerChunk = 14; + public static int saltPerChunk = 2; public static int obsidianTNTDelay = 100; public static int UPDATE_DELAY = 10; public static int VOICE_PORT = 36123; public static int maxUpgradeMultiplier = 10; + public static int userWorldGenVersion = 0; public static double ENERGY_PER_REDSTONE = 10000; public static EnergyType activeType = EnergyType.J; @@ -392,6 +407,9 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 6), new Object[] { "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 13) })); + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SaltBlock), new Object[] { + "**", "**", Character.valueOf('*'), Salt + })); //Base Recipes CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianTNT, 1), new Object[] { @@ -744,6 +762,9 @@ public class Mekanism RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 3)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 1), new ItemStack(Blocks.stonebrick, 1, 0)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.quartz_ore), new ItemStack(Items.quartz, 2)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.glowstone), new ItemStack(Items.glowstone_dust, 4)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.clay), new ItemStack(Items.clay_ball, 4)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(SaltBlock), new ItemStack(Salt, 4)); for(int i = 0; i < EnumColor.DYES.length; i++) { @@ -768,7 +789,8 @@ public class Mekanism RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 2), new ItemStack(Blocks.stone)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 0), new ItemStack(Blocks.stonebrick, 1, 2)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stonebrick, 1, 3), new ItemStack(Blocks.stonebrick, 1, 0)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.flint, 4), new ItemStack(Items.gunpowder)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.flint), new ItemStack(Items.gunpowder)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.sandstone), new ItemStack(Blocks.sand, 2)); for(int i = 0; i < 16; i++) @@ -791,7 +813,6 @@ public class Mekanism //Purification Chamber Recipes RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(Clump, 3, 6)); - RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.gravel), new ItemStack(Items.flint)); //Chemical Injection Chamber Recipes RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Blocks.obsidian), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Shard, 4, 6)); @@ -903,7 +924,7 @@ public class Mekanism PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); EnrichedAlloy = new ItemMekanism().setUnlocalizedName("EnrichedAlloy"); EnrichedIron = new ItemMekanism().setUnlocalizedName("EnrichedIron"); - ControlCircuit = new ItemMekanism().setUnlocalizedName("ControlCircuit"); + ControlCircuit = new ItemControlCircuit(); AtomicCore = new ItemMekanism().setUnlocalizedName("AtomicCore"); TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore"); ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore"); @@ -1013,6 +1034,7 @@ public class Mekanism BlockReinforcedHDPE = new BlockPlastic().setBlockName("ReinforcedPlasticBlock"); BlockRoadHDPE = new BlockPlastic().setBlockName("RoadPlasticBlock"); BlockHDPEFence = new BlockPlasticFence().setBlockName("PlasticFence"); + SaltBlock = new BlockSalt().setBlockName("SaltBlock"); //Registrations GameRegistry.registerBlock(BasicBlock, ItemBlockBasic.class, "BasicBlock"); @@ -1031,6 +1053,7 @@ public class Mekanism GameRegistry.registerBlock(BlockReinforcedHDPE, ItemBlockPlastic.class, "ReinforcedPlasticBlock"); GameRegistry.registerBlock(BlockRoadHDPE, ItemBlockPlastic.class, "RoadPlasticBlock"); GameRegistry.registerBlock(BlockHDPEFence, "PlasticFence"); + GameRegistry.registerBlock(SaltBlock, "SaltBlock"); } /** @@ -1038,10 +1061,11 @@ public class Mekanism */ public void registerOreDict() { - //Add specific items to ore dictionary for recipe usage in other mods. @Calclavia + //Add specific items to ore dictionary for recipe usage in other mods. OreDictionary.registerOre("universalCable", new ItemStack(PartTransmitter, 8, 0)); OreDictionary.registerOre("battery", EnergyTablet.getUnchargedItem()); OreDictionary.registerOre("pulpWood", Sawdust); + OreDictionary.registerOre("blockSalt", SaltBlock); //for RailCraft/IC2. OreDictionary.registerOre("dustObsidian", new ItemStack(DirtyDust, 1, 6)); @@ -1098,9 +1122,12 @@ public class Mekanism OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.redstone_ore)); //OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.lit_redstone_ore)); - if(controlCircuitOreDict || !hooks.BasicComponentsLoaded) + if(controlCircuitOreDict) { - OreDictionary.registerOre("circuitBasic", new ItemStack(ControlCircuit)); + OreDictionary.registerOre("circuitBasic", new ItemStack(ControlCircuit, 1, 0)); + OreDictionary.registerOre("circuitAdvanced", new ItemStack(ControlCircuit, 1, 1)); + OreDictionary.registerOre("circuitElite", new ItemStack(ControlCircuit, 1, 2)); + OreDictionary.registerOre("circuitUltimate", new ItemStack(ControlCircuit, 1, 3)); } OreDictionary.registerOre("itemCompressedCarbon", new ItemStack(CompressedCarbon)); @@ -1233,6 +1260,7 @@ public class Mekanism jetpackOn.clear(); gasmaskOn.clear(); activeVibrators.clear(); + worldTickHandler.resetRegenChunks(); TransporterManager.flowingStacks.clear(); } @@ -1290,8 +1318,8 @@ public class Mekanism @EventHandler public void init(FMLInitializationEvent event) { - //Register the mod's ore handler - GameRegistry.registerWorldGenerator(new OreHandler(), 1); + //Register the mod's world generators + GameRegistry.registerWorldGenerator(genHandler, 1); //Register the mod's GUI handler NetworkRegistry.INSTANCE.registerGuiHandler(this, new CoreGuiHandler()); @@ -1448,6 +1476,26 @@ public class Mekanism } } } + + @SubscribeEvent + public synchronized void onChunkDataLoad(ChunkDataEvent.Load event) + { + if(!event.world.isRemote) + { + if(enableWorldRegeneration) + { + NBTTagCompound loadData = event.getData(); + + if(loadData.getInteger("MekanismWorldGen") == baseWorldGenVersion && loadData.getInteger("MekanismUserWorldGen") == userWorldGenVersion) + { + return; + } + + ChunkCoordIntPair coordPair = event.getChunk().getChunkCoordIntPair(); + worldTickHandler.addRegenChunk(event.world.provider.dimensionId, coordPair); + } + } + } @SubscribeEvent public void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) diff --git a/src/main/java/mekanism/common/OreHandler.java b/src/main/java/mekanism/common/OreHandler.java deleted file mode 100644 index 3ca28e170..000000000 --- a/src/main/java/mekanism/common/OreHandler.java +++ /dev/null @@ -1,54 +0,0 @@ -package mekanism.common; - -import java.util.Random; - -import net.minecraft.init.Blocks; -import net.minecraft.world.World; -import net.minecraft.world.chunk.IChunkProvider; -import net.minecraft.world.gen.ChunkProviderEnd; -import net.minecraft.world.gen.ChunkProviderHell; -import net.minecraft.world.gen.feature.WorldGenMinable; -import cpw.mods.fml.common.IWorldGenerator; - -public class OreHandler implements IWorldGenerator -{ - @Override - public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) - { - if(!(chunkGenerator instanceof ChunkProviderHell) && !(chunkGenerator instanceof ChunkProviderEnd)) - { - if(Mekanism.osmiumGenerationEnabled) - { - for(int i = 0; i < Mekanism.osmiumGenerationAmount; i++) - { - int randPosX = (chunkX*16) + random.nextInt(16); - int randPosY = random.nextInt(60); - int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(Mekanism.OreBlock, 0, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); - } - } - - if(Mekanism.copperGenerationEnabled) - { - for(int i = 0; i < Mekanism.copperGenerationAmount; i++) - { - int randPosX = (chunkX*16) + random.nextInt(16); - int randPosY = random.nextInt(60); - int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(Mekanism.OreBlock, 1, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); - } - } - - if(Mekanism.tinGenerationEnabled) - { - for(int i = 0; i < Mekanism.tinGenerationAmount; i++) - { - int randPosX = (chunkX*16) + random.nextInt(16); - int randPosY = random.nextInt(60); - int randPosZ = (chunkZ*16) + random.nextInt(16); - new WorldGenMinable(Mekanism.OreBlock, 2, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); - } - } - } - } -} diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java new file mode 100644 index 000000000..6d00a9ef6 --- /dev/null +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -0,0 +1,41 @@ +package mekanism.common.block; + +import java.util.Random; + +import mekanism.common.Mekanism; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.item.Item; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockSalt extends Block +{ + public BlockSalt() + { + super(Material.sand); + setCreativeTab(Mekanism.tabMekanism); + setHardness(0.5F); + setStepSound(soundTypeSand); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister register) + { + blockIcon = register.registerIcon("mekanism:SaltBlock"); + } + + @Override + public Item getItemDropped(int i, Random random, int j) + { + return Mekanism.Salt; + } + + @Override + public int quantityDropped(Random random) + { + return 4; + } +} diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index cee94e95c..c42a8fcdd 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -37,7 +37,6 @@ public final class MekanismHooks public boolean IC2Loaded = false; public boolean IC2APILoaded = false; public boolean RailcraftLoaded = false; - public boolean BasicComponentsLoaded = false; public boolean BuildCraftPowerLoaded = false; public boolean RedstoneFluxLoaded = false; public boolean TELoaded = false; diff --git a/src/main/java/mekanism/common/item/ItemControlCircuit.java b/src/main/java/mekanism/common/item/ItemControlCircuit.java new file mode 100644 index 000000000..fc8444cba --- /dev/null +++ b/src/main/java/mekanism/common/item/ItemControlCircuit.java @@ -0,0 +1,53 @@ +package mekanism.common.item; + +import java.util.List; + +import mekanism.common.Mekanism; +import mekanism.common.Resource; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +public class ItemControlCircuit extends ItemMekanism +{ + public IIcon[] icons = new IIcon[256]; + + public ItemControlCircuit() + { + super(); + setHasSubtypes(true); + setCreativeTab(Mekanism.tabMekanism); + } + + @Override + public void registerIcons(IIconRegister register) + { + for(int i = 0; i < Resource.values().length; i++) + { + icons[i] = register.registerIcon("mekanism:" + Resource.values()[i].getName() + "ControlCircuit"); + } + } + + @Override + public IIcon getIconFromDamage(int meta) + { + return icons[meta]; + } + + @Override + public void getSubItems(Item item, CreativeTabs tabs, List itemList) + { + for(int counter = 0; counter < Resource.values().length; counter++) + { + itemList.add(new ItemStack(item, 1, counter)); + } + } + + @Override + public String getUnlocalizedName(ItemStack item) + { + return "item." + Resource.values()[item.getItemDamage()].getName().toLowerCase() + "ControlCircuit"; + } +} diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 645257fb6..c29a957da 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -24,9 +24,6 @@ public class PacketConfigSync implements IMessageHandler