diff --git a/src/main/java/mekanism/api/MekanismAPI.java b/src/main/java/mekanism/api/MekanismAPI.java index 4f4cef4a9..ceb7e7a98 100644 --- a/src/main/java/mekanism/api/MekanismAPI.java +++ b/src/main/java/mekanism/api/MekanismAPI.java @@ -3,6 +3,8 @@ package mekanism.api; import java.util.HashSet; import java.util.Set; +import mekanism.api.util.BlockInfo; + import net.minecraft.block.Block; import net.minecraft.item.Item; import cpw.mods.fml.common.eventhandler.Event; diff --git a/src/main/java/mekanism/api/MekanismConfig.java b/src/main/java/mekanism/api/MekanismConfig.java new file mode 100644 index 000000000..e2ca9217c --- /dev/null +++ b/src/main/java/mekanism/api/MekanismConfig.java @@ -0,0 +1,80 @@ +package mekanism.api; + +import mekanism.api.util.EnergyUtil.EnergyType; + +public class MekanismConfig +{ + public static class general + { + public static boolean updateNotifications = true; + public static boolean controlCircuitOreDict = true; + public static boolean logPackets = false; + public static boolean dynamicTankEasterEgg = false; + public static boolean voiceServerEnabled = true; + public static boolean cardboardSpawners = true; + public static boolean machineEffects = true; + public static boolean enableWorldRegeneration = true; + public static boolean creativeOverrideElectricChest = true; + public static boolean spawnBabySkeletons = true; + public static int obsidianTNTBlastRadius = 12; + 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; + public static double TO_IC2; + public static double TO_BC; + public static double TO_TE; + public static double TO_UE = .001; + public static double FROM_UE = 1/TO_UE; + public static double FROM_H2; + public static double FROM_IC2; + public static double FROM_BC; + public static double FROM_TE; + } + + public static class usage + { + public static double enrichmentChamberUsage; + public static double osmiumCompressorUsage; + public static double combinerUsage; + public static double crusherUsage; + public static double factoryUsage; + public static double metallurgicInfuserUsage; + public static double purificationChamberUsage; + public static double energizedSmelterUsage; + public static double digitalMinerUsage; + public static double electricPumpUsage; + public static double rotaryCondensentratorUsage; + public static double oxidationChamberUsage; + public static double chemicalInfuserUsage; + public static double chemicalInjectionChamberUsage; + public static double precisionSawmillUsage; + public static double chemicalDissolutionChamberUsage; + public static double chemicalWasherUsage; + public static double chemicalCrystallizerUsage; + public static double seismicVibratorUsage; + public static double pressurizedReactionBaseUsage; + public static double fluidicPlenisherUsage; + } + + public static class generators + { + public static double advancedSolarGeneration; + public static double bioGeneration; + public static double heatGeneration; + public static double solarGeneration; + public static double windGeneration; + } + + public static class tools + { + public static double armorSpawnRate; + } +} diff --git a/src/main/java/mekanism/api/gas/GasNetwork.java b/src/main/java/mekanism/api/gas/GasNetwork.java index 0248c614b..930ecfdc8 100644 --- a/src/main/java/mekanism/api/gas/GasNetwork.java +++ b/src/main/java/mekanism/api/gas/GasNetwork.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; diff --git a/src/main/java/mekanism/api/AdvancedInput.java b/src/main/java/mekanism/api/recipe/AdvancedInput.java similarity index 88% rename from src/main/java/mekanism/api/AdvancedInput.java rename to src/main/java/mekanism/api/recipe/AdvancedInput.java index 46ede3fe3..0edb63253 100644 --- a/src/main/java/mekanism/api/AdvancedInput.java +++ b/src/main/java/mekanism/api/recipe/AdvancedInput.java @@ -1,5 +1,6 @@ -package mekanism.api; +package mekanism.api.recipe; +import mekanism.api.util.StackUtils; import mekanism.api.gas.Gas; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/api/ChanceOutput.java b/src/main/java/mekanism/api/recipe/ChanceOutput.java similarity index 92% rename from src/main/java/mekanism/api/ChanceOutput.java rename to src/main/java/mekanism/api/recipe/ChanceOutput.java index 5b3e512da..b1f6f0269 100644 --- a/src/main/java/mekanism/api/ChanceOutput.java +++ b/src/main/java/mekanism/api/recipe/ChanceOutput.java @@ -1,7 +1,9 @@ -package mekanism.api; +package mekanism.api.recipe; import java.util.Random; +import mekanism.api.util.StackUtils; + import net.minecraft.item.ItemStack; public class ChanceOutput diff --git a/src/main/java/mekanism/api/ChemicalPair.java b/src/main/java/mekanism/api/recipe/ChemicalPair.java similarity index 98% rename from src/main/java/mekanism/api/ChemicalPair.java rename to src/main/java/mekanism/api/recipe/ChemicalPair.java index 7c28ea0d0..64e06002c 100644 --- a/src/main/java/mekanism/api/ChemicalPair.java +++ b/src/main/java/mekanism/api/recipe/ChemicalPair.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.recipe; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; diff --git a/src/main/java/mekanism/api/PressurizedProducts.java b/src/main/java/mekanism/api/recipe/PressurizedProducts.java similarity index 96% rename from src/main/java/mekanism/api/PressurizedProducts.java rename to src/main/java/mekanism/api/recipe/PressurizedProducts.java index 830fc55a6..7eff80806 100644 --- a/src/main/java/mekanism/api/PressurizedProducts.java +++ b/src/main/java/mekanism/api/recipe/PressurizedProducts.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.recipe; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; diff --git a/src/main/java/mekanism/api/PressurizedReactants.java b/src/main/java/mekanism/api/recipe/PressurizedReactants.java similarity index 98% rename from src/main/java/mekanism/api/PressurizedReactants.java rename to src/main/java/mekanism/api/recipe/PressurizedReactants.java index d0c3ac8de..16e83c195 100644 --- a/src/main/java/mekanism/api/PressurizedReactants.java +++ b/src/main/java/mekanism/api/recipe/PressurizedReactants.java @@ -1,5 +1,6 @@ -package mekanism.api; +package mekanism.api.recipe; +import mekanism.api.util.StackUtils; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; diff --git a/src/main/java/mekanism/api/PressurizedRecipe.java b/src/main/java/mekanism/api/recipe/PressurizedRecipe.java similarity index 95% rename from src/main/java/mekanism/api/PressurizedRecipe.java rename to src/main/java/mekanism/api/recipe/PressurizedRecipe.java index d0572bda8..0478efcc1 100644 --- a/src/main/java/mekanism/api/PressurizedRecipe.java +++ b/src/main/java/mekanism/api/recipe/PressurizedRecipe.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.recipe; public class PressurizedRecipe { diff --git a/src/main/java/mekanism/api/RecipeHelper.java b/src/main/java/mekanism/api/recipe/RecipeHelper.java similarity index 99% rename from src/main/java/mekanism/api/RecipeHelper.java rename to src/main/java/mekanism/api/recipe/RecipeHelper.java index 6e27c0cd5..4b7af406d 100644 --- a/src/main/java/mekanism/api/RecipeHelper.java +++ b/src/main/java/mekanism/api/recipe/RecipeHelper.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.recipe; import java.lang.reflect.Method; diff --git a/src/main/java/mekanism/api/BlockInfo.java b/src/main/java/mekanism/api/util/BlockInfo.java similarity index 96% rename from src/main/java/mekanism/api/BlockInfo.java rename to src/main/java/mekanism/api/util/BlockInfo.java index 50c990f27..2cb40d7df 100644 --- a/src/main/java/mekanism/api/BlockInfo.java +++ b/src/main/java/mekanism/api/util/BlockInfo.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.util; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/EnergyDisplay.java b/src/main/java/mekanism/api/util/EnergyUtil.java similarity index 98% rename from src/main/java/mekanism/common/EnergyDisplay.java rename to src/main/java/mekanism/api/util/EnergyUtil.java index f5cb6e46c..ffbfd775d 100644 --- a/src/main/java/mekanism/common/EnergyDisplay.java +++ b/src/main/java/mekanism/api/util/EnergyUtil.java @@ -1,9 +1,9 @@ -package mekanism.common; +package mekanism.api.util; /** * Code taken from UE and modified to fit Mekanism. */ -public class EnergyDisplay +public class EnergyUtil { public static enum ElectricUnit { diff --git a/src/main/java/mekanism/api/ItemInfo.java b/src/main/java/mekanism/api/util/ItemInfo.java similarity index 95% rename from src/main/java/mekanism/api/ItemInfo.java rename to src/main/java/mekanism/api/util/ItemInfo.java index 2c45f0cfe..aeb655e6b 100644 --- a/src/main/java/mekanism/api/ItemInfo.java +++ b/src/main/java/mekanism/api/util/ItemInfo.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.util; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/api/ListUtils.java b/src/main/java/mekanism/api/util/ListUtils.java similarity index 99% rename from src/main/java/mekanism/api/ListUtils.java rename to src/main/java/mekanism/api/util/ListUtils.java index fb319cee8..e20807c53 100644 --- a/src/main/java/mekanism/api/ListUtils.java +++ b/src/main/java/mekanism/api/util/ListUtils.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.util; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/mekanism/api/StackUtils.java b/src/main/java/mekanism/api/util/StackUtils.java similarity index 99% rename from src/main/java/mekanism/api/StackUtils.java rename to src/main/java/mekanism/api/util/StackUtils.java index f175879bc..93c688d92 100644 --- a/src/main/java/mekanism/api/StackUtils.java +++ b/src/main/java/mekanism/api/util/StackUtils.java @@ -1,4 +1,4 @@ -package mekanism.api; +package mekanism.api.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/mekanism/client/ClientConnectionHandler.java b/src/main/java/mekanism/client/ClientConnectionHandler.java index 25b53d9c3..2289e0d58 100644 --- a/src/main/java/mekanism/client/ClientConnectionHandler.java +++ b/src/main/java/mekanism/client/ClientConnectionHandler.java @@ -2,6 +2,7 @@ package mekanism.client; import java.net.InetSocketAddress; +import mekanism.api.MekanismConfig.general; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; import cpw.mods.fml.common.eventhandler.SubscribeEvent; @@ -15,7 +16,7 @@ public class ClientConnectionHandler @SubscribeEvent public void onConnection(ClientConnectedToServerEvent event) { - if(Mekanism.voiceServerEnabled) + if(general.voiceServerEnabled) { if(event.isLocal) { diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 3a1debaec..5be46f5f4 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -4,6 +4,7 @@ import java.io.File; import java.util.HashMap; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.client.entity.EntityLaser; import mekanism.client.gui.GuiChemicalCrystallizer; import mekanism.client.gui.GuiChemicalDissolutionChamber; @@ -93,6 +94,8 @@ import mekanism.common.IElectricChest; import mekanism.common.IInvConfiguration; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; @@ -181,7 +184,7 @@ public class ClientProxy extends CommonProxy MekanismClient.fancyUniversalCableRender = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "FancyUniversalCableRender", true).getBoolean(true); MekanismClient.holidays = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "Holidays", true).getBoolean(true); MekanismClient.baseSoundVolume = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SoundVolume", 1D).getDouble(1D); - MekanismClient.machineEffects = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MachineEffects", true).getBoolean(true); + general.machineEffects = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MachineEffects", true).getBoolean(true); if(Mekanism.configuration.hasChanged()) Mekanism.configuration.save(); @@ -334,24 +337,24 @@ public class ClientProxy extends CommonProxy //Register item handler ItemRenderingHandler handler = new ItemRenderingHandler(); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Mekanism.EnergyCube), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Mekanism.MachineBlock), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Mekanism.MachineBlock2), handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.Robit, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.WalkieTalkie, handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Mekanism.GasTank), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Mekanism.ObsidianTNT), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(Mekanism.BasicBlock), handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.Jetpack, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.ArmoredJetpack, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.PartTransmitter, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.GasMask, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.ScubaTank, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.Balloon, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.FreeRunners, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.AtomicDisassembler, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.GlowPanel, handler); - MinecraftForgeClient.registerItemRenderer(Mekanism.Flamethrower, handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.EnergyCube), handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock), handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.Robit, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.WalkieTalkie, handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.GasTank), handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), handler); + MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock), handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.Jetpack, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.ArmoredJetpack, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.PartTransmitter, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.GasMask, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.ScubaTank, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.Balloon, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.FreeRunners, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.AtomicDisassembler, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.GlowPanel, handler); + MinecraftForgeClient.registerItemRenderer(MekanismItems.Flamethrower, handler); //Register block handlers RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); @@ -573,7 +576,7 @@ public class ClientProxy extends CommonProxy { super.onConfigSync(); - if(Mekanism.voiceServerEnabled && MekanismClient.voiceClient != null) + if(general.voiceServerEnabled && MekanismClient.voiceClient != null) { MekanismClient.voiceClient.start(); } diff --git a/src/main/java/mekanism/client/ClientTickHandler.java b/src/main/java/mekanism/client/ClientTickHandler.java index 049c518ee..8b444ec33 100644 --- a/src/main/java/mekanism/client/ClientTickHandler.java +++ b/src/main/java/mekanism/client/ClientTickHandler.java @@ -39,7 +39,7 @@ import mekanism.common.network.PacketScubaTankData.ScubaTankPacket; import mekanism.common.network.PacketWalkieTalkieState.WalkieTalkieStateMessage; import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.client.Minecraft; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/client/MekanismClient.java b/src/main/java/mekanism/client/MekanismClient.java index 935203623..f642ff067 100644 --- a/src/main/java/mekanism/client/MekanismClient.java +++ b/src/main/java/mekanism/client/MekanismClient.java @@ -1,11 +1,8 @@ package mekanism.client; -import java.util.HashSet; -import java.util.Set; - -import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; +import mekanism.api.MekanismConfig.general; import mekanism.client.sound.SoundHandler; import mekanism.client.voice.VoiceClient; import mekanism.common.Mekanism; @@ -45,7 +42,7 @@ public class MekanismClient extends Mekanism public static void reset() { - if(Mekanism.voiceServerEnabled) + if(general.voiceServerEnabled) { if(MekanismClient.voiceClient != null) { diff --git a/src/main/java/mekanism/client/ThreadTankSparkle.java b/src/main/java/mekanism/client/ThreadTankSparkle.java index 65378e158..29de1af45 100644 --- a/src/main/java/mekanism/client/ThreadTankSparkle.java +++ b/src/main/java/mekanism/client/ThreadTankSparkle.java @@ -5,7 +5,7 @@ import java.util.Random; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.general; import mekanism.common.tile.TileEntityDynamicTank; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; @@ -31,7 +31,7 @@ public class ThreadTankSparkle extends Thread public void run() { try { - if(Mekanism.dynamicTankEasterEgg) + if(general.dynamicTankEasterEgg) { MekanismClient.audioHandler.quickPlay("cj/CJ_" + (random.nextInt(8)+1) + ".ogg", pointer.getWorldObj(), Coord4D.get(pointer)); } diff --git a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java index 3fea5f00a..b4a807b62 100644 --- a/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiChanceMachine.java b/src/main/java/mekanism/client/gui/GuiChanceMachine.java index e3461c62a..f42e49722 100644 --- a/src/main/java/mekanism/client/gui/GuiChanceMachine.java +++ b/src/main/java/mekanism/client/gui/GuiChanceMachine.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java index 32ac1e4b4..21d9dc2d6 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasTank; import mekanism.api.gas.OreGas; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java index c86c11bfa..dfae39bf2 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java index c10009dee..5dabed8d3 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalInfuser.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; @@ -15,7 +15,6 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerChemicalInfuser; -import mekanism.common.network.PacketTileEntity; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntityChemicalInfuser; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java index 26a404016..235b92780 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java index f749bc084..22ee9e60c 100644 --- a/src/main/java/mekanism/client/gui/GuiChemicalWasher.java +++ b/src/main/java/mekanism/client/gui/GuiChemicalWasher.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java index 6b92f1563..36bc6ad1b 100644 --- a/src/main/java/mekanism/client/gui/GuiDigitalMiner.java +++ b/src/main/java/mekanism/client/gui/GuiDigitalMiner.java @@ -5,7 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; @@ -22,8 +22,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; diff --git a/src/main/java/mekanism/client/gui/GuiElectricMachine.java b/src/main/java/mekanism/client/gui/GuiElectricMachine.java index c7eb15155..6717ae8c1 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricMachine.java +++ b/src/main/java/mekanism/client/gui/GuiElectricMachine.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; diff --git a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java index bfe0edc78..351bcd74d 100755 --- a/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java +++ b/src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java @@ -4,7 +4,8 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; @@ -43,7 +44,7 @@ public class GuiElectrolyticSeparator extends GuiMekanism @Override public List getInfo() { - String multiplier = MekanismUtils.getEnergyDisplay(Mekanism.FROM_H2*2); + String multiplier = MekanismUtils.getEnergyDisplay(general.FROM_H2*2); return ListUtils.asList("Using: " + multiplier + "/t", "Needed: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxEnergy()-tileEntity.getEnergy())); } }, this, MekanismUtils.getResource(ResourceType.GUI, "GuiElectrolyticSeparator.png"))); diff --git a/src/main/java/mekanism/client/gui/GuiEnergyCube.java b/src/main/java/mekanism/client/gui/GuiEnergyCube.java index 0e74daab1..bf17db6d9 100644 --- a/src/main/java/mekanism/client/gui/GuiEnergyCube.java +++ b/src/main/java/mekanism/client/gui/GuiEnergyCube.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; diff --git a/src/main/java/mekanism/client/gui/GuiFactory.java b/src/main/java/mekanism/client/gui/GuiFactory.java index b4e8958ac..a0dc64eb2 100644 --- a/src/main/java/mekanism/client/gui/GuiFactory.java +++ b/src/main/java/mekanism/client/gui/GuiFactory.java @@ -2,7 +2,7 @@ package mekanism.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.render.MekanismRenderer; diff --git a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java index 0e7093a72..de67e4922 100644 --- a/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java +++ b/src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java index ffd365a7a..376bc5406 100644 --- a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.AdvancedInput; +import mekanism.api.recipe.AdvancedInput; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElement; diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java index 230731d39..6a1d65218 100644 --- a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java @@ -9,7 +9,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.ChanceOutput; +import mekanism.api.recipe.ChanceOutput; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiPowerBar.IPowerInfoHandler; diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java index d83deb3b6..5285369e1 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java @@ -10,10 +10,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.ChemicalPair; +import mekanism.api.recipe.ChemicalPair; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalInfuser; -import mekanism.client.nei.ChemicalOxidizerRecipeHandler.CachedIORecipe; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java index 324f8644f..b27be1dde 100644 --- a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiChemicalInjectionChamber; diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index 1fab96d11..7dc69d717 100644 --- a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -10,7 +10,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.ChemicalPair; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiChemicalWasher; import mekanism.common.ObfuscatedNames; diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java index da589b0e0..c10206645 100644 --- a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java @@ -3,7 +3,7 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.client.gui.GuiCombiner; import mekanism.client.gui.GuiProgress.ProgressBar; diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index cc6dd7d53..af4c0c9b1 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.ChemicalPair; +import mekanism.api.recipe.ChemicalPair; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElectrolyticSeparator; import mekanism.client.gui.GuiElement; diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java index d6e40d931..47d1454b4 100644 --- a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java +++ b/src/main/java/mekanism/client/nei/NEIMekanismConfig.java @@ -17,7 +17,9 @@ import mekanism.client.gui.GuiPrecisionSawmill; import mekanism.client.gui.GuiPurificationChamber; import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.client.gui.GuiSalinationController; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; + import net.minecraft.item.ItemStack; import codechicken.nei.api.API; import codechicken.nei.api.IConfigureNEI; @@ -104,8 +106,8 @@ public class NEIMekanismConfig implements IConfigureNEI API.registerNEIGuiHandler(new ElementBoundHandler()); - API.hideItem(new ItemStack(Mekanism.BoundingBlock)); - API.hideItem(new ItemStack(Mekanism.ItemProxy)); + API.hideItem(new ItemStack(MekanismBlocks.BoundingBlock)); + API.hideItem(new ItemStack(MekanismItems.Proxy)); } @Override diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java index 34f19a8cf..ff0b05ba2 100644 --- a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java @@ -3,11 +3,11 @@ package mekanism.client.nei; import java.util.List; import java.util.Set; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.client.gui.GuiOsmiumCompressor; import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; @@ -47,7 +47,7 @@ public class OsmiumCompressorRecipeHandler extends AdvancedMachineRecipeHandler @Override public List getFuelStacks(Gas gasType) { - return ListUtils.asList(new ItemStack(Mekanism.Ingot, 1, 1)); + return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1)); } @Override diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index ecbdd4e9d..517f59d29 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import mekanism.api.PressurizedReactants; -import mekanism.api.PressurizedRecipe; +import mekanism.api.recipe.PressurizedReactants; +import mekanism.api.recipe.PressurizedRecipe; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiElement; import mekanism.client.gui.GuiFluidGauge; diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java index e044fc44c..2988b25d7 100644 --- a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.client.gui.GuiProgress.ProgressBar; diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java index a41c5c6af..511b9c8ec 100644 --- a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java @@ -2,7 +2,8 @@ package mekanism.client.render.block; import mekanism.client.ClientProxy; import mekanism.client.render.MekanismRenderer; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; + import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; @@ -22,16 +23,16 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler GL11.glPushMatrix(); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - if(block == Mekanism.BasicBlock || block == Mekanism.BasicBlock2) + if(block == MekanismBlocks.BasicBlock || block == MekanismBlocks.BasicBlock2) { - if(block == Mekanism.BasicBlock && metadata == 10) + if(block == MekanismBlocks.BasicBlock && metadata == 10) { MekanismRenderer.blendOn(); } MekanismRenderer.renderItem(renderer, metadata, block); - if(block == Mekanism.BasicBlock && metadata == 10) + if(block == MekanismBlocks.BasicBlock && metadata == 10) { MekanismRenderer.blendOff(); } @@ -43,7 +44,7 @@ public class BasicRenderingHandler implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if(block == Mekanism.BasicBlock || block == Mekanism.BasicBlock2) + if(block == MekanismBlocks.BasicBlock || block == MekanismBlocks.BasicBlock2) { int metadata = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index fb9b13f6e..71e242f07 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -24,7 +24,8 @@ import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderPortableTank; import mekanism.common.IEnergyCube; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.InventoryBin; @@ -95,7 +96,7 @@ public class ItemRenderingHandler implements IItemRenderer @Override public boolean handleRenderType(ItemStack item, ItemRenderType type) { - if(item.getItem() == Mekanism.WalkieTalkie) + if(item.getItem() == MekanismItems.WalkieTalkie) { return type != ItemRenderType.INVENTORY; } @@ -163,7 +164,7 @@ public class ItemRenderingHandler implements IItemRenderer } else if(item.getItem() instanceof ItemBlockBasic && item.getItemDamage() == 6) { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Mekanism.BasicBlock, item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); + RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], MekanismBlocks.BasicBlock, item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()*/ == null) { @@ -280,7 +281,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glPopMatrix(); } } - else if(Block.getBlockFromItem(item.getItem()) == Mekanism.GasTank) + else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.GasTank) { Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "GasTank.png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); @@ -288,7 +289,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glTranslatef(0.0F, -1.0F, 0.0F); gasTank.render(0.0625F); } - else if(Block.getBlockFromItem(item.getItem()) == Mekanism.ObsidianTNT) + else if(Block.getBlockFromItem(item.getItem()) == MekanismBlocks.ObsidianTNT) { Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); GL11.glRotatef(180F, 0.0F, 0.0F, 1.0F); @@ -331,7 +332,7 @@ public class ItemRenderingHandler implements IItemRenderer Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Robit.png")); robit.render(0.08F); } - else if(item.getItem() == Mekanism.Jetpack) + else if(item.getItem() == MekanismItems.Jetpack) { GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); @@ -339,7 +340,7 @@ public class ItemRenderingHandler implements IItemRenderer Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "Jetpack.png")); jetpack.render(0.0625F); } - else if(item.getItem() == Mekanism.ArmoredJetpack) + else if(item.getItem() == MekanismItems.ArmoredJetpack) { GL11.glRotatef(180, 0.0F, 0.0F, 1.0F); GL11.glRotatef(90, 0.0F, -1.0F, 0.0F); diff --git a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java index 15b7356bf..fcc05fecc 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java @@ -8,7 +8,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.client.render.MekanismRenderer; import mekanism.client.render.MekanismRenderer.DisplayInteger; import mekanism.client.render.MekanismRenderer.Model3D; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.tile.TileEntityTeleporter; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.init.Blocks; @@ -41,7 +41,7 @@ public class RenderTeleporter extends TileEntitySpecialRenderer Coord4D obj = Coord4D.get(tileEntity).getFromSide(ForgeDirection.WEST); int type = 0; - if(obj.getBlock(tileEntity.getWorldObj()) == Mekanism.BasicBlock && obj.getMetadata(tileEntity.getWorldObj()) == 7) + if(obj.getBlock(tileEntity.getWorldObj()) == MekanismBlocks.BasicBlock && obj.getMetadata(tileEntity.getWorldObj()) == 7) { type = 1; } diff --git a/src/main/java/mekanism/client/voice/VoiceClient.java b/src/main/java/mekanism/client/voice/VoiceClient.java index 339975193..1adbb3872 100644 --- a/src/main/java/mekanism/client/voice/VoiceClient.java +++ b/src/main/java/mekanism/client/voice/VoiceClient.java @@ -9,6 +9,7 @@ import java.net.Socket; import javax.sound.sampled.AudioFormat; +import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -41,7 +42,7 @@ public class VoiceClient extends Thread Mekanism.logger.info("VoiceServer: Starting client connection..."); try { - socket = new Socket(ip, Mekanism.VOICE_PORT); + socket = new Socket(ip, general.VOICE_PORT); running = true; input = new DataInputStream(new BufferedInputStream(socket.getInputStream())); diff --git a/src/main/java/mekanism/common/CommandMekanism.java b/src/main/java/mekanism/common/CommandMekanism.java index 075606878..6b4b71a36 100644 --- a/src/main/java/mekanism/common/CommandMekanism.java +++ b/src/main/java/mekanism/common/CommandMekanism.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.common.util.MekanismUtils; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; @@ -67,7 +68,7 @@ public class CommandMekanism extends CommandBase { if(!MekanismUtils.checkForUpdates((EntityPlayer)sender)) { - if(Mekanism.updateNotifications || Mekanism.latestVersionNumber == null || Mekanism.recentNews == null || Mekanism.latestVersionNumber.equals("null")) + if(general.updateNotifications || Mekanism.latestVersionNumber == null || Mekanism.recentNews == null || Mekanism.latestVersionNumber.equals("null")) { sender.addChatMessage(new ChatComponentText(EnumColor.DARK_BLUE + "[Mekanism]" + EnumColor.GREY + " Minecraft is in offline mode, could not check for updates.")); } diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 3833a8f59..ffb1a617e 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -4,7 +4,9 @@ import java.io.File; import mekanism.api.Coord4D; import mekanism.api.MekanismAPI; -import mekanism.common.EnergyDisplay.EnergyType; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.usage; +import mekanism.api.util.EnergyUtil.EnergyType; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.container.ContainerAdvancedElectricMachine; import mekanism.common.inventory.container.ContainerChanceMachine; @@ -189,32 +191,32 @@ public class CommonProxy */ public void loadConfiguration() { - 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(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.creativeOverrideElectricChest = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CreativeOverrideElectricChest", true).getBoolean(true); - Mekanism.spawnBabySkeletons = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true).getBoolean(true); - 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.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); - Mekanism.TO_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MJToJoules", .04D).getDouble(.04D); - Mekanism.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 2000D).getDouble(2000D); - Mekanism.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D); - Mekanism.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt(); + general.updateNotifications = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpdateNotifications", true).getBoolean(true); + general.controlCircuitOreDict = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ControlCircuitOreDict", true).getBoolean(true); + general.logPackets = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "LogPackets", false).getBoolean(false); + general.dynamicTankEasterEgg = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "DynamicTankEasterEgg", false).getBoolean(false); + general.voiceServerEnabled = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoiceServerEnabled", true).getBoolean(true); + general.cardboardSpawners = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowSpawnerBoxPickup", true).getBoolean(true); + general.enableWorldRegeneration = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableWorldRegeneration", false).getBoolean(false); + general.creativeOverrideElectricChest = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CreativeOverrideElectricChest", true).getBoolean(true); + general.spawnBabySkeletons = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SpawnBabySkeletons", true).getBoolean(true); + general.obsidianTNTDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTDelay", 100).getInt(); + general.obsidianTNTBlastRadius = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ObsidianTNTBlastRadius", 12).getInt(); + general.UPDATE_DELAY = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "ClientUpdateDelay", 10).getInt(); + general.osmiumPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "OsmiumPerChunk", 12).getInt(); + general.copperPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "CopperPerChunk", 16).getInt(); + general.tinPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "TinPerChunk", 14).getInt(); + general.saltPerChunk = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SaltPerChunk", 2).getInt(); + general.userWorldGenVersion = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "WorldRegenVersion", 0).getInt(); + general.FROM_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToEU", 10D).getDouble(10D); + general.TO_IC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EUToJoules", .1D).getDouble(.1D); + general.FROM_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "JoulesToMJ", 25D).getDouble(25D); + general.TO_BC = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "MJToJoules", .04D).getDouble(.04D); + general.FROM_H2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "HydrogenEnergyDensity", 2000D).getDouble(2000D); + general.ENERGY_PER_REDSTONE = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyPerRedstone", 10000D).getDouble(10000D); + general.VOICE_PORT = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "VoicePort", 36123, null, 1, 65535).getInt(); //If this is less than 1, upgrades make machines worse. If less than 0, I don't even know. - Mekanism.maxUpgradeMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpgradeModifier", 10, null, 1, Integer.MAX_VALUE).getInt(); + general.maxUpgradeMultiplier = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "UpgradeModifier", 10, null, 1, Integer.MAX_VALUE).getInt(); String s = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnergyType", "J", null, new String[]{"J", "RF", "MJ", "EU"}).getString(); @@ -222,26 +224,26 @@ public class CommonProxy { if(s.trim().equalsIgnoreCase("j") || s.trim().equalsIgnoreCase("joules")) { - Mekanism.activeType = EnergyType.J; + general.activeType = EnergyType.J; } else if(s.trim().equalsIgnoreCase("rf") || s.trim().equalsIgnoreCase("te") || s.trim().equalsIgnoreCase("thermal expansion")) { - Mekanism.activeType = EnergyType.RF; + general.activeType = EnergyType.RF; } else if(s.trim().equalsIgnoreCase("eu") || s.trim().equalsIgnoreCase("ic2")) { - Mekanism.activeType = EnergyType.EU; + general.activeType = EnergyType.EU; } else if(s.trim().equalsIgnoreCase("mj") || s.trim().equalsIgnoreCase("bc") || s.trim().equalsIgnoreCase("buildcraft")) { - Mekanism.activeType = EnergyType.MJ; + general.activeType = EnergyType.MJ; } } - Mekanism.TO_TE = Mekanism.TO_BC*10; - Mekanism.FROM_TE = Mekanism.FROM_BC/10; + general.TO_TE = general.TO_BC*10; + general.FROM_TE = general.FROM_BC/10; - if(Mekanism.cardboardSpawners) + if(general.cardboardSpawners) { MekanismAPI.removeBoxBlacklist(Blocks.mob_spawner, 0); } @@ -249,27 +251,27 @@ public class CommonProxy MekanismAPI.addBoxBlacklist(Blocks.mob_spawner, 0); } - Mekanism.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D); - Mekanism.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 100D).getDouble(100D); - Mekanism.combinerUsage = Mekanism.configuration.get("usage", "CombinerUsage", 50D).getDouble(50D); - Mekanism.crusherUsage = Mekanism.configuration.get("usage", "CrusherUsage", 50D).getDouble(50D); - Mekanism.factoryUsage = Mekanism.configuration.get("usage", "FactoryUsage", 50D).getDouble(50D); - Mekanism.metallurgicInfuserUsage = Mekanism.configuration.get("usage", "MetallurgicInfuserUsage", 50D).getDouble(50D); - Mekanism.purificationChamberUsage = Mekanism.configuration.get("usage", "PurificationChamberUsage", 200D).getDouble(200D); - Mekanism.energizedSmelterUsage = Mekanism.configuration.get("usage", "EnergizedSmelterUsage", 50D).getDouble(50D); - Mekanism.digitalMinerUsage = Mekanism.configuration.get("usage", "DigitalMinerUsage", 100D).getDouble(100D); - Mekanism.electricPumpUsage = Mekanism.configuration.get("usage", "ElectricPumpUsage", 100D).getDouble(100D); - Mekanism.rotaryCondensentratorUsage = Mekanism.configuration.get("usage", "RotaryCondensentratorUsage", 50D).getDouble(50D); - Mekanism.oxidationChamberUsage = Mekanism.configuration.get("usage", "OxidationChamberUsage", 200D).getDouble(200D); - Mekanism.chemicalInfuserUsage = Mekanism.configuration.get("usage", "ChemicalInfuserUsage", 200D).getDouble(200D); - Mekanism.chemicalInjectionChamberUsage = Mekanism.configuration.get("usage", "ChemicalInjectionChamberUsage", 400D).getDouble(400D); - Mekanism.precisionSawmillUsage = Mekanism.configuration.get("usage", "PrecisionSawmillUsage", 50D).getDouble(50D); - Mekanism.chemicalDissolutionChamberUsage = Mekanism.configuration.get("usage", "ChemicalDissolutionChamberUsage", 400D).getDouble(400D); - Mekanism.chemicalWasherUsage = Mekanism.configuration.get("usage", "ChemicalWasherUsage", 200D).getDouble(200D); - Mekanism.chemicalCrystallizerUsage = Mekanism.configuration.get("usage", "ChemicalCrystallizerUsage", 400D).getDouble(400D); - Mekanism.seismicVibratorUsage = Mekanism.configuration.get("usage", "SeismicVibratorUsage", 50D).getDouble(50D); - Mekanism.pressurizedReactionBaseUsage = Mekanism.configuration.get("usage", "PressurizedReactionBaseUsage", 5D).getDouble(5D); - Mekanism.fluidicPlenisherUsage = Mekanism.configuration.get("usage", "FluidicPlenisherUsage", 100D).getDouble(100D); + usage.enrichmentChamberUsage = Mekanism.configuration.get("usage", "EnrichmentChamberUsage", 50D).getDouble(50D); + usage.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 100D).getDouble(100D); + usage.combinerUsage = Mekanism.configuration.get("usage", "CombinerUsage", 50D).getDouble(50D); + usage.crusherUsage = Mekanism.configuration.get("usage", "CrusherUsage", 50D).getDouble(50D); + usage.factoryUsage = Mekanism.configuration.get("usage", "FactoryUsage", 50D).getDouble(50D); + usage.metallurgicInfuserUsage = Mekanism.configuration.get("usage", "MetallurgicInfuserUsage", 50D).getDouble(50D); + usage.purificationChamberUsage = Mekanism.configuration.get("usage", "PurificationChamberUsage", 200D).getDouble(200D); + usage.energizedSmelterUsage = Mekanism.configuration.get("usage", "EnergizedSmelterUsage", 50D).getDouble(50D); + usage.digitalMinerUsage = Mekanism.configuration.get("usage", "DigitalMinerUsage", 100D).getDouble(100D); + usage.electricPumpUsage = Mekanism.configuration.get("usage", "ElectricPumpUsage", 100D).getDouble(100D); + usage.rotaryCondensentratorUsage = Mekanism.configuration.get("usage", "RotaryCondensentratorUsage", 50D).getDouble(50D); + usage.oxidationChamberUsage = Mekanism.configuration.get("usage", "OxidationChamberUsage", 200D).getDouble(200D); + usage.chemicalInfuserUsage = Mekanism.configuration.get("usage", "ChemicalInfuserUsage", 200D).getDouble(200D); + usage.chemicalInjectionChamberUsage = Mekanism.configuration.get("usage", "ChemicalInjectionChamberUsage", 400D).getDouble(400D); + usage.precisionSawmillUsage = Mekanism.configuration.get("usage", "PrecisionSawmillUsage", 50D).getDouble(50D); + usage.chemicalDissolutionChamberUsage = Mekanism.configuration.get("usage", "ChemicalDissolutionChamberUsage", 400D).getDouble(400D); + usage.chemicalWasherUsage = Mekanism.configuration.get("usage", "ChemicalWasherUsage", 200D).getDouble(200D); + usage.chemicalCrystallizerUsage = Mekanism.configuration.get("usage", "ChemicalCrystallizerUsage", 400D).getDouble(400D); + usage.seismicVibratorUsage = Mekanism.configuration.get("usage", "SeismicVibratorUsage", 50D).getDouble(50D); + usage.pressurizedReactionBaseUsage = Mekanism.configuration.get("usage", "PressurizedReactionBaseUsage", 5D).getDouble(5D); + usage.fluidicPlenisherUsage = Mekanism.configuration.get("usage", "FluidicPlenisherUsage", 100D).getDouble(100D); if(Mekanism.configuration.hasChanged()) { @@ -462,7 +464,7 @@ public class CommonProxy public void onConfigSync() { - if(Mekanism.cardboardSpawners) + if(general.cardboardSpawners) { MekanismAPI.removeBoxBlacklist(Blocks.mob_spawner, 0); } diff --git a/src/main/java/mekanism/common/CreativeTabMekanism.java b/src/main/java/mekanism/common/CreativeTabMekanism.java index d188e7b27..607eb82f4 100644 --- a/src/main/java/mekanism/common/CreativeTabMekanism.java +++ b/src/main/java/mekanism/common/CreativeTabMekanism.java @@ -14,12 +14,12 @@ public class CreativeTabMekanism extends CreativeTabs @Override public ItemStack getIconItemStack() { - return new ItemStack(Mekanism.AtomicAlloy); + return new ItemStack(MekanismItems.AtomicAlloy); } @Override public Item getTabIconItem() { - return Mekanism.AtomicAlloy; + return MekanismItems.AtomicAlloy; } } diff --git a/src/main/java/mekanism/common/EnergyNetwork.java b/src/main/java/mekanism/common/EnergyNetwork.java index 68badda48..eb3c8123a 100644 --- a/src/main/java/mekanism/common/EnergyNetwork.java +++ b/src/main/java/mekanism/common/EnergyNetwork.java @@ -14,7 +14,8 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.MekanismConfig.general; +import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; @@ -206,15 +207,15 @@ public class EnergyNetwork extends DynamicNetwork if(MekanismUtils.useRF() && acceptor instanceof IEnergyHandler) { IEnergyHandler handler = (IEnergyHandler)acceptor; - int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending*Mekanism.TO_TE), false); - sent += used*Mekanism.FROM_TE; + int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(currentSending* general.TO_TE), false); + sent += used* general.FROM_TE; if(used > 0) continue; } if(MekanismUtils.useIC2() && acceptor instanceof IEnergySink) { - double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(Math.min(((IEnergySink) acceptor).getSinkTier(), 8))*Mekanism.FROM_IC2); - toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()*Mekanism.FROM_IC2); - double used = toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2); + double toSend = Math.min(currentSending, EnergyNet.instance.getPowerFromTier(Math.min(((IEnergySink) acceptor).getSinkTier(), 8))* general.FROM_IC2); + toSend = Math.min(toSend, ((IEnergySink)acceptor).getDemandedEnergy()* general.FROM_IC2); + double used = toSend - (((IEnergySink)acceptor).injectEnergy(side.getOpposite(), toSend* general.TO_IC2, 0)* general.FROM_IC2); sent += used; if(used > 0) continue; } @@ -224,8 +225,8 @@ public class EnergyNetwork extends DynamicNetwork if(battery != null) { - double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending*Mekanism.TO_BC)); - sent += toSend*Mekanism.FROM_BC; + double toSend = battery.addEnergy(Math.min(battery.getEnergyRequested(), currentSending* general.TO_BC)); + sent += toSend* general.FROM_BC; if(toSend > 0) continue; } } @@ -287,9 +288,9 @@ public class EnergyNetwork extends DynamicNetwork if(handler.acceptsEnergyFrom(null, side.getOpposite())) { - double demanded = handler.getDemandedEnergy()*Mekanism.FROM_IC2; + double demanded = handler.getDemandedEnergy()* general.FROM_IC2; int tier = Math.min(handler.getSinkTier(), 8); - double max = EnergyNet.instance.getPowerFromTier(tier)*Mekanism.FROM_IC2; + double max = EnergyNet.instance.getPowerFromTier(tier)* general.FROM_IC2; if(Math.min(demanded, max) > 0) { toReturn.add(acceptor); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 36f6dbbe4..e9df045c2 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -9,7 +9,7 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.transmitters.DynamicNetwork; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; diff --git a/src/main/java/mekanism/common/FuelHandler.java b/src/main/java/mekanism/common/FuelHandler.java index f4ae79af7..f62f72ed4 100644 --- a/src/main/java/mekanism/common/FuelHandler.java +++ b/src/main/java/mekanism/common/FuelHandler.java @@ -2,6 +2,8 @@ package mekanism.common; import java.util.HashMap; +import mekanism.api.MekanismConfig.general; + import mekanism.api.gas.Gas; import net.minecraftforge.fluids.FluidContainerRegistry; import buildcraft.api.fuels.IronEngineFuel; @@ -54,7 +56,7 @@ public class FuelHandler public FuelGas(Fuel bcFuel) { burnTicks = bcFuel.totalBurningTime / FluidContainerRegistry.BUCKET_VOLUME; - energyPerTick = bcFuel.powerPerCycle * Mekanism.FROM_BC; + energyPerTick = bcFuel.powerPerCycle * general.FROM_BC; } } } diff --git a/src/main/java/mekanism/common/IFactory.java b/src/main/java/mekanism/common/IFactory.java index d8bc2cccd..a1e183608 100644 --- a/src/main/java/mekanism/common/IFactory.java +++ b/src/main/java/mekanism/common/IFactory.java @@ -2,7 +2,7 @@ package mekanism.common; import java.util.Map; -import mekanism.api.AdvancedInput; +import mekanism.api.recipe.AdvancedInput; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.common.block.BlockMachine.MachineType; @@ -10,7 +10,7 @@ import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.tile.TileEntityAdvancedElectricMachine; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; diff --git a/src/main/java/mekanism/common/ItemAttacher.java b/src/main/java/mekanism/common/ItemAttacher.java index dc870e182..c7d35e585 100644 --- a/src/main/java/mekanism/common/ItemAttacher.java +++ b/src/main/java/mekanism/common/ItemAttacher.java @@ -19,7 +19,7 @@ public final class ItemAttacher for(TransmitterType type : TransmitterType.values()) { - attachable.add(new ItemStack(Mekanism.PartTransmitter, 1, type.ordinal())); + attachable.add(new ItemStack(MekanismItems.PartTransmitter, 1, type.ordinal())); } } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 5854ff4a8..5e226d75d 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -9,15 +9,16 @@ import java.util.List; import java.util.Map; import java.util.Set; -import mekanism.api.AdvancedInput; -import mekanism.api.ChanceOutput; -import mekanism.api.ChemicalPair; +import mekanism.api.MekanismConfig.general; +import mekanism.api.recipe.AdvancedInput; +import mekanism.api.recipe.ChanceOutput; +import mekanism.api.recipe.ChemicalPair; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; import mekanism.api.MekanismAPI.BoxBlacklistEvent; -import mekanism.api.PressurizedProducts; -import mekanism.api.PressurizedReactants; +import mekanism.api.recipe.PressurizedProducts; +import mekanism.api.recipe.PressurizedReactants; import mekanism.api.gas.Gas; import mekanism.api.gas.GasNetwork.GasTransferEvent; import mekanism.api.gas.GasRegistry; @@ -31,23 +32,11 @@ import mekanism.api.transmitters.DynamicNetwork.ClientTickUpdate; import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; -import mekanism.common.EnergyDisplay.EnergyType; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.IFactory.RecipeType; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.Tier.FactoryTier; -import mekanism.common.block.BlockBasic; -import mekanism.common.block.BlockBounding; -import mekanism.common.block.BlockCardboardBox; -import mekanism.common.block.BlockEnergyCube; -import mekanism.common.block.BlockGasTank; -import mekanism.common.block.BlockMachine; -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.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; @@ -55,8 +44,6 @@ import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; import mekanism.common.integration.MekanismHooks; import mekanism.common.integration.OreDictManager; -import mekanism.common.item.ItemAtomicDisassembler; -import mekanism.common.item.ItemBalloon; import mekanism.common.item.ItemBlockBasic; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.item.ItemBlockEnergyCube; @@ -64,34 +51,6 @@ import mekanism.common.item.ItemBlockGasTank; import mekanism.common.item.ItemBlockMachine; 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; -import mekanism.common.item.ItemDust; -import mekanism.common.item.ItemElectricBow; -import mekanism.common.item.ItemEnergized; -import mekanism.common.item.ItemFilterCard; -import mekanism.common.item.ItemFlamethrower; -import mekanism.common.item.ItemFreeRunners; -import mekanism.common.item.ItemGasMask; -import mekanism.common.item.ItemHDPE; -import mekanism.common.item.ItemIngot; -import mekanism.common.item.ItemJetpack; -import mekanism.common.item.ItemMekanism; -import mekanism.common.item.ItemNetworkReader; -import mekanism.common.item.ItemPortableTeleporter; -import mekanism.common.item.ItemProxy; -import mekanism.common.item.ItemRobit; -import mekanism.common.item.ItemScubaTank; -import mekanism.common.item.ItemSeismicReader; -import mekanism.common.item.ItemShard; -import mekanism.common.item.ItemUpgrade; -import mekanism.common.item.ItemWalkieTalkie; -import mekanism.common.multipart.ItemGlowPanel; -import mekanism.common.multipart.ItemPartTransmitter; import mekanism.common.multipart.MultipartMekanism; import mekanism.common.network.PacketDataRequest.DataRequestMessage; import mekanism.common.network.PacketTransmitterUpdate.PacketType; @@ -112,11 +71,10 @@ 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.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.FurnaceRecipes; @@ -239,401 +197,275 @@ public class Mekanism public static Set activeVibrators = new HashSet(); - //Items - public static ItemElectricBow ElectricBow; - public static Item EnrichedAlloy; - public static Item ReinforcedAlloy; - public static Item AtomicAlloy; - public static ItemEnergized EnergyTablet; - public static Item SpeedUpgrade; - public static Item EnergyUpgrade; - public static ItemRobit Robit; - public static ItemAtomicDisassembler AtomicDisassembler; - public static Item EnrichedIron; - public static Item CompressedCarbon; - public static Item CompressedRedstone; - public static Item CompressedDiamond; - public static Item CompressedObsidian; - public static Item PortableTeleporter; - public static Item TeleportationCore; - public static Item Configurator; - public static Item NetworkReader; - public static Item WalkieTalkie; - public static Item ItemProxy; - public static Item PartTransmitter; - public static Item GlowPanel; - public static ItemJetpack Jetpack; - public static ItemScubaTank ScubaTank; - public static ItemGasMask GasMask; - public static ItemFlamethrower Flamethrower; - public static Item Dictionary; - public static Item Balloon; - public static Item ElectrolyticCore; - public static Item Sawdust; - public static Item Salt; - public static Item BrineBucket; - public static Item FreeRunners; - public static ItemJetpack ArmoredJetpack; - public static Item FilterCard; - public static ItemSeismicReader SeismicReader; - public static Item Substrate; - public static Item Polyethene; - public static Item BioFuel; - - //Blocks - public static Block BasicBlock; - public static Block BasicBlock2; - public static Block MachineBlock; - public static Block MachineBlock2; - public static Block OreBlock; - public static Block ObsidianTNT; - public static Block EnergyCube; - public static Block BoundingBlock; - public static Block GasTank; - public static Block CardboardBox; - public static Block BlockHDPE; - public static Block BlockSlickHDPE; - public static Block BlockGlowHDPE; - public static Block BlockReinforcedHDPE; - public static Block BlockRoadHDPE; - public static Block BlockHDPEFence; - public static Block SaltBlock; - - //Multi-ID Items - public static Item Dust; - public static Item Ingot; - public static Item Clump; - public static Item DirtyDust; - public static Item Shard; - public static Item Crystal; - public static Item ControlCircuit; - - //General Configuration - public static boolean updateNotifications = true; - public static boolean controlCircuitOreDict = true; - public static boolean logPackets = false; - public static boolean dynamicTankEasterEgg = false; - public static boolean voiceServerEnabled = true; - public static boolean cardboardSpawners = true; - public static boolean machineEffects = true; - public static boolean enableWorldRegeneration = true; - public static boolean creativeOverrideElectricChest = true; - public static boolean spawnBabySkeletons = true; - public static int obsidianTNTBlastRadius = 12; - 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; - - public static double TO_IC2; - public static double TO_BC; - public static double TO_TE; - public static double TO_UE = .001; - public static double FROM_H2; - public static double FROM_IC2; - public static double FROM_BC; - public static double FROM_TE; - public static double FROM_UE = 1/TO_UE; - - //Usage Configuration - public static double enrichmentChamberUsage; - public static double osmiumCompressorUsage; - public static double combinerUsage; - public static double crusherUsage; - public static double factoryUsage; - public static double metallurgicInfuserUsage; - public static double purificationChamberUsage; - public static double energizedSmelterUsage; - public static double digitalMinerUsage; - public static double electricPumpUsage; - public static double rotaryCondensentratorUsage; - public static double oxidationChamberUsage; - public static double chemicalInfuserUsage; - public static double chemicalInjectionChamberUsage; - public static double precisionSawmillUsage; - public static double chemicalDissolutionChamberUsage; - public static double chemicalWasherUsage; - public static double chemicalCrystallizerUsage; - public static double seismicVibratorUsage; - public static double pressurizedReactionBaseUsage; - public static double fluidicPlenisherUsage; - /** * Adds all in-game crafting, smelting and machine recipes. */ public void addRecipes() { //Storage Recipes - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 3), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 3), new Object[] { "***", "***", "***", Character.valueOf('*'), new ItemStack(Items.coal, 1, 1) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Items.coal, 9, 1), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 3) + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 3) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 2), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 2), new Object[] { "***", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 0), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 2) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 0), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 2) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 4), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 4), new Object[] { "***", "***", "***", Character.valueOf('*'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 3), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 4) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 3), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 0), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 0), new Object[] { "XXX", "XXX", "XXX", Character.valueOf('X'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 1), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 0) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 1), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 0) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 1), new Object[] { "***", "***", "***", Character.valueOf('*'), "ingotBronze" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 2), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 1) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 2), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 1) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 5), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 5), new Object[] { "***", "***", "***", Character.valueOf('*'), "ingotSteel" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 4), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 5) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 4), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 5) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 12), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 12), new Object[] { "***", "***", "***", Character.valueOf('*'), "ingotCopper" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Ingot, 9, 5), new Object[] { - "*", Character.valueOf('*'), new ItemStack(BasicBlock, 1, 12) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Ingot, 9, 5), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 12) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 13), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 13), new Object[] { "***", "***", "***", Character.valueOf('*'), "ingotTin" })); - 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(MekanismItems.Ingot, 9, 6), new Object[] { + "*", Character.valueOf('*'), new ItemStack(MekanismBlocks.BasicBlock, 1, 13) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SaltBlock), new Object[] { - "**", "**", Character.valueOf('*'), Salt + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.SaltBlock), new Object[] { + "**", "**", Character.valueOf('*'), MekanismItems.Salt })); //Base Recipes - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianTNT, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.ObsidianTNT, 1), new Object[] { "***", "XXX", "***", Character.valueOf('*'), Blocks.obsidian, Character.valueOf('X'), Blocks.tnt })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(ElectricBow.getUnchargedItem(), new Object[] { - " AB", "E B", " AB", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('B'), Items.string, Character.valueOf('E'), EnergyTablet.getUnchargedItem() + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.ElectricBow.getUnchargedItem(), new Object[] { + " AB", "E B", " AB", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('B'), Items.string, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(EnergyTablet.getUnchargedItem(), new Object[] { - "RCR", "ECE", "RCR", Character.valueOf('C'), "ingotGold", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), EnrichedAlloy + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.EnergyTablet.getUnchargedItem(), new Object[] { + "RCR", "ECE", "RCR", Character.valueOf('C'), "ingotGold", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), MekanismItems.EnrichedAlloy })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 0), new Object[] { - "RCR", "iIi", "RCR", Character.valueOf('i'), "ingotIron", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), "alloyBasic", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 0), new Object[] { + "RCR", "iIi", "RCR", Character.valueOf('i'), "ingotIron", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), "alloyBasic", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 1), new Object[] { - "ECE", "BIB", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), "circuitAdvanced", Character.valueOf('B'), Items.bucket, Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 1), new Object[] { + "ECE", "BIB", "ECE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('C'), "circuitAdvanced", Character.valueOf('B'), Items.bucket, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 2), new Object[] { - "RCR", "SIS", "RCR", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), "circuitElite", Character.valueOf('R'), "alloyElite", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 2), new Object[] { + "RCR", "SIS", "RCR", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), "circuitElite", Character.valueOf('R'), "alloyElite", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 3), new Object[] { - "RCR", "LIL", "RCR", Character.valueOf('R'), Items.redstone, Character.valueOf('L'), Items.lava_bucket, Character.valueOf('C'), "circuitBasic", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 3), new Object[] { + "RCR", "LIL", "RCR", Character.valueOf('R'), Items.redstone, Character.valueOf('L'), Items.lava_bucket, Character.valueOf('C'), "circuitBasic", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SpeedUpgrade), new Object[] { - " G ", "APA", " G ", Character.valueOf('P'), "dustOsmium", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('G'), "blockGlass" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.SpeedUpgrade), new Object[] { + " G ", "APA", " G ", Character.valueOf('P'), "dustOsmium", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), "blockGlass" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(EnergyUpgrade), new Object[] { - " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('D'), "dustGold" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.EnergyUpgrade), new Object[] { + " G ", "ADA", " G ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('D'), "dustGold" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(AtomicDisassembler.getUnchargedItem(), new Object[] { - "AEA", "ACA", " O ", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.AtomicDisassembler.getUnchargedItem(), new Object[] { + "AEA", "ACA", " O ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEmptyGasTank(), new Object[] { "PPP", "PDP", "PPP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('D'), "dustIron" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 8), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 8), new Object[] { "IFI", "ROR", "IFI", Character.valueOf('I'), Items.iron_ingot, Character.valueOf('F'), Blocks.furnace, Character.valueOf('R'), Items.redstone, Character.valueOf('O'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(TeleportationCore), new Object[] { - "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), AtomicAlloy, Character.valueOf('G'), Items.gold_ingot, Character.valueOf('D'), Items.diamond + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.TeleportationCore), new Object[] { + "LAL", "GDG", "LAL", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('G'), Items.gold_ingot, Character.valueOf('D'), Items.diamond })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PortableTeleporter), new Object[] { - " E ", "CTC", " E ", Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic", Character.valueOf('T'), TeleportationCore + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PortableTeleporter), new Object[] { + " E ", "CTC", " E ", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic", Character.valueOf('T'), MekanismItems.TeleportationCore })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 11), new Object[] { - "COC", "OTO", "COC", Character.valueOf('C'), "circuitBasic", Character.valueOf('O'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('T'), TeleportationCore + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 11), new Object[] { + "COC", "OTO", "COC", Character.valueOf('C'), "circuitBasic", Character.valueOf('O'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 9), new Object[] { - "ECE", "ORO", "ECE", Character.valueOf('C'), "circuitAdvanced", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('O'), "ingotOsmium", Character.valueOf('R'), new ItemStack(MachineBlock, 1, 0) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 9), new Object[] { + "ECE", "ORO", "ECE", Character.valueOf('C'), "circuitAdvanced", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('O'), "ingotOsmium", Character.valueOf('R'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Configurator), new Object[] { - " L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), EnrichedAlloy, Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Items.stick + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Configurator), new Object[] { + " L ", "AEA", " S ", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('S'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 9, 7), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 9, 7), new Object[] { "OOO", "OGO", "OOO", Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('G'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 8), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 8), new Object[] { " S ", "SPS", " S ", Character.valueOf('S'), "ingotSteel", Character.valueOf('P'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 10), new Object[] { - "RCR", "GIG", "RCR", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), "alloyBasic", Character.valueOf('G'), "blockGlass", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 10), new Object[] { + "RCR", "GIG", "RCR", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), "alloyBasic", Character.valueOf('G'), "blockGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 12), new Object[] { - " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), EnrichedAlloy, Character.valueOf('C'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 12), new Object[] { + " B ", "ECE", "OOO", Character.valueOf('B'), Items.bucket, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('O'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 13), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 13), new Object[] { "SGS", "CcC", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), Blocks.chest, Character.valueOf('c'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 8, 9), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 8, 9), new Object[] { " I ", "ISI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('S'), Blocks.cobblestone })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 8, 10), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 8, 10), new Object[] { " I ", "IGI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('G'), "blockGlass" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 2, 11), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 2, 11), new Object[] { " I ", "ICI", " I ", Character.valueOf('I'), "ingotSteel", Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 14), new Object[] { - "PPP", "SES", Character.valueOf('P'), Blocks.stone_pressure_plate, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnergyTablet.getUnchargedItem() + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 14), new Object[] { + "PPP", "SES", Character.valueOf('P'), Blocks.stone_pressure_plate, Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(Robit.getUnchargedItem(), new Object[] { - " S ", "ECE", "OIO", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('C'), AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('I'), new ItemStack(MachineBlock, 1, 13) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.Robit.getUnchargedItem(), new Object[] { + " S ", "ECE", "OIO", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), MekanismItems.AtomicAlloy, Character.valueOf('O'), "ingotRefinedObsidian", Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(NetworkReader), new Object[] { - " G ", "AEA", " I ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('E'), EnergyTablet.getUnchargedItem(), Character.valueOf('I'), "ingotSteel" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.NetworkReader), new Object[] { + " G ", "AEA", " I ", Character.valueOf('G'), "blockGlass", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('I'), "ingotSteel" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(WalkieTalkie), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.WalkieTalkie), new Object[] { " O", "SCS", " S ", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 15), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 15), new Object[] { "IPI", "ICI", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('P'), Blocks.piston, Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 6), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 6), new Object[] { "SSS", "SCS", "SSS", Character.valueOf('S'), Blocks.cobblestone, Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock, 1, 4), new Object[] { - "ACA", "SES", "TIT", Character.valueOf('A'), AtomicAlloy, Character.valueOf('C'), "circuitBasic", Character.valueOf('S'), new ItemStack(MachineBlock, 1, 15), Character.valueOf('E'), Robit.getUnchargedItem(), - Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('T'), TeleportationCore + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock, 1, 4), new Object[] { + "ACA", "SES", "TIT", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('C'), "circuitBasic", Character.valueOf('S'), new ItemStack(MekanismBlocks.MachineBlock, 1, 15), Character.valueOf('E'), MekanismItems.Robit.getUnchargedItem(), + Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('T'), MekanismItems.TeleportationCore })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 0), new Object[] { - "GCG", "tET", "GIG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), "circuitBasic", Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), EnergyTablet.getUnchargedItem(), - Character.valueOf('T'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 0), new Object[] { + "GCG", "tET", "GIG", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), "circuitBasic", Character.valueOf('t'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), + Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(Jetpack.getEmptyItem(), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.Jetpack.getEmptyItem(), new Object[] { "SCS", "TGT", " T ", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "circuitBasic", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank() })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Dictionary), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Dictionary), new Object[] { "C", "B", Character.valueOf('C'), "circuitBasic", Character.valueOf('B'), Items.book })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GasMask), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GasMask), new Object[] { " S ", "GCG", "S S", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(ScubaTank.getEmptyItem(), new Object[] { - " C ", "ATA", "SSS", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('S'), "ingotSteel" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.ScubaTank.getEmptyItem(), new Object[] { + " C ", "ATA", "SSS", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), "ingotSteel" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 1), new Object[] { - "ACA", "ERG", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MachineBlock, 1, 13), Character.valueOf('A'), EnrichedAlloy + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 1), new Object[] { + "ACA", "ERG", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('E'), new ItemStack(MekanismBlocks.MachineBlock, 1, 13), Character.valueOf('A'), MekanismItems.EnrichedAlloy })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 2), new Object[] { - "ACA", "GRG", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), EnrichedAlloy + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 2), new Object[] { + "ACA", "GRG", "ACA", Character.valueOf('C'), "circuitBasic", Character.valueOf('R'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9), Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('A'), MekanismItems.EnrichedAlloy })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 3), new Object[] { - "RCR", "GPG", "RCR", Character.valueOf('C'), "circuitElite", Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MachineBlock, 1, 9) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 3), new Object[] { + "RCR", "GPG", "RCR", Character.valueOf('C'), "circuitElite", Character.valueOf('R'), "alloyElite", Character.valueOf('G'), "ingotGold", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 9) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 4), new Object[] { - "IRI", "ECE", "IRI", Character.valueOf('I'), "ingotIron", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('C'), ElectrolyticCore + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 4), new Object[] { + "IRI", "ECE", "IRI", Character.valueOf('I'), "ingotIron", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), MekanismItems.ElectrolyticCore })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ElectrolyticCore), new Object[] { - "EPE", "IEG", "EPE", Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('P'), "dustOsmium", Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.ElectrolyticCore), new Object[] { + "EPE", "IEG", "EPE", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "dustOsmium", Character.valueOf('I'), "dustIron", Character.valueOf('G'), "dustGold" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(CardboardBox), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.CardboardBox), new Object[] { "SS", "SS", Character.valueOf('S'), "pulpWood" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Items.paper, 6), new Object[] { - "SSS", Character.valueOf('S'), Sawdust + "SSS", Character.valueOf('S'), MekanismItems.Sawdust })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 5), new Object[] { - "ICI", "ASA", "ICI", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('S'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 5), new Object[] { + "ICI", "ASA", "ICI", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 14), new Object[] { - "CGC", "IBI", "CGC", Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8), Character.valueOf('B'), "blockCopper" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 14), new Object[] { + "CGC", "IBI", "CGC", Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), "paneGlass", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('B'), "blockCopper" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock, 1, 15), new Object[] { - "ITI", "CBC", "ITI", Character.valueOf('I'), "ingotCopper", Character.valueOf('T'), new ItemStack(BasicBlock, 1, 11), Character.valueOf('C'), "circuitBasic", Character.valueOf('B'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock, 1, 15), new Object[] { + "ITI", "CBC", "ITI", Character.valueOf('I'), "ingotCopper", Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 11), Character.valueOf('C'), "circuitBasic", Character.valueOf('B'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BasicBlock2, 1, 0), new Object[] { - "CCC", "CTC", "CCC", Character.valueOf('C'), "ingotCopper", Character.valueOf('T'), new ItemStack(BasicBlock, 1, 9) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BasicBlock2, 1, 0), new Object[] { + "CCC", "CTC", "CCC", Character.valueOf('C'), "ingotCopper", Character.valueOf('T'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 6), new Object[] { - "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicAlloy, Character.valueOf('E'), EnrichedAlloy + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 6), new Object[] { + "CGC", "EAE", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('E'), MekanismItems.EnrichedAlloy })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 7), new Object[] { - "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), "circuitBasic", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 7), new Object[] { + "CWC", "EIE", "CGC", Character.valueOf('W'), Items.bucket, Character.valueOf('C'), "circuitBasic", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 8), new Object[] { - "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), AtomicAlloy, Character.valueOf('S'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 8), new Object[] { + "CGC", "ASA", "CGC", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.AtomicAlloy, Character.valueOf('S'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(FreeRunners), new Object[] { - "C C", "A A", "T T", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('T'), EnergyTablet.getUnchargedItem() + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FreeRunners), new Object[] { + "C C", "A A", "T T", Character.valueOf('C'), "circuitBasic", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem() })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(ArmoredJetpack.getEmptyItem(), new Object[] { - "D D", "BSB", " J ", Character.valueOf('D'), "dustDiamond", Character.valueOf('B'), "ingotBronze", Character.valueOf('S'), "blockSteel", Character.valueOf('J'), Jetpack.getEmptyItem() + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.ArmoredJetpack.getEmptyItem(), new Object[] { + "D D", "BSB", " J ", Character.valueOf('D'), "dustDiamond", Character.valueOf('B'), "ingotBronze", Character.valueOf('S'), "blockSteel", Character.valueOf('J'), MekanismItems.Jetpack.getEmptyItem() })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(FilterCard), new Object[] { - " A ", "ACA", " A ", Character.valueOf('A'), EnrichedAlloy, Character.valueOf('C'), "circuitBasic" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.FilterCard), new Object[] { + " A ", "ACA", " A ", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(SeismicReader.getUnchargedItem(), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.SeismicReader.getUnchargedItem(), new Object[] { "SLS", "STS", "SSS", Character.valueOf('S'), "ingotSteel", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 9), new Object[] { - "TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), "circuitBasic", Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 9), new Object[] { + "TLT", "CIC", "TTT", Character.valueOf('T'), "ingotTin", Character.valueOf('L'), new ItemStack(Items.dye, 1, 4), Character.valueOf('C'), "circuitBasic", Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 10), new Object[] { - "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), EnrichedAlloy, Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), - Character.valueOf('I'), new ItemStack(MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(BasicBlock, 1, 9) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 10), new Object[] { + "TET", "CIC", "GFG", Character.valueOf('S'), "ingotSteel", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('C'), "circuitBasic", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), + Character.valueOf('I'), new ItemStack(MekanismBlocks.MachineBlock, 1, 0), Character.valueOf('F'), new ItemStack(MekanismBlocks.BasicBlock, 1, 9) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 11), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 11), new Object[] { "III", "GCG", "III", Character.valueOf('I'), "ingotIron", Character.valueOf('G'), "blockGlass", Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MachineBlock2, 1, 12), new Object[] { - "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), "circuitBasic" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.MachineBlock2, 1, 12), new Object[] { + "TTT", "CPC", "TTT", Character.valueOf('P'), new ItemStack(MekanismBlocks.MachineBlock, 1, 12), Character.valueOf('T'), "ingotTin", Character.valueOf('C'), "circuitBasic" })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Blocks.rail, 24), new Object[] { "O O", "OSO", "O O", Character.valueOf('O'), "ingotOsmium", Character.valueOf('S'), "stickWood" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(Flamethrower.getEmptyItem(), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismItems.Flamethrower.getEmptyItem(), new Object[] { "TTT", "TGS", "BCB", Character.valueOf('T'), "ingotTin", Character.valueOf('G'), MekanismUtils.getEmptyGasTank(), Character.valueOf('S'), Items.flint_and_steel, Character.valueOf('B'), "ingotBronze", Character.valueOf('C'), "circuitAdvanced" })); //Energy Cube recipes CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC), new Object[] { - "RTR", "iIi", "RTR", Character.valueOf('R'), "alloyBasic", Character.valueOf('i'), "ingotIron", Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('I'), new ItemStack(BasicBlock, 1, 8) + "RTR", "iIi", "RTR", Character.valueOf('R'), "alloyBasic", Character.valueOf('i'), "ingotIron", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED), new Object[] { - "ETE", "oBo", "ETE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('o'), "ingotOsmium", Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC) + "ETE", "oBo", "ETE", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('o'), "ingotOsmium", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('B'), MekanismUtils.getEnergyCube(EnergyCubeTier.BASIC) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE), new Object[] { - "RTR", "gAg", "RTR", Character.valueOf('R'), "alloyElite", Character.valueOf('g'), "ingotGold", Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('A'), MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED) + "RTR", "gAg", "RTR", Character.valueOf('R'), "alloyElite", Character.valueOf('g'), "ingotGold", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('A'), MekanismUtils.getEnergyCube(EnergyCubeTier.ADVANCED) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(MekanismUtils.getEnergyCube(EnergyCubeTier.ULTIMATE), new Object[] { - "ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE) + "ATA", "dEd", "ATA", Character.valueOf('A'), "alloyUltimate", Character.valueOf('d'), "gemDiamond", Character.valueOf('T'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('E'), MekanismUtils.getEnergyCube(EnergyCubeTier.ELITE) })); //Circuit recipes - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ControlCircuit, 1, 1), new Object[] { - "ECE", Character.valueOf('C'), new ItemStack(ControlCircuit, 1, 0), Character.valueOf('E'), "alloyAdvanced" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 1), new Object[] { + "ECE", Character.valueOf('C'), new ItemStack(MekanismItems.ControlCircuit, 1, 0), Character.valueOf('E'), "alloyAdvanced" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ControlCircuit, 1, 2), new Object[] { - "RCR", Character.valueOf('C'), new ItemStack(ControlCircuit, 1, 1), Character.valueOf('R'), "alloyElite" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 2), new Object[] { + "RCR", Character.valueOf('C'), new ItemStack(MekanismItems.ControlCircuit, 1, 1), Character.valueOf('R'), "alloyElite" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ControlCircuit, 1, 3), new Object[] { - "ACA", Character.valueOf('C'), new ItemStack(ControlCircuit, 1, 2), Character.valueOf('A'), "alloyUltimate" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.ControlCircuit, 1, 3), new Object[] { + "ACA", Character.valueOf('C'), new ItemStack(MekanismItems.ControlCircuit, 1, 2), Character.valueOf('A'), "alloyUltimate" })); //Factory recipes @@ -654,127 +486,127 @@ public class Mekanism CraftingManager.getInstance().getRecipeList().add(new BinRecipe()); //Transmitters - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 0), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 0), new Object[] { "SRS", Character.valueOf('S'), "ingotSteel", Character.valueOf('R'), Items.redstone })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 1), new Object[] { - "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 0) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 1), new Object[] { + "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 0) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 2), new Object[] { - "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 1) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 2), new Object[] { + "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 1) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 3), new Object[] { - "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 2) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 3), new Object[] { + "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 2) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 4), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 4), new Object[] { "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Items.bucket })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 5), new Object[] { - "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 4) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 5), new Object[] { + "TTT", "TET", "TTT", Character.valueOf('E'), "alloyAdvanced", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 6), new Object[] { - "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 5) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 6), new Object[] { + "TTT", "TRT", "TTT", Character.valueOf('R'), "alloyElite", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 5) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 7), new Object[] { - "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(PartTransmitter, 1, 6) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 7), new Object[] { + "TTT", "TAT", "TTT", Character.valueOf('A'), "alloyUltimate", Character.valueOf('T'), new ItemStack(MekanismItems.PartTransmitter, 1, 6) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 8), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 8), new Object[] { "SGS", Character.valueOf('S'), "ingotSteel", Character.valueOf('G'), "blockGlass" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 8, 9), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 8, 9), new Object[] { "SCS", Character.valueOf('S'), "ingotSteel", Character.valueOf('C'), "circuitBasic" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 2, 10), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 10), new Object[] { "SBS", Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(PartTransmitter, 2, 11), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.PartTransmitter, 2, 11), new Object[] { "RRR", "SBS", "RRR", Character.valueOf('R'), Items.redstone, Character.valueOf('S'), "ingotSteel", Character.valueOf('B'), Blocks.iron_bars })); //Plastic stuff - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Polyethene, 1, 1), new Object[] { - "PP", "PP", "PP", Character.valueOf('P'), new ItemStack(Polyethene, 1, 0) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 1), new Object[] { + "PP", "PP", "PP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Polyethene, 1, 2), new Object[] { - "PPP", "P P", "PPP", Character.valueOf('P'), new ItemStack(Polyethene, 1, 0) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 2), new Object[] { + "PPP", "P P", "PPP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Polyethene, 1, 3), new Object[] { - "R", "R", Character.valueOf('R'), new ItemStack(Polyethene, 1, 1) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 3), new Object[] { + "R", "R", Character.valueOf('R'), new ItemStack(MekanismItems.Polyethene, 1, 1) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, 15), new Object[] { - "SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 4, 15), new Object[] { + "SSS", "S S", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 2, 15), new Object[] { - "PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone_dust + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, 15), new Object[] { + "PSP", "S S", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('G'), Items.glowstone_dust })); for(int i = 0; i < EnumColor.DYES.length-1; i++) { - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, i), new Object[] { - "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 4, i), new Object[] { + "SSS", "SDS", "SSS", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 2, i), new Object[] { - "PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 2, i), new Object[] { + "PSP", "SDS", "GSG", Character.valueOf('P'), "paneGlass", Character.valueOf('S'), new ItemStack(MekanismItems.Polyethene, 1, 2), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName, Character.valueOf('G'), Items.glowstone_dust })); } for(int i = 0; i < EnumColor.DYES.length; i++) { - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 2, i), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(MekanismItems.Balloon, 2, i), new Object[] { Items.leather, Items.string, "dye" + EnumColor.DYES[i].dyeName })); for(int j = 0; j < EnumColor.DYES.length; j++) { - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(Balloon, 1, i), new Object[] { - new ItemStack(Balloon, 1, j), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(MekanismItems.Balloon, 1, i), new Object[] { + new ItemStack(MekanismItems.Balloon, 1, j), "dye" + EnumColor.DYES[i].dyeName })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockHDPE, 4, i), new Object[] { - " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 4, i), new Object[] { + " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockSlickHDPE, 4, i), new Object[] { - " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockSlickHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockSlickHDPE, 4, i), new Object[] { + " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockSlickHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockGlowHDPE, 4, i), new Object[] { - " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockGlowHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockGlowHDPE, 4, i), new Object[] { + " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockGlowHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockReinforcedHDPE, 4, i), new Object[] { - " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(BlockReinforcedHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockReinforcedHDPE, 4, i), new Object[] { + " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockReinforcedHDPE, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowPanel, 4, i), new Object[] { - " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.GlowPanel, 4, i), new Object[] { + " P ", "PDP", " P ", Character.valueOf('P'), new ItemStack(MekanismItems.GlowPanel, 1, j), Character.valueOf('D'), "dye" + EnumColor.DYES[i].dyeName })); } - CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(BlockGlowHDPE, 3, i), new Object[] { - new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockHDPE, 1, i), new ItemStack(Items.glowstone_dust) + CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(MekanismBlocks.BlockGlowHDPE, 3, i), new Object[] { + new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(Items.glowstone_dust) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockReinforcedHDPE, 4, i), new Object[] { - " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(BlockHDPE, 1, i), Character.valueOf('O'), new ItemStack(Dust, 1, 2) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockReinforcedHDPE, 4, i), new Object[] { + " P ", "POP", " P ", Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockHDPE, 1, i), Character.valueOf('O'), new ItemStack(MekanismItems.Dust, 1, 2) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BlockRoadHDPE, 3, i), new Object[] { - "SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(BlockSlickHDPE, 1, i) + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismBlocks.BlockRoadHDPE, 3, i), new Object[] { + "SSS", "PPP", "SSS", Character.valueOf('S'), Blocks.sand, Character.valueOf('P'), new ItemStack(MekanismBlocks.BlockSlickHDPE, 1, i) })); } //Furnace Recipes - FurnaceRecipes.smelting().func_151394_a(new ItemStack(OreBlock, 1, 0), new ItemStack(Ingot, 1, 1), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(OreBlock, 1, 1), new ItemStack(Ingot, 1, 5), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(OreBlock, 1, 2), new ItemStack(Ingot, 1, 6), 1.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 2), new ItemStack(Ingot, 1, 1), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 0), new ItemStack(Items.iron_ingot), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 1), new ItemStack(Items.gold_ingot), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 5), new ItemStack(Ingot, 1, 4), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 6), new ItemStack(Ingot, 1, 5), 0.0F); - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Dust, 1, 7), new ItemStack(Ingot, 1, 6), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 0), new ItemStack(MekanismItems.Ingot, 1, 1), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 1), new ItemStack(MekanismItems.Ingot, 1, 5), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismBlocks.OreBlock, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 6), 1.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 2), new ItemStack(MekanismItems.Ingot, 1, 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 0), new ItemStack(Items.iron_ingot), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 1), new ItemStack(Items.gold_ingot), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 5), new ItemStack(MekanismItems.Ingot, 1, 4), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 6), new ItemStack(MekanismItems.Ingot, 1, 5), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 7), new ItemStack(MekanismItems.Ingot, 1, 6), 0.0F); //Enrichment Chamber Recipes RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.redstone_ore), new ItemStack(Items.redstone, 12)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(DirtyDust, 2, 6)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 0), new ItemStack(CompressedCarbon)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 1), new ItemStack(CompressedCarbon)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.redstone), new ItemStack(CompressedRedstone)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.DirtyDust, 2, 6)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 0), new ItemStack(MekanismItems.CompressedCarbon)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.coal, 1, 1), new ItemStack(MekanismItems.CompressedCarbon)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.redstone), new ItemStack(MekanismItems.CompressedRedstone)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.lapis_ore), new ItemStack(Items.dye, 12, 4)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.coal_ore), new ItemStack(Items.coal, 2)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.diamond_ore), new ItemStack(Items.diamond, 2)); @@ -788,12 +620,12 @@ public class Mekanism RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.stonebrick, 1, 1), new ItemStack(Blocks.stonebrick, 1, 0)); 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)); - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.diamond), new ItemStack(CompressedDiamond)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.SaltBlock), new ItemStack(MekanismItems.Salt, 4)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.CompressedDiamond)); for(int i = 0; i < EnumColor.DYES.length; i++) { - RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(BlockHDPE, 1, i), new ItemStack(BlockSlickHDPE, 1, i)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.BlockHDPE, 1, i), new ItemStack(MekanismBlocks.BlockSlickHDPE, 1, i)); } //Combiner recipes @@ -802,12 +634,12 @@ public class Mekanism RecipeHandler.addCombinerRecipe(new ItemStack(Items.flint), new ItemStack(Blocks.gravel)); //Osmium Compressor Recipes - RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(Ingot, 1, 3)); + RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Items.glowstone_dust), new ItemStack(MekanismItems.Ingot, 1, 3)); //Crusher Recipes - RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(Dust, 1, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(Dust, 1, 0)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(Dust, 1, 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.Dust, 1, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.iron_ingot), new ItemStack(MekanismItems.Dust, 1, 0)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.gold_ingot), new ItemStack(MekanismItems.Dust, 1, 1)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.gravel), new ItemStack(Blocks.sand)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.stone), new ItemStack(Blocks.cobblestone)); RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.cobblestone), new ItemStack(Blocks.gravel)); @@ -823,26 +655,26 @@ public class Mekanism } //BioFuel Crusher Recipes - RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.tallgrass), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.reeds), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.wheat), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.pumpkin_seeds), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.melon_seeds), new ItemStack(BioFuel, 2)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.apple), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.bread), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.potato), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.carrot), new ItemStack(BioFuel, 4)); - RecipeHandler.addCrusherRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Blocks.tallgrass), new ItemStack(MekanismItems.BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.reeds), new ItemStack(MekanismItems.BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.wheat_seeds), new ItemStack(MekanismItems.BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.wheat), new ItemStack(MekanismItems.BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.pumpkin_seeds), new ItemStack(MekanismItems.BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.melon_seeds), new ItemStack(MekanismItems.BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.apple), new ItemStack(MekanismItems.BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.bread), new ItemStack(MekanismItems.BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.potato), new ItemStack(MekanismItems.BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.carrot), new ItemStack(MekanismItems.BioFuel, 4)); + RecipeHandler.addCrusherRecipe(new ItemStack(Items.rotten_flesh), new ItemStack(MekanismItems.BioFuel, 2)); //Purification Chamber Recipes - RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(Clump, 3, 6)); + RecipeHandler.addPurificationChamberRecipe(new ItemStack(Blocks.obsidian), new ItemStack(MekanismItems.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)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Blocks.obsidian), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 6)); RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Blocks.dirt), GasRegistry.getGas("water")), new ItemStack(Blocks.clay)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Items.gunpowder), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Dust, 1, 10)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(new ItemStack(Items.gunpowder), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Dust, 1, 10)); //Precision Sawmill Recipes RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.ladder, 3), new ChanceOutput(new ItemStack(Items.stick, 7))); @@ -860,15 +692,15 @@ public class Mekanism RecipeHandler.addPrecisionSawmillRecipe(new ItemStack(Blocks.crafting_table), new ChanceOutput(new ItemStack(Blocks.planks, 4))); //Metallurgic Infuser Recipes - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot)), new ItemStack(EnrichedIron)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(EnrichedIron)), new ItemStack(Dust, 1, 5)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Items.iron_ingot)), new ItemStack(EnrichedAlloy)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Items.iron_ingot)), new ItemStack(MekanismItems.EnrichedIron)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(MekanismItems.EnrichedIron)), new ItemStack(MekanismItems.Dust, 1, 5)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, new ItemStack(Items.iron_ingot)), new ItemStack(MekanismItems.EnrichedAlloy)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("FUNGI"), 10, new ItemStack(Blocks.dirt)), new ItemStack(Blocks.mycelium)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.cobblestone)), new ItemStack(Blocks.mossy_cobblestone)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.stonebrick, 1, 0)), new ItemStack(Blocks.stonebrick, 1, 1)); RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("BIO"), 10, new ItemStack(Blocks.sand)), new ItemStack(Blocks.dirt)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("DIAMOND"), 10, new ItemStack(EnrichedAlloy)), new ItemStack(ReinforcedAlloy)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("OBSIDIAN"), 10, new ItemStack(ReinforcedAlloy)), new ItemStack(AtomicAlloy)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("DIAMOND"), 10, new ItemStack(MekanismItems.EnrichedAlloy)), new ItemStack(MekanismItems.ReinforcedAlloy)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("OBSIDIAN"), 10, new ItemStack(MekanismItems.ReinforcedAlloy)), new ItemStack(MekanismItems.AtomicAlloy)); //Chemical Infuser Recipes RecipeHandler.addChemicalInfuserRecipe(new ChemicalPair(new GasStack(GasRegistry.getGas("oxygen"), 1), new GasStack(GasRegistry.getGas("sulfurDioxideGas"), 2)), new GasStack(GasRegistry.getGas("sulfurTrioxideGas"), 2)); @@ -887,7 +719,7 @@ public class Mekanism OreGas oreGas = (OreGas)gas; RecipeHandler.addChemicalWasherRecipe(new GasStack(oreGas, 1), new GasStack(oreGas.getCleanGas(), 1)); - RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(Crystal, 1, Resource.getFromName(oreGas.getName()).ordinal())); + RecipeHandler.addChemicalCrystallizerRecipe(new GasStack(oreGas.getCleanGas(), 200), new ItemStack(MekanismItems.Crystal, 1, Resource.getFromName(oreGas.getName()).ordinal())); } } @@ -896,38 +728,38 @@ public class Mekanism //Pressurized Reaction Chamber Recipes RecipeHandler.addPRCRecipe( - new PressurizedReactants(new ItemStack(BioFuel, 2), new FluidStack(FluidRegistry.WATER, 10), new GasStack(GasRegistry.getGas("hydrogen"), 100)), - new PressurizedProducts(new ItemStack(Substrate), new GasStack(GasRegistry.getGas("ethene"), 100)), + new PressurizedReactants(new ItemStack(MekanismItems.BioFuel, 2), new FluidStack(FluidRegistry.WATER, 10), new GasStack(GasRegistry.getGas("hydrogen"), 100)), + new PressurizedProducts(new ItemStack(MekanismItems.Substrate), new GasStack(GasRegistry.getGas("ethene"), 100)), 0, 100 ); RecipeHandler.addPRCRecipe( - new PressurizedReactants(new ItemStack(Substrate), new FluidStack(FluidRegistry.getFluid("ethene"), 50), new GasStack(GasRegistry.getGas("oxygen"), 10)), - new PressurizedProducts(new ItemStack(Polyethene), new GasStack(GasRegistry.getGas("oxygen"), 5)), + new PressurizedReactants(new ItemStack(MekanismItems.Substrate), new FluidStack(FluidRegistry.getFluid("ethene"), 50), new GasStack(GasRegistry.getGas("oxygen"), 10)), + new PressurizedProducts(new ItemStack(MekanismItems.Polyethene), new GasStack(GasRegistry.getGas("oxygen"), 5)), 1000, 60 ); //Infuse objects - InfuseRegistry.registerInfuseObject(new ItemStack(BioFuel), new InfuseObject(InfuseRegistry.get("BIO"), 5)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.BioFuel), new InfuseObject(InfuseRegistry.get("BIO"), 5)); InfuseRegistry.registerInfuseObject(new ItemStack(Items.coal, 1, 0), new InfuseObject(InfuseRegistry.get("CARBON"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(Items.coal, 1, 1), new InfuseObject(InfuseRegistry.get("CARBON"), 20)); - InfuseRegistry.registerInfuseObject(new ItemStack(CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 100)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedCarbon), new InfuseObject(InfuseRegistry.get("CARBON"), 100)); InfuseRegistry.registerInfuseObject(new ItemStack(Items.redstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.redstone_block), new InfuseObject(InfuseRegistry.get("REDSTONE"), 90)); - InfuseRegistry.registerInfuseObject(new ItemStack(CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 100)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedRedstone), new InfuseObject(InfuseRegistry.get("REDSTONE"), 100)); InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.red_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); InfuseRegistry.registerInfuseObject(new ItemStack(Blocks.brown_mushroom), new InfuseObject(InfuseRegistry.get("FUNGI"), 10)); - InfuseRegistry.registerInfuseObject(new ItemStack(CompressedDiamond), new InfuseObject(InfuseRegistry.get("DIAMOND"), 100)); - InfuseRegistry.registerInfuseObject(new ItemStack(CompressedObsidian), new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 100)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedDiamond), new InfuseObject(InfuseRegistry.get("DIAMOND"), 100)); + InfuseRegistry.registerInfuseObject(new ItemStack(MekanismItems.CompressedObsidian), new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 100)); //Fuels GameRegistry.registerFuelHandler(new IFuelHandler() { @Override public int getBurnTime(ItemStack fuel) { - if(fuel.isItemEqual(new ItemStack(BasicBlock, 1, 3))) + if(fuel.isItemEqual(new ItemStack(MekanismBlocks.BasicBlock, 1, 3))) { return 200*8*9; } @@ -937,7 +769,7 @@ public class Mekanism }); //Fuel Gases - FuelHandler.addGas(GasRegistry.getGas("hydrogen"), 1, FROM_H2); + FuelHandler.addGas(GasRegistry.getGas("hydrogen"), 1, general.FROM_H2); //RecipeSorter registrations RecipeSorter.register("mekanism", MekanismRecipe.class, Category.SHAPED, ""); @@ -947,150 +779,83 @@ public class Mekanism /** * Adds and registers all items. */ - public void addItems() + public void registerItems() { - //Declarations - PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); - EnrichedAlloy = new ItemMekanism().setUnlocalizedName("EnrichedAlloy"); - ReinforcedAlloy = new ItemMekanism().setUnlocalizedName("ReinforcedAlloy"); - AtomicAlloy = new ItemMekanism().setUnlocalizedName("AtomicAlloy"); - ControlCircuit = new ItemControlCircuit(); - EnrichedIron = new ItemMekanism().setUnlocalizedName("EnrichedIron"); - CompressedCarbon = new ItemMekanism().setUnlocalizedName("CompressedCarbon"); - CompressedRedstone = new ItemMekanism().setUnlocalizedName("CompressedRedstone"); - CompressedDiamond = new ItemMekanism().setUnlocalizedName("CompressedDiamond"); - CompressedObsidian = new ItemMekanism().setUnlocalizedName("CompressedObsidian"); - TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore"); - ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore"); - SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade"); - EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade"); - EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet"); - Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); - FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard"); - ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow"); - PortableTeleporter = new ItemPortableTeleporter().setUnlocalizedName("PortableTeleporter"); - Configurator = new ItemConfigurator().setUnlocalizedName("Configurator"); - NetworkReader = new ItemNetworkReader().setUnlocalizedName("NetworkReader"); - WalkieTalkie = new ItemWalkieTalkie().setUnlocalizedName("WalkieTalkie"); - SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader"); - AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler().setUnlocalizedName("AtomicDisassembler"); - GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask"); - ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); - Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack"); - ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack"); - FreeRunners = new ItemFreeRunners().setUnlocalizedName("FreeRunners"); - Flamethrower = (ItemFlamethrower)new ItemFlamethrower().setUnlocalizedName("Flamethrower"); - BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket"); - Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust"); - Salt = new ItemMekanism().setUnlocalizedName("Salt"); - Ingot = new ItemIngot(); - DirtyDust = new ItemDirtyDust(); - Clump = new ItemClump(); - Shard = new ItemShard(); - Crystal = new ItemCrystal(); - Dust = new ItemDust(); - Robit = (ItemRobit)new ItemRobit().setUnlocalizedName("Robit"); - Balloon = new ItemBalloon().setUnlocalizedName("Balloon"); - ItemProxy = new ItemProxy().setUnlocalizedName("ItemProxy"); - Substrate = new ItemMekanism().setUnlocalizedName("Substrate"); - Polyethene = new ItemHDPE().setUnlocalizedName("HDPE"); - BioFuel = new ItemMekanism().setUnlocalizedName("BioFuel"); - GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); - //Fluid Container stuff - FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(BrineBucket), FluidContainerRegistry.EMPTY_BUCKET); + FluidContainerRegistry.registerFluidContainer(FluidRegistry.getFluid("brine"), new ItemStack(MekanismItems.BrineBucket), FluidContainerRegistry.EMPTY_BUCKET); //Registrations - GameRegistry.registerItem(PartTransmitter, "PartTransmitter"); - GameRegistry.registerItem(ElectricBow, "ElectricBow"); - GameRegistry.registerItem(Dust, "Dust"); - GameRegistry.registerItem(Ingot, "Ingot"); - GameRegistry.registerItem(EnergyTablet, "EnergyTablet"); - GameRegistry.registerItem(SpeedUpgrade, "SpeedUpgrade"); - GameRegistry.registerItem(EnergyUpgrade, "EnergyUpgrade"); - GameRegistry.registerItem(Robit, "Robit"); - GameRegistry.registerItem(AtomicDisassembler, "AtomicDisassembler"); - GameRegistry.registerItem(EnrichedAlloy, "EnrichedAlloy"); - GameRegistry.registerItem(ReinforcedAlloy, "ReinforcedAlloy"); - GameRegistry.registerItem(AtomicAlloy, "AtomicAlloy"); - GameRegistry.registerItem(ItemProxy, "ItemProxy"); - GameRegistry.registerItem(ControlCircuit, "ControlCircuit"); - GameRegistry.registerItem(EnrichedIron, "EnrichedIron"); - GameRegistry.registerItem(CompressedCarbon, "CompressedCarbon"); - GameRegistry.registerItem(CompressedRedstone, "CompressedRedstone"); - GameRegistry.registerItem(CompressedDiamond, "CompressedDiamond"); - GameRegistry.registerItem(CompressedObsidian, "CompressedObsidian"); - GameRegistry.registerItem(PortableTeleporter, "PortableTeleporter"); - GameRegistry.registerItem(TeleportationCore, "TeleportationCore"); - GameRegistry.registerItem(Clump, "Clump"); - GameRegistry.registerItem(DirtyDust, "DirtyDust"); - GameRegistry.registerItem(Configurator, "Configurator"); - GameRegistry.registerItem(NetworkReader, "NetworkReader"); - GameRegistry.registerItem(WalkieTalkie, "WalkieTalkie"); - GameRegistry.registerItem(Jetpack, "Jetpack"); - GameRegistry.registerItem(Dictionary, "Dictionary"); - GameRegistry.registerItem(GasMask, "GasMask"); - GameRegistry.registerItem(ScubaTank, "ScubaTank"); - GameRegistry.registerItem(Balloon, "Balloon"); - GameRegistry.registerItem(Shard, "Shard"); - GameRegistry.registerItem(ElectrolyticCore, "ElectrolyticCore"); - GameRegistry.registerItem(Sawdust, "Sawdust"); - GameRegistry.registerItem(Salt, "Salt"); - GameRegistry.registerItem(BrineBucket, "BrineBucket"); - GameRegistry.registerItem(Crystal, "Crystal"); - GameRegistry.registerItem(FreeRunners, "FrictionBoots"); - GameRegistry.registerItem(ArmoredJetpack, "ArmoredJetpack"); - GameRegistry.registerItem(FilterCard, "FilterCard"); - GameRegistry.registerItem(SeismicReader, "SeismicReader"); - GameRegistry.registerItem(Substrate, "Substrate"); - GameRegistry.registerItem(Polyethene, "Polyethene"); - GameRegistry.registerItem(BioFuel, "BioFuel"); - GameRegistry.registerItem(GlowPanel, "GlowPanel"); - GameRegistry.registerItem(Flamethrower, "Flamethrower"); + GameRegistry.registerItem(MekanismItems.PartTransmitter, "PartTransmitter"); + GameRegistry.registerItem(MekanismItems.ElectricBow, "ElectricBow"); + GameRegistry.registerItem(MekanismItems.Dust, "Dust"); + GameRegistry.registerItem(MekanismItems.Ingot, "Ingot"); + GameRegistry.registerItem(MekanismItems.EnergyTablet, "EnergyTablet"); + GameRegistry.registerItem(MekanismItems.SpeedUpgrade, "SpeedUpgrade"); + GameRegistry.registerItem(MekanismItems.EnergyUpgrade, "EnergyUpgrade"); + GameRegistry.registerItem(MekanismItems.Robit, "Robit"); + GameRegistry.registerItem(MekanismItems.AtomicDisassembler, "AtomicDisassembler"); + GameRegistry.registerItem(MekanismItems.EnrichedAlloy, "EnrichedAlloy"); + GameRegistry.registerItem(MekanismItems.ReinforcedAlloy, "ReinforcedAlloy"); + GameRegistry.registerItem(MekanismItems.AtomicAlloy, "AtomicAlloy"); + GameRegistry.registerItem(MekanismItems.Proxy, "ItemProxy"); + GameRegistry.registerItem(MekanismItems.ControlCircuit, "ControlCircuit"); + GameRegistry.registerItem(MekanismItems.EnrichedIron, "EnrichedIron"); + GameRegistry.registerItem(MekanismItems.CompressedCarbon, "CompressedCarbon"); + GameRegistry.registerItem(MekanismItems.CompressedRedstone, "CompressedRedstone"); + GameRegistry.registerItem(MekanismItems.CompressedDiamond, "CompressedDiamond"); + GameRegistry.registerItem(MekanismItems.CompressedObsidian, "CompressedObsidian"); + GameRegistry.registerItem(MekanismItems.PortableTeleporter, "PortableTeleporter"); + GameRegistry.registerItem(MekanismItems.TeleportationCore, "TeleportationCore"); + GameRegistry.registerItem(MekanismItems.Clump, "Clump"); + GameRegistry.registerItem(MekanismItems.DirtyDust, "DirtyDust"); + GameRegistry.registerItem(MekanismItems.Configurator, "Configurator"); + GameRegistry.registerItem(MekanismItems.NetworkReader, "NetworkReader"); + GameRegistry.registerItem(MekanismItems.WalkieTalkie, "WalkieTalkie"); + GameRegistry.registerItem(MekanismItems.Jetpack, "Jetpack"); + GameRegistry.registerItem(MekanismItems.Dictionary, "Dictionary"); + GameRegistry.registerItem(MekanismItems.GasMask, "GasMask"); + GameRegistry.registerItem(MekanismItems.ScubaTank, "ScubaTank"); + GameRegistry.registerItem(MekanismItems.Balloon, "Balloon"); + GameRegistry.registerItem(MekanismItems.Shard, "Shard"); + GameRegistry.registerItem(MekanismItems.ElectrolyticCore, "ElectrolyticCore"); + GameRegistry.registerItem(MekanismItems.Sawdust, "Sawdust"); + GameRegistry.registerItem(MekanismItems.Salt, "Salt"); + GameRegistry.registerItem(MekanismItems.BrineBucket, "BrineBucket"); + GameRegistry.registerItem(MekanismItems.Crystal, "Crystal"); + GameRegistry.registerItem(MekanismItems.FreeRunners, "FrictionBoots"); + GameRegistry.registerItem(MekanismItems.ArmoredJetpack, "ArmoredJetpack"); + GameRegistry.registerItem(MekanismItems.FilterCard, "FilterCard"); + GameRegistry.registerItem(MekanismItems.SeismicReader, "SeismicReader"); + GameRegistry.registerItem(MekanismItems.Substrate, "Substrate"); + GameRegistry.registerItem(MekanismItems.Polyethene, "Polyethene"); + GameRegistry.registerItem(MekanismItems.BioFuel, "BioFuel"); + GameRegistry.registerItem(MekanismItems.GlowPanel, "GlowPanel"); + GameRegistry.registerItem(MekanismItems.Flamethrower, "Flamethrower"); } /** * Adds and registers all blocks. */ - public void addBlocks() + public void registerBlocks() { - //Declarations - BasicBlock = new BlockBasic().setBlockName("BasicBlock"); - BasicBlock2 = new BlockBasic().setBlockName("BasicBlock2"); - MachineBlock = new BlockMachine().setBlockName("MachineBlock"); - MachineBlock2 = new BlockMachine().setBlockName("MachineBlock2"); - OreBlock = new BlockOre().setBlockName("OreBlock"); - EnergyCube = new BlockEnergyCube().setBlockName("EnergyCube"); - ObsidianTNT = new BlockObsidianTNT().setBlockName("ObsidianTNT").setCreativeTab(tabMekanism); - BoundingBlock = (BlockBounding)new BlockBounding().setBlockName("BoundingBlock"); - GasTank = new BlockGasTank().setBlockName("GasTank"); - CardboardBox = new BlockCardboardBox().setBlockName("CardboardBox"); - BlockHDPE = new BlockPlastic().setBlockName("PlasticBlock"); - BlockSlickHDPE = new BlockPlastic().setBlockName("SlickPlasticBlock"); - BlockGlowHDPE = new BlockPlastic().setBlockName("GlowPlasticBlock"); - 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"); - GameRegistry.registerBlock(BasicBlock2, ItemBlockBasic.class, "BasicBlock2"); - GameRegistry.registerBlock(MachineBlock, ItemBlockMachine.class, "MachineBlock"); - GameRegistry.registerBlock(MachineBlock2, ItemBlockMachine.class, "MachineBlock2"); - GameRegistry.registerBlock(OreBlock, ItemBlockOre.class, "OreBlock"); - GameRegistry.registerBlock(EnergyCube, ItemBlockEnergyCube.class, "EnergyCube"); - GameRegistry.registerBlock(ObsidianTNT, "ObsidianTNT"); - GameRegistry.registerBlock(BoundingBlock, "BoundingBlock"); - GameRegistry.registerBlock(GasTank, ItemBlockGasTank.class, "GasTank"); - GameRegistry.registerBlock(CardboardBox, ItemBlockCardboardBox.class, "CardboardBox"); - GameRegistry.registerBlock(BlockHDPE, ItemBlockPlastic.class, "PlasticBlock"); - GameRegistry.registerBlock(BlockSlickHDPE, ItemBlockPlastic.class, "SlickPlasticBlock"); - GameRegistry.registerBlock(BlockGlowHDPE, ItemBlockPlastic.class, "GlowPlasticBlock"); - GameRegistry.registerBlock(BlockReinforcedHDPE, ItemBlockPlastic.class, "ReinforcedPlasticBlock"); - GameRegistry.registerBlock(BlockRoadHDPE, ItemBlockPlastic.class, "RoadPlasticBlock"); - GameRegistry.registerBlock(BlockHDPEFence, "PlasticFence"); - GameRegistry.registerBlock(SaltBlock, "SaltBlock"); + GameRegistry.registerBlock(MekanismBlocks.BasicBlock, ItemBlockBasic.class, "BasicBlock"); + GameRegistry.registerBlock(MekanismBlocks.BasicBlock2, ItemBlockBasic.class, "BasicBlock2"); + GameRegistry.registerBlock(MekanismBlocks.MachineBlock, ItemBlockMachine.class, "MachineBlock"); + GameRegistry.registerBlock(MekanismBlocks.MachineBlock2, ItemBlockMachine.class, "MachineBlock2"); + GameRegistry.registerBlock(MekanismBlocks.OreBlock, ItemBlockOre.class, "OreBlock"); + GameRegistry.registerBlock(MekanismBlocks.EnergyCube, ItemBlockEnergyCube.class, "EnergyCube"); + GameRegistry.registerBlock(MekanismBlocks.ObsidianTNT, "ObsidianTNT"); + GameRegistry.registerBlock(MekanismBlocks.BoundingBlock, "BoundingBlock"); + GameRegistry.registerBlock(MekanismBlocks.GasTank, ItemBlockGasTank.class, "GasTank"); + GameRegistry.registerBlock(MekanismBlocks.CardboardBox, ItemBlockCardboardBox.class, "CardboardBox"); + GameRegistry.registerBlock(MekanismBlocks.BlockHDPE, ItemBlockPlastic.class, "PlasticBlock"); + GameRegistry.registerBlock(MekanismBlocks.BlockSlickHDPE, ItemBlockPlastic.class, "SlickPlasticBlock"); + GameRegistry.registerBlock(MekanismBlocks.BlockGlowHDPE, ItemBlockPlastic.class, "GlowPlasticBlock"); + GameRegistry.registerBlock(MekanismBlocks.BlockReinforcedHDPE, ItemBlockPlastic.class, "ReinforcedPlasticBlock"); + GameRegistry.registerBlock(MekanismBlocks.BlockRoadHDPE, ItemBlockPlastic.class, "RoadPlasticBlock"); + GameRegistry.registerBlock(MekanismBlocks.BlockHDPEFence, "PlasticFence"); + GameRegistry.registerBlock(MekanismBlocks.SaltBlock, "SaltBlock"); } /** @@ -1099,64 +864,64 @@ public class Mekanism public void registerOreDict() { //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); + OreDictionary.registerOre("universalCable", new ItemStack(MekanismItems.PartTransmitter, 8, 0)); + OreDictionary.registerOre("battery", MekanismItems.EnergyTablet.getUnchargedItem()); + OreDictionary.registerOre("pulpWood", MekanismItems.Sawdust); + OreDictionary.registerOre("blockSalt", MekanismBlocks.SaltBlock); //Alloys! OreDictionary.registerOre("alloyBasic", new ItemStack(Items.redstone)); - OreDictionary.registerOre("alloyAdvanced", new ItemStack(EnrichedAlloy)); - OreDictionary.registerOre("alloyElite", new ItemStack(ReinforcedAlloy)); - OreDictionary.registerOre("alloyUltimate", new ItemStack(AtomicAlloy)); + OreDictionary.registerOre("alloyAdvanced", new ItemStack(MekanismItems.EnrichedAlloy)); + OreDictionary.registerOre("alloyElite", new ItemStack(MekanismItems.ReinforcedAlloy)); + OreDictionary.registerOre("alloyUltimate", new ItemStack(MekanismItems.AtomicAlloy)); //for RailCraft/IC2. - OreDictionary.registerOre("dustObsidian", new ItemStack(DirtyDust, 1, 6)); + OreDictionary.registerOre("dustObsidian", new ItemStack(MekanismItems.DirtyDust, 1, 6)); //GregoriousT? - OreDictionary.registerOre("itemSalt", Salt); - OreDictionary.registerOre("dustSalt", Salt); + OreDictionary.registerOre("itemSalt", MekanismItems.Salt); + OreDictionary.registerOre("dustSalt", MekanismItems.Salt); - OreDictionary.registerOre("dustIron", new ItemStack(Dust, 1, 0)); - OreDictionary.registerOre("dustGold", new ItemStack(Dust, 1, 1)); - OreDictionary.registerOre("dustOsmium", new ItemStack(Dust, 1, 2)); - OreDictionary.registerOre("dustRefinedObsidian", new ItemStack(Dust, 1, 3)); - OreDictionary.registerOre("dustDiamond", new ItemStack(Dust, 1, 4)); - OreDictionary.registerOre("dustSteel", new ItemStack(Dust, 1, 5)); - OreDictionary.registerOre("dustCopper", new ItemStack(Dust, 1, 6)); - OreDictionary.registerOre("dustTin", new ItemStack(Dust, 1, 7)); - OreDictionary.registerOre("dustSilver", new ItemStack(Dust, 1, 8)); - OreDictionary.registerOre("dustLead", new ItemStack(Dust, 1, 9)); - OreDictionary.registerOre("dustSulfur", new ItemStack(Dust, 1, 10)); + OreDictionary.registerOre("dustIron", new ItemStack(MekanismItems.Dust, 1, 0)); + OreDictionary.registerOre("dustGold", new ItemStack(MekanismItems.Dust, 1, 1)); + OreDictionary.registerOre("dustOsmium", new ItemStack(MekanismItems.Dust, 1, 2)); + OreDictionary.registerOre("dustRefinedObsidian", new ItemStack(MekanismItems.Dust, 1, 3)); + OreDictionary.registerOre("dustDiamond", new ItemStack(MekanismItems.Dust, 1, 4)); + OreDictionary.registerOre("dustSteel", new ItemStack(MekanismItems.Dust, 1, 5)); + OreDictionary.registerOre("dustCopper", new ItemStack(MekanismItems.Dust, 1, 6)); + OreDictionary.registerOre("dustTin", new ItemStack(MekanismItems.Dust, 1, 7)); + OreDictionary.registerOre("dustSilver", new ItemStack(MekanismItems.Dust, 1, 8)); + OreDictionary.registerOre("dustLead", new ItemStack(MekanismItems.Dust, 1, 9)); + OreDictionary.registerOre("dustSulfur", new ItemStack(MekanismItems.Dust, 1, 10)); - OreDictionary.registerOre("ingotRefinedObsidian", new ItemStack(Ingot, 1, 0)); - OreDictionary.registerOre("ingotOsmium", new ItemStack(Ingot, 1, 1)); - OreDictionary.registerOre("ingotBronze", new ItemStack(Ingot, 1, 2)); - OreDictionary.registerOre("ingotRefinedGlowstone", new ItemStack(Ingot, 1, 3)); - OreDictionary.registerOre("ingotSteel", new ItemStack(Ingot, 1, 4)); - OreDictionary.registerOre("ingotCopper", new ItemStack(Ingot, 1, 5)); - OreDictionary.registerOre("ingotTin", new ItemStack(Ingot, 1, 6)); + OreDictionary.registerOre("ingotRefinedObsidian", new ItemStack(MekanismItems.Ingot, 1, 0)); + OreDictionary.registerOre("ingotOsmium", new ItemStack(MekanismItems.Ingot, 1, 1)); + OreDictionary.registerOre("ingotBronze", new ItemStack(MekanismItems.Ingot, 1, 2)); + OreDictionary.registerOre("ingotRefinedGlowstone", new ItemStack(MekanismItems.Ingot, 1, 3)); + OreDictionary.registerOre("ingotSteel", new ItemStack(MekanismItems.Ingot, 1, 4)); + OreDictionary.registerOre("ingotCopper", new ItemStack(MekanismItems.Ingot, 1, 5)); + OreDictionary.registerOre("ingotTin", new ItemStack(MekanismItems.Ingot, 1, 6)); - OreDictionary.registerOre("blockOsmium", new ItemStack(BasicBlock, 1, 0)); - OreDictionary.registerOre("blockBronze", new ItemStack(BasicBlock, 1, 1)); - OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(BasicBlock, 1, 2)); - OreDictionary.registerOre("blockCharcoal", new ItemStack(BasicBlock, 1, 3)); - OreDictionary.registerOre("blockRefinedGlowstone", new ItemStack(BasicBlock, 1, 4)); - OreDictionary.registerOre("blockSteel", new ItemStack(BasicBlock, 1, 5)); - OreDictionary.registerOre("blockCopper", new ItemStack(BasicBlock, 1, 12)); - OreDictionary.registerOre("blockTin", new ItemStack(BasicBlock, 1, 13)); + OreDictionary.registerOre("blockOsmium", new ItemStack(MekanismBlocks.BasicBlock, 1, 0)); + OreDictionary.registerOre("blockBronze", new ItemStack(MekanismBlocks.BasicBlock, 1, 1)); + OreDictionary.registerOre("blockRefinedObsidian", new ItemStack(MekanismBlocks.BasicBlock, 1, 2)); + OreDictionary.registerOre("blockCharcoal", new ItemStack(MekanismBlocks.BasicBlock, 1, 3)); + OreDictionary.registerOre("blockRefinedGlowstone", new ItemStack(MekanismBlocks.BasicBlock, 1, 4)); + OreDictionary.registerOre("blockSteel", new ItemStack(MekanismBlocks.BasicBlock, 1, 5)); + OreDictionary.registerOre("blockCopper", new ItemStack(MekanismBlocks.BasicBlock, 1, 12)); + OreDictionary.registerOre("blockTin", new ItemStack(MekanismBlocks.BasicBlock, 1, 13)); for(Resource resource : Resource.values()) { - OreDictionary.registerOre("dustDirty" + resource.getName(), new ItemStack(DirtyDust, 1, resource.ordinal())); - OreDictionary.registerOre("clump" + resource.getName(), new ItemStack(Clump, 1, resource.ordinal())); - OreDictionary.registerOre("shard" + resource.getName(), new ItemStack(Shard, 1, resource.ordinal())); - OreDictionary.registerOre("crystal" + resource.getName(), new ItemStack(Crystal, 1, resource.ordinal())); + OreDictionary.registerOre("dustDirty" + resource.getName(), new ItemStack(MekanismItems.DirtyDust, 1, resource.ordinal())); + OreDictionary.registerOre("clump" + resource.getName(), new ItemStack(MekanismItems.Clump, 1, resource.ordinal())); + OreDictionary.registerOre("shard" + resource.getName(), new ItemStack(MekanismItems.Shard, 1, resource.ordinal())); + OreDictionary.registerOre("crystal" + resource.getName(), new ItemStack(MekanismItems.Crystal, 1, resource.ordinal())); } - OreDictionary.registerOre("oreOsmium", new ItemStack(OreBlock, 1, 0)); - OreDictionary.registerOre("oreCopper", new ItemStack(OreBlock, 1, 1)); - OreDictionary.registerOre("oreTin", new ItemStack(OreBlock, 1, 2)); + OreDictionary.registerOre("oreOsmium", new ItemStack(MekanismBlocks.OreBlock, 1, 0)); + OreDictionary.registerOre("oreCopper", new ItemStack(MekanismBlocks.OreBlock, 1, 1)); + OreDictionary.registerOre("oreTin", new ItemStack(MekanismBlocks.OreBlock, 1, 2)); //MC stuff OreDictionary.registerOre("oreCoal", new ItemStack(Blocks.coal_ore)); @@ -1164,17 +929,17 @@ public class Mekanism OreDictionary.registerOre("ingotGold", new ItemStack(Items.gold_ingot)); OreDictionary.registerOre("oreRedstone", new ItemStack(Blocks.redstone_ore)); - if(controlCircuitOreDict) + if(general.controlCircuitOreDict) { - 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("circuitBasic", new ItemStack(MekanismItems.ControlCircuit, 1, 0)); + OreDictionary.registerOre("circuitAdvanced", new ItemStack(MekanismItems.ControlCircuit, 1, 1)); + OreDictionary.registerOre("circuitElite", new ItemStack(MekanismItems.ControlCircuit, 1, 2)); + OreDictionary.registerOre("circuitUltimate", new ItemStack(MekanismItems.ControlCircuit, 1, 3)); } - OreDictionary.registerOre("itemCompressedCarbon", new ItemStack(CompressedCarbon)); - OreDictionary.registerOre("itemEnrichedAlloy", new ItemStack(EnrichedAlloy)); - OreDictionary.registerOre("itemBioFuel", new ItemStack(BioFuel)); + OreDictionary.registerOre("itemCompressedCarbon", new ItemStack(MekanismItems.CompressedCarbon)); + OreDictionary.registerOre("itemEnrichedAlloy", new ItemStack(MekanismItems.EnrichedAlloy)); + OreDictionary.registerOre("itemBioFuel", new ItemStack(MekanismItems.BioFuel)); } /** @@ -1274,7 +1039,7 @@ public class Mekanism @EventHandler public void serverStarting(FMLServerStartingEvent event) { - if(voiceServerEnabled) + if(general.voiceServerEnabled) { voiceManager.start(); } @@ -1294,7 +1059,7 @@ public class Mekanism @EventHandler public void serverStopping(FMLServerStoppingEvent event) { - if(voiceServerEnabled) + if(general.voiceServerEnabled) { voiceManager.stop(); } @@ -1391,7 +1156,7 @@ public class Mekanism MinecraftForge.EVENT_BUS.register(this); //Set up VoiceServerManager - if(voiceServerEnabled) + if(general.voiceServerEnabled) { voiceManager = new VoiceServerManager(); } @@ -1403,7 +1168,7 @@ public class Mekanism proxy.loadConfiguration(); //Add baby skeleton spawner - if(spawnBabySkeletons) + if(general.spawnBabySkeletons) { for(BiomeGenBase biome : WorldChunkManager.allowedBiomes) { @@ -1415,8 +1180,8 @@ public class Mekanism } //Load this module - addItems(); - addBlocks(); + registerItems(); + registerBlocks(); addRecipes(); addEntities(); @@ -1503,8 +1268,8 @@ public class Mekanism @SubscribeEvent public void onBlacklistUpdate(BoxBlacklistEvent event) { - MekanismAPI.addBoxBlacklist(CardboardBox, OreDictionary.WILDCARD_VALUE); - MekanismAPI.addBoxBlacklist(BoundingBlock, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(MekanismBlocks.CardboardBox, OreDictionary.WILDCARD_VALUE); + MekanismAPI.addBoxBlacklist(MekanismBlocks.BoundingBlock, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.bedrock, 0); MekanismAPI.addBoxBlacklist(Blocks.portal, OreDictionary.WILDCARD_VALUE); MekanismAPI.addBoxBlacklist(Blocks.end_portal, OreDictionary.WILDCARD_VALUE); @@ -1549,7 +1314,7 @@ public class Mekanism NBTTagCompound nbtTags = event.getData(); nbtTags.setInteger("MekanismWorldGen", baseWorldGenVersion); - nbtTags.setInteger("MekanismUserWorldGen", userWorldGenVersion); + nbtTags.setInteger("MekanismUserWorldGen", general.userWorldGenVersion); } } @@ -1558,11 +1323,11 @@ public class Mekanism { if(!event.world.isRemote) { - if(enableWorldRegeneration) + if(general.enableWorldRegeneration) { NBTTagCompound loadData = event.getData(); - if(loadData.getInteger("MekanismWorldGen") == baseWorldGenVersion && loadData.getInteger("MekanismUserWorldGen") == userWorldGenVersion) + if(loadData.getInteger("MekanismWorldGen") == baseWorldGenVersion && loadData.getInteger("MekanismUserWorldGen") == general.userWorldGenVersion) { return; } diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java new file mode 100644 index 000000000..05a2538f3 --- /dev/null +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -0,0 +1,38 @@ +package mekanism.common; + +import mekanism.common.block.BlockBasic; +import mekanism.common.block.BlockBounding; +import mekanism.common.block.BlockCardboardBox; +import mekanism.common.block.BlockEnergyCube; +import mekanism.common.block.BlockGasTank; +import mekanism.common.block.BlockMachine; +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 net.minecraft.block.Block; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder("Mekanism") +public class MekanismBlocks +{ + public static final Block BasicBlock = new BlockBasic().setBlockName("BasicBlock"); + public static final Block BasicBlock2 = new BlockBasic().setBlockName("BasicBlock2"); + public static final Block MachineBlock = new BlockMachine().setBlockName("MachineBlock"); + public static final Block MachineBlock2 = new BlockMachine().setBlockName("MachineBlock2"); + public static final Block OreBlock = new BlockOre().setBlockName("OreBlock"); + public static final Block ObsidianTNT = new BlockObsidianTNT().setBlockName("ObsidianTNT").setCreativeTab(Mekanism.tabMekanism); + public static final Block EnergyCube = new BlockEnergyCube().setBlockName("EnergyCube"); + public static final Block BoundingBlock = (BlockBounding)new BlockBounding().setBlockName("BoundingBlock"); + public static final Block GasTank = new BlockGasTank().setBlockName("GasTank"); + public static final Block CardboardBox = new BlockCardboardBox().setBlockName("CardboardBox"); + public static final Block BlockHDPE = new BlockPlastic().setBlockName("PlasticBlock"); + public static final Block BlockSlickHDPE = new BlockPlastic().setBlockName("SlickPlasticBlock"); + public static final Block BlockGlowHDPE = new BlockPlastic().setBlockName("GlowPlasticBlock"); + public static final Block BlockReinforcedHDPE = new BlockPlastic().setBlockName("ReinforcedPlasticBlock"); + public static final Block BlockRoadHDPE = new BlockPlastic().setBlockName("RoadPlasticBlock"); + public static final Block BlockHDPEFence = new BlockPlasticFence().setBlockName("PlasticFence"); + public static final Block SaltBlock = new BlockSalt().setBlockName("SaltBlock"); +} diff --git a/src/main/java/mekanism/common/MekanismItems.java b/src/main/java/mekanism/common/MekanismItems.java new file mode 100644 index 000000000..747d40445 --- /dev/null +++ b/src/main/java/mekanism/common/MekanismItems.java @@ -0,0 +1,90 @@ +package mekanism.common; + +import mekanism.common.item.ItemAtomicDisassembler; +import mekanism.common.item.ItemBalloon; +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; +import mekanism.common.item.ItemDust; +import mekanism.common.item.ItemElectricBow; +import mekanism.common.item.ItemEnergized; +import mekanism.common.item.ItemFilterCard; +import mekanism.common.item.ItemFlamethrower; +import mekanism.common.item.ItemFreeRunners; +import mekanism.common.item.ItemGasMask; +import mekanism.common.item.ItemHDPE; +import mekanism.common.item.ItemIngot; +import mekanism.common.item.ItemJetpack; +import mekanism.common.item.ItemMekanism; +import mekanism.common.item.ItemNetworkReader; +import mekanism.common.item.ItemPortableTeleporter; +import mekanism.common.item.ItemProxy; +import mekanism.common.item.ItemRobit; +import mekanism.common.item.ItemScubaTank; +import mekanism.common.item.ItemSeismicReader; +import mekanism.common.item.ItemShard; +import mekanism.common.item.ItemUpgrade; +import mekanism.common.item.ItemWalkieTalkie; +import mekanism.common.multipart.ItemGlowPanel; +import mekanism.common.multipart.ItemPartTransmitter; + +import net.minecraft.init.Items; +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder("Mekanism") +public class MekanismItems +{ + //Items + public static final ItemElectricBow ElectricBow = (ItemElectricBow)new ItemElectricBow().setUnlocalizedName("ElectricBow"); + public static final Item EnrichedAlloy = new ItemMekanism().setUnlocalizedName("EnrichedAlloy"); + public static final Item ReinforcedAlloy = new ItemMekanism().setUnlocalizedName("ReinforcedAlloy"); + public static final Item AtomicAlloy = new ItemMekanism().setUnlocalizedName("AtomicAlloy"); + public static final ItemEnergized EnergyTablet = (ItemEnergized)new ItemEnergized(1000000).setUnlocalizedName("EnergyTablet"); + public static final Item SpeedUpgrade = new ItemUpgrade(Upgrade.SPEED).setUnlocalizedName("SpeedUpgrade"); + public static final Item EnergyUpgrade = new ItemUpgrade(Upgrade.ENERGY).setUnlocalizedName("EnergyUpgrade"); + public static final ItemRobit Robit = (ItemRobit)new ItemRobit().setUnlocalizedName("Robit"); + public static final ItemAtomicDisassembler AtomicDisassembler = (ItemAtomicDisassembler)new ItemAtomicDisassembler().setUnlocalizedName("AtomicDisassembler"); + public static final Item EnrichedIron = new ItemMekanism().setUnlocalizedName("EnrichedIron"); + public static final Item CompressedCarbon = new ItemMekanism().setUnlocalizedName("CompressedCarbon"); + public static final Item CompressedRedstone = new ItemMekanism().setUnlocalizedName("CompressedRedstone"); + public static final Item CompressedDiamond = new ItemMekanism().setUnlocalizedName("CompressedDiamond"); + public static final Item CompressedObsidian = new ItemMekanism().setUnlocalizedName("CompressedObsidian"); + public static final Item PortableTeleporter = new ItemPortableTeleporter().setUnlocalizedName("PortableTeleporter"); + public static final Item TeleportationCore = new ItemMekanism().setUnlocalizedName("TeleportationCore"); + public static final Item Configurator = new ItemConfigurator().setUnlocalizedName("Configurator"); + public static final Item NetworkReader = new ItemNetworkReader().setUnlocalizedName("NetworkReader"); + public static final Item WalkieTalkie = new ItemWalkieTalkie().setUnlocalizedName("WalkieTalkie"); + public static final Item Proxy = new ItemProxy().setUnlocalizedName("ItemProxy"); + public static final Item PartTransmitter = new ItemPartTransmitter().setUnlocalizedName("MultipartTransmitter"); + public static final Item GlowPanel = new ItemGlowPanel().setUnlocalizedName("GlowPanel"); + public static final ItemJetpack Jetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("Jetpack"); + public static final ItemScubaTank ScubaTank = (ItemScubaTank)new ItemScubaTank().setUnlocalizedName("ScubaTank"); + public static final ItemGasMask GasMask = (ItemGasMask)new ItemGasMask().setUnlocalizedName("GasMask"); + public static final ItemFlamethrower Flamethrower = (ItemFlamethrower)new ItemFlamethrower().setUnlocalizedName("Flamethrower"); + public static final Item Dictionary = new ItemDictionary().setUnlocalizedName("Dictionary"); + public static final Item Balloon = new ItemBalloon().setUnlocalizedName("Balloon"); + public static final Item ElectrolyticCore = new ItemMekanism().setUnlocalizedName("ElectrolyticCore"); + public static final Item Sawdust = new ItemMekanism().setUnlocalizedName("Sawdust"); + public static final Item Salt = new ItemMekanism().setUnlocalizedName("Salt"); + public static final Item BrineBucket = new ItemMekanism().setMaxStackSize(1).setContainerItem(Items.bucket).setUnlocalizedName("BrineBucket"); + public static final Item FreeRunners = new ItemFreeRunners().setUnlocalizedName("FreeRunners"); + public static final ItemJetpack ArmoredJetpack = (ItemJetpack)new ItemJetpack().setUnlocalizedName("ArmoredJetpack"); + public static final Item FilterCard = new ItemFilterCard().setUnlocalizedName("FilterCard"); + public static final ItemSeismicReader SeismicReader = (ItemSeismicReader)new ItemSeismicReader().setUnlocalizedName("SeismicReader"); + public static final Item Substrate = new ItemMekanism().setUnlocalizedName("Substrate"); + public static final Item Polyethene = new ItemHDPE().setUnlocalizedName("HDPE"); + public static final Item BioFuel = new ItemMekanism().setUnlocalizedName("BioFuel"); + + //Multi-ID Items + public static final Item Dust = new ItemDust(); + public static final Item Ingot = new ItemIngot(); + public static final Item Clump = new ItemClump(); + public static final Item DirtyDust = new ItemDirtyDust(); + public static final Item Shard = new ItemShard(); + public static final Item Crystal = new ItemCrystal(); + public static final Item ControlCircuit = new ItemControlCircuit(); +} diff --git a/src/main/java/mekanism/common/OreDictCache.java b/src/main/java/mekanism/common/OreDictCache.java index 572b45c0e..fb0f8ce00 100644 --- a/src/main/java/mekanism/common/OreDictCache.java +++ b/src/main/java/mekanism/common/OreDictCache.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import mekanism.api.ItemInfo; +import mekanism.api.util.ItemInfo; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/Upgrade.java b/src/main/java/mekanism/common/Upgrade.java index 9f9326bdf..f6f80809b 100644 --- a/src/main/java/mekanism/common/Upgrade.java +++ b/src/main/java/mekanism/common/Upgrade.java @@ -6,6 +6,7 @@ import java.util.List; import java.util.Map; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.common.util.MekanismUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -60,9 +61,9 @@ public enum Upgrade switch(this) { case SPEED: - return new ItemStack(Mekanism.SpeedUpgrade); + return new ItemStack(MekanismItems.SpeedUpgrade); case ENERGY: - return new ItemStack(Mekanism.EnergyUpgrade); + return new ItemStack(MekanismItems.EnergyUpgrade); } return null; @@ -76,7 +77,7 @@ public enum Upgrade { if(canMultiply()) { - double effect = Math.pow(Mekanism.maxUpgradeMultiplier, (float)((IUpgradeTile)tile).getComponent().getUpgrades(this)/(float)getMax()); + double effect = Math.pow(general.maxUpgradeMultiplier, (float)((IUpgradeTile)tile).getComponent().getUpgrades(this)/(float)getMax()); ret.add(MekanismUtils.localize("gui.upgrades.effect") + ": " + (Math.round(effect*100)/100F) + "x"); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index c2d2faeda..3fb227924 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -11,6 +11,7 @@ import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.inventory.InventoryBin; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tank.TankUpdateProtocol; @@ -31,7 +32,6 @@ import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -107,7 +107,7 @@ public class BlockBasic extends Block @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { icons[0][0] = register.registerIcon("mekanism:OsmiumBlock"); icons[1][0] = register.registerIcon("mekanism:BronzeBlock"); @@ -134,7 +134,7 @@ public class BlockBasic extends Block glassRenderer.registerIcons(register); } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { icons[0][0] = register.registerIcon("mekanism:SalinationBlock"); } @@ -146,7 +146,7 @@ public class BlockBasic extends Block { int metadata = world.getBlockMetadata(x, y, z); - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { if(metadata == 6) { @@ -184,7 +184,7 @@ public class BlockBasic extends Block return getIcon(side, metadata); } } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { return getIcon(side, metadata); } @@ -196,7 +196,7 @@ public class BlockBasic extends Block @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { if(meta != 6 && meta != 14) { @@ -227,7 +227,7 @@ public class BlockBasic extends Block } } } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { return icons[meta][0]; } @@ -245,7 +245,7 @@ public class BlockBasic extends Block @SideOnly(Side.CLIENT) public void getSubBlocks(Item item, CreativeTabs creativetabs, List list) { - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { list.add(new ItemStack(item, 1, 0)); list.add(new ItemStack(item, 1, 1)); @@ -264,7 +264,7 @@ public class BlockBasic extends Block list.add(new ItemStack(item, 1, 14)); list.add(new ItemStack(item, 1, 15)); } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { list.add(new ItemStack(item, 1, 0)); } @@ -275,7 +275,7 @@ public class BlockBasic extends Block { int meta = world.getBlockMetadata(x, y, z); - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { if(meta == 9 || meta == 10 || meta == 11) { @@ -299,7 +299,7 @@ public class BlockBasic extends Block } } } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { } @@ -312,7 +312,7 @@ public class BlockBasic extends Block { int meta = world.getBlockMetadata(x, y, z); - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { if(!world.isRemote && meta == 6) { @@ -341,7 +341,7 @@ public class BlockBasic extends Block { int metadata = world.getBlockMetadata(x, y, z); - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { if(metadata != 6) { @@ -439,7 +439,7 @@ public class BlockBasic extends Block @Override public boolean isSideSolid(IBlockAccess world, int x, int y, int z, ForgeDirection side) { - return !(this == Mekanism.BasicBlock && world.getBlockMetadata(x, y, z) == 10); + return !(this == MekanismBlocks.BasicBlock && world.getBlockMetadata(x, y, z) == 10); } private boolean manageInventory(EntityPlayer player, TileEntityDynamicTank tileEntity) @@ -596,7 +596,7 @@ public class BlockBasic extends Block } } - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { switch(metadata) { @@ -615,11 +615,11 @@ public class BlockBasic extends Block @Override public boolean hasTileEntity(int metadata) { - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { return metadata == 6 || metadata == 9 || metadata == 10 || metadata == 11 || metadata == 12 || metadata == 14 || metadata == 15; } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { return metadata == 0; } @@ -630,7 +630,7 @@ public class BlockBasic extends Block @Override public TileEntity createTileEntity(World world, int metadata) { - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { switch(metadata) { @@ -648,7 +648,7 @@ public class BlockBasic extends Block return new TileEntitySalinationValve(); } } - else if(this == Mekanism.BasicBlock2) + else if(this == MekanismBlocks.BasicBlock2) { switch(metadata) { @@ -722,7 +722,7 @@ public class BlockBasic extends Block { ItemStack ret = new ItemStack(this, 1, world.getBlockMetadata(x, y, z)); - if(this == Mekanism.BasicBlock) + if(this == MekanismBlocks.BasicBlock) { if(ret.getItemDamage() == 6) { @@ -792,7 +792,7 @@ public class BlockBasic extends Block @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess world, int x, int y, int z, int side) { - if(this == Mekanism.BasicBlock && world.getBlockMetadata(x, y, z) == 10) + if(this == MekanismBlocks.BasicBlock && world.getBlockMetadata(x, y, z) == 10) { return glassRenderer.shouldRenderSide(world, x, y, z, side); } diff --git a/src/main/java/mekanism/common/block/BlockCardboardBox.java b/src/main/java/mekanism/common/block/BlockCardboardBox.java index d42695edb..efdadc60a 100644 --- a/src/main/java/mekanism/common/block/BlockCardboardBox.java +++ b/src/main/java/mekanism/common/block/BlockCardboardBox.java @@ -3,6 +3,7 @@ package mekanism.common.block; import java.util.Random; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.item.ItemBlockCardboardBox; import mekanism.common.tile.TileEntityCardboardBox; import net.minecraft.block.Block; @@ -69,7 +70,7 @@ public class BlockCardboardBox extends BlockContainer { if(!world.isRemote && entityplayer.isSneaking()) { - ItemStack itemStack = new ItemStack(Mekanism.CardboardBox); + ItemStack itemStack = new ItemStack(MekanismBlocks.CardboardBox); TileEntityCardboardBox tileEntity = (TileEntityCardboardBox)world.getTileEntity(x, y, z); if(tileEntity.storedData != null) @@ -151,7 +152,7 @@ public class BlockCardboardBox extends BlockContainer { TileEntityCardboardBox tileEntity = (TileEntityCardboardBox)world.getTileEntity(x, y, z); - ItemStack itemStack = new ItemStack(Mekanism.CardboardBox, 1, world.getBlockMetadata(x, y, z)); + ItemStack itemStack = new ItemStack(MekanismBlocks.CardboardBox, 1, world.getBlockMetadata(x, y, z)); if(itemStack.getItemDamage() == 1) { diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 68d2ef24f..d3a894a8c 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -8,6 +8,7 @@ import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.tile.TileEntityBasicBlock; @@ -257,7 +258,7 @@ public class BlockEnergyCube extends BlockContainer public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { TileEntityEnergyCube tileEntity = (TileEntityEnergyCube)world.getTileEntity(x, y, z); - ItemStack itemStack = new ItemStack(Mekanism.EnergyCube); + ItemStack itemStack = new ItemStack(MekanismBlocks.EnergyCube); IEnergyCube energyCube = (IEnergyCube)itemStack.getItem(); energyCube.setEnergyCubeTier(itemStack, tileEntity.tier); diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 56f9d8c74..944823e82 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -6,6 +6,7 @@ import mekanism.api.gas.IGasItem; import mekanism.common.ISustainedInventory; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import net.minecraft.block.Block; @@ -225,7 +226,7 @@ public class BlockGasTank extends BlockContainer public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { TileEntityGasTank tileEntity = (TileEntityGasTank)world.getTileEntity(x, y, z); - ItemStack itemStack = new ItemStack(Mekanism.GasTank); + ItemStack itemStack = new ItemStack(MekanismBlocks.GasTank); IGasItem storageTank = (IGasItem)itemStack.getItem(); storageTank.setGas(itemStack, tileEntity.gasTank.getGas()); diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index e6b50d88b..b7c00e5af 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Random; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.usage; import mekanism.api.energy.IEnergizedItem; import mekanism.client.ClientProxy; import mekanism.common.IActiveState; @@ -20,6 +22,7 @@ import mekanism.common.ISustainedTank; import mekanism.common.IUpgradeTile; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.network.PacketElectricChest.ElectricChestMessage; import mekanism.common.network.PacketElectricChest.ElectricChestPacketType; import mekanism.common.network.PacketLogisticalSorterGui.LogisticalSorterGuiMessage; @@ -145,7 +148,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - if(this == Mekanism.MachineBlock) + if(this == MekanismBlocks.MachineBlock) { icons[0][0] = register.registerIcon("mekanism:EnrichmentChamberFrontOff"); icons[0][1] = register.registerIcon("mekanism:EnrichmentChamberFrontOn"); @@ -176,7 +179,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer icons[10][2] = register.registerIcon("mekanism:SteelCasing"); icons[11][0] = register.registerIcon("mekanism:Teleporter"); } - else if(this == Mekanism.MachineBlock2) + else if(this == MekanismBlocks.MachineBlock2) { icons[3][0] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOff"); icons[3][1] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOn"); @@ -270,7 +273,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer { TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); - if(MekanismUtils.isActive(world, x, y, z) && ((IActiveState)tileEntity).renderUpdate() && Mekanism.machineEffects) + if(MekanismUtils.isActive(world, x, y, z) && ((IActiveState)tileEntity).renderUpdate() && general.machineEffects) { float xRandom = (float)x + 0.5F; float yRandom = (float)y + 0.0F + random.nextFloat() * 6.0F / 16.0F; @@ -313,7 +316,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer { TileEntity tileEntity = world.getTileEntity(x, y, z); - if(Mekanism.machineEffects && tileEntity instanceof IActiveState) + if(general.machineEffects && tileEntity instanceof IActiveState) { if(((IActiveState)tileEntity).getActive() && ((IActiveState)tileEntity).lightUpdate()) { @@ -328,7 +331,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(this == Mekanism.MachineBlock) + if(this == MekanismBlocks.MachineBlock) { if(meta == 0) { @@ -437,7 +440,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return icons[11][0]; } } - else if(this == Mekanism.MachineBlock2) + else if(this == MekanismBlocks.MachineBlock2) { if(meta == 3 || meta == 5) { @@ -471,7 +474,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer int metadata = world.getBlockMetadata(x, y, z); TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z); - if(this == Mekanism.MachineBlock) + if(this == MekanismBlocks.MachineBlock) { if(metadata == 0) { @@ -580,7 +583,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return icons[11][0]; } } - else if(this == Mekanism.MachineBlock2) + else if(this == MekanismBlocks.MachineBlock2) { if(metadata == 3 || metadata == 5) { @@ -1152,37 +1155,37 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer public static enum MachineType { - ENRICHMENT_CHAMBER(Mekanism.MachineBlock, 0, "EnrichmentChamber", 3, Mekanism.enrichmentChamberUsage*400, TileEntityEnrichmentChamber.class, true, false, true), - OSMIUM_COMPRESSOR(Mekanism.MachineBlock, 1, "OsmiumCompressor", 4, Mekanism.osmiumCompressorUsage*400, TileEntityOsmiumCompressor.class, true, false, true), - COMBINER(Mekanism.MachineBlock, 2, "Combiner", 5, Mekanism.combinerUsage*400, TileEntityCombiner.class, true, false, true), - CRUSHER(Mekanism.MachineBlock, 3, "Crusher", 6, Mekanism.crusherUsage*400, TileEntityCrusher.class, true, false, true), - DIGITAL_MINER(Mekanism.MachineBlock, 4, "DigitalMiner", 2, 100000, TileEntityDigitalMiner.class, true, true, true), - BASIC_FACTORY(Mekanism.MachineBlock, 5, "BasicFactory", 11, Mekanism.factoryUsage*3*400, TileEntityFactory.class, true, false, true), - ADVANCED_FACTORY(Mekanism.MachineBlock, 6, "AdvancedFactory", 11, Mekanism.factoryUsage*5*400, TileEntityAdvancedFactory.class, true, false, true), - ELITE_FACTORY(Mekanism.MachineBlock, 7, "EliteFactory", 11, Mekanism.factoryUsage*7*400, TileEntityEliteFactory.class, true, false, true), - METALLURGIC_INFUSER(Mekanism.MachineBlock, 8, "MetallurgicInfuser", 12, Mekanism.metallurgicInfuserUsage*400, TileEntityMetallurgicInfuser.class, true, true, true), - PURIFICATION_CHAMBER(Mekanism.MachineBlock, 9, "PurificationChamber", 15, Mekanism.purificationChamberUsage*400, TileEntityPurificationChamber.class, true, false, true), - ENERGIZED_SMELTER(Mekanism.MachineBlock, 10, "EnergizedSmelter", 16, Mekanism.energizedSmelterUsage*400, TileEntityEnergizedSmelter.class, true, false, true), - TELEPORTER(Mekanism.MachineBlock, 11, "Teleporter", 13, 5000000, TileEntityTeleporter.class, true, false, false), - ELECTRIC_PUMP(Mekanism.MachineBlock, 12, "ElectricPump", 17, 10000, TileEntityElectricPump.class, true, true, false), - ELECTRIC_CHEST(Mekanism.MachineBlock, 13, "ElectricChest", -1, 12000, TileEntityElectricChest.class, true, true, false), - CHARGEPAD(Mekanism.MachineBlock, 14, "Chargepad", -1, 10000, TileEntityChargepad.class, true, true, false), - LOGISTICAL_SORTER(Mekanism.MachineBlock, 15, "LogisticalSorter", -1, 0, TileEntityLogisticalSorter.class, false, true, false), - ROTARY_CONDENSENTRATOR(Mekanism.MachineBlock2, 0, "RotaryCondensentrator", 7, 20000, TileEntityRotaryCondensentrator.class, true, true, false), - CHEMICAL_OXIDIZER(Mekanism.MachineBlock2, 1, "ChemicalOxidizer", 29, 20000, TileEntityChemicalOxidizer.class, true, true, true), - CHEMICAL_INFUSER(Mekanism.MachineBlock2, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, true, true, false), - CHEMICAL_INJECTION_CHAMBER(Mekanism.MachineBlock2, 3, "ChemicalInjectionChamber", 31, Mekanism.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, true, false, true), - ELECTROLYTIC_SEPARATOR(Mekanism.MachineBlock2, 4, "ElectrolyticSeparator", 32, 400000, TileEntityElectrolyticSeparator.class, true, true, false), - PRECISION_SAWMILL(Mekanism.MachineBlock2, 5, "PrecisionSawmill", 34, Mekanism.precisionSawmillUsage*400, TileEntityPrecisionSawmill.class, true, false, true), - CHEMICAL_DISSOLUTION_CHAMBER(Mekanism.MachineBlock2, 6, "ChemicalDissolutionChamber", 35, 20000, TileEntityChemicalDissolutionChamber.class, true, true, true), - CHEMICAL_WASHER(Mekanism.MachineBlock2, 7, "ChemicalWasher", 36, 20000, TileEntityChemicalWasher.class, true, true, false), - CHEMICAL_CRYSTALLIZER(Mekanism.MachineBlock2, 8, "ChemicalCrystallizer", 37, 20000, TileEntityChemicalCrystallizer.class, true, true, true), - SEISMIC_VIBRATOR(Mekanism.MachineBlock2, 9, "SeismicVibrator", 39, 20000, TileEntitySeismicVibrator.class, true, true, false), - PRESSURIZED_REACTION_CHAMBER(Mekanism.MachineBlock2, 10, "PressurizedReactionChamber", 40, 20000, TileEntityPRC.class, true, true, false), - PORTABLE_TANK(Mekanism.MachineBlock2, 11, "PortableTank", 41, 0, TileEntityPortableTank.class, false, true, false), - FLUIDIC_PLENISHER(Mekanism.MachineBlock2, 12, "FluidicPlenisher", 42, 10000, TileEntityFluidicPlenisher.class, true, true, false), - LASER(Mekanism.MachineBlock2, 13, "Laser", -1, 100000, TileEntityLaser.class, true, true, false), - LASER_AMPLIFIER(Mekanism.MachineBlock2, 14, "LaserAmplifier", 44, 0, TileEntityLaserAmplifier.class, false, true, false); + ENRICHMENT_CHAMBER(MekanismBlocks.MachineBlock, 0, "EnrichmentChamber", 3, usage.enrichmentChamberUsage*400, TileEntityEnrichmentChamber.class, true, false, true), + OSMIUM_COMPRESSOR(MekanismBlocks.MachineBlock, 1, "OsmiumCompressor", 4, usage.osmiumCompressorUsage*400, TileEntityOsmiumCompressor.class, true, false, true), + COMBINER(MekanismBlocks.MachineBlock, 2, "Combiner", 5, usage.combinerUsage*400, TileEntityCombiner.class, true, false, true), + CRUSHER(MekanismBlocks.MachineBlock, 3, "Crusher", 6, usage.crusherUsage*400, TileEntityCrusher.class, true, false, true), + DIGITAL_MINER(MekanismBlocks.MachineBlock, 4, "DigitalMiner", 2, 100000, TileEntityDigitalMiner.class, true, true, true), + BASIC_FACTORY(MekanismBlocks.MachineBlock, 5, "BasicFactory", 11, usage.factoryUsage*3*400, TileEntityFactory.class, true, false, true), + ADVANCED_FACTORY(MekanismBlocks.MachineBlock, 6, "AdvancedFactory", 11, usage.factoryUsage*5*400, TileEntityAdvancedFactory.class, true, false, true), + ELITE_FACTORY(MekanismBlocks.MachineBlock, 7, "EliteFactory", 11, usage.factoryUsage*7*400, TileEntityEliteFactory.class, true, false, true), + METALLURGIC_INFUSER(MekanismBlocks.MachineBlock, 8, "MetallurgicInfuser", 12, usage.metallurgicInfuserUsage*400, TileEntityMetallurgicInfuser.class, true, true, true), + PURIFICATION_CHAMBER(MekanismBlocks.MachineBlock, 9, "PurificationChamber", 15, usage.purificationChamberUsage*400, TileEntityPurificationChamber.class, true, false, true), + ENERGIZED_SMELTER(MekanismBlocks.MachineBlock, 10, "EnergizedSmelter", 16, usage.energizedSmelterUsage*400, TileEntityEnergizedSmelter.class, true, false, true), + TELEPORTER(MekanismBlocks.MachineBlock, 11, "Teleporter", 13, 5000000, TileEntityTeleporter.class, true, false, false), + ELECTRIC_PUMP(MekanismBlocks.MachineBlock, 12, "ElectricPump", 17, 10000, TileEntityElectricPump.class, true, true, false), + ELECTRIC_CHEST(MekanismBlocks.MachineBlock, 13, "ElectricChest", -1, 12000, TileEntityElectricChest.class, true, true, false), + CHARGEPAD(MekanismBlocks.MachineBlock, 14, "Chargepad", -1, 10000, TileEntityChargepad.class, true, true, false), + LOGISTICAL_SORTER(MekanismBlocks.MachineBlock, 15, "LogisticalSorter", -1, 0, TileEntityLogisticalSorter.class, false, true, false), + ROTARY_CONDENSENTRATOR(MekanismBlocks.MachineBlock2, 0, "RotaryCondensentrator", 7, 20000, TileEntityRotaryCondensentrator.class, true, true, false), + CHEMICAL_OXIDIZER(MekanismBlocks.MachineBlock2, 1, "ChemicalOxidizer", 29, 20000, TileEntityChemicalOxidizer.class, true, true, true), + CHEMICAL_INFUSER(MekanismBlocks.MachineBlock2, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, true, true, false), + CHEMICAL_INJECTION_CHAMBER(MekanismBlocks.MachineBlock2, 3, "ChemicalInjectionChamber", 31, usage.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, true, false, true), + ELECTROLYTIC_SEPARATOR(MekanismBlocks.MachineBlock2, 4, "ElectrolyticSeparator", 32, 400000, TileEntityElectrolyticSeparator.class, true, true, false), + PRECISION_SAWMILL(MekanismBlocks.MachineBlock2, 5, "PrecisionSawmill", 34, usage.precisionSawmillUsage*400, TileEntityPrecisionSawmill.class, true, false, true), + CHEMICAL_DISSOLUTION_CHAMBER(MekanismBlocks.MachineBlock2, 6, "ChemicalDissolutionChamber", 35, 20000, TileEntityChemicalDissolutionChamber.class, true, true, true), + CHEMICAL_WASHER(MekanismBlocks.MachineBlock2, 7, "ChemicalWasher", 36, 20000, TileEntityChemicalWasher.class, true, true, false), + CHEMICAL_CRYSTALLIZER(MekanismBlocks.MachineBlock2, 8, "ChemicalCrystallizer", 37, 20000, TileEntityChemicalCrystallizer.class, true, true, true), + SEISMIC_VIBRATOR(MekanismBlocks.MachineBlock2, 9, "SeismicVibrator", 39, 20000, TileEntitySeismicVibrator.class, true, true, false), + PRESSURIZED_REACTION_CHAMBER(MekanismBlocks.MachineBlock2, 10, "PressurizedReactionChamber", 40, 20000, TileEntityPRC.class, true, true, false), + PORTABLE_TANK(MekanismBlocks.MachineBlock2, 11, "PortableTank", 41, 0, TileEntityPortableTank.class, false, true, false), + FLUIDIC_PLENISHER(MekanismBlocks.MachineBlock2, 12, "FluidicPlenisher", 42, 10000, TileEntityFluidicPlenisher.class, true, true, false), + LASER(MekanismBlocks.MachineBlock2, 13, "Laser", -1, 100000, TileEntityLaser.class, true, true, false), + LASER_AMPLIFIER(MekanismBlocks.MachineBlock2, 14, "LaserAmplifier", 44, 0, TileEntityLaserAmplifier.class, false, true, false); public Block typeBlock; public int meta; diff --git a/src/main/java/mekanism/common/block/BlockPlastic.java b/src/main/java/mekanism/common/block/BlockPlastic.java index 43893b7bf..a33f253ed 100644 --- a/src/main/java/mekanism/common/block/BlockPlastic.java +++ b/src/main/java/mekanism/common/block/BlockPlastic.java @@ -4,6 +4,8 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -25,7 +27,7 @@ public class BlockPlastic extends Block setHardness(5F); setResistance(10F); setCreativeTab(Mekanism.tabMekanism); - if(this == Mekanism.BlockSlickHDPE) + if(this == MekanismBlocks.BlockSlickHDPE) { slipperiness = 0.98F; } @@ -35,23 +37,23 @@ public class BlockPlastic extends Block @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - if(this == Mekanism.BlockHDPE) + if(this == MekanismBlocks.BlockHDPE) { blockIcon = register.registerIcon("mekanism:PlasticBlock"); } - else if(this == Mekanism.BlockSlickHDPE) + else if(this == MekanismBlocks.BlockSlickHDPE) { blockIcon = register.registerIcon("mekanism:SlickPlasticBlock"); } - else if(this == Mekanism.BlockGlowHDPE) + else if(this == MekanismBlocks.BlockGlowHDPE) { blockIcon = register.registerIcon("mekanism:GlowPlasticBlock"); } - else if(this == Mekanism.BlockReinforcedHDPE) + else if(this == MekanismBlocks.BlockReinforcedHDPE) { blockIcon = register.registerIcon("mekanism:ReinforcedPlasticBlock"); } - else if(this == Mekanism.BlockRoadHDPE) + else if(this == MekanismBlocks.BlockRoadHDPE) { blockIcon = register.registerIcon("mekanism:RoadPlasticBlock"); } @@ -60,7 +62,7 @@ public class BlockPlastic extends Block @Override public void onEntityWalking(World world, int x, int y, int z, Entity e) { - if(this == Mekanism.BlockRoadHDPE) + if(this == MekanismBlocks.BlockRoadHDPE) { double boost = 1.6; @@ -103,7 +105,7 @@ public class BlockPlastic extends Block @Override public int getLightValue(IBlockAccess world, int x, int y, int z) { - if(this == Mekanism.BlockGlowHDPE) + if(this == MekanismBlocks.BlockGlowHDPE) { return 10; } diff --git a/src/main/java/mekanism/common/block/BlockSalt.java b/src/main/java/mekanism/common/block/BlockSalt.java index 6d00a9ef6..6a7de0ba7 100644 --- a/src/main/java/mekanism/common/block/BlockSalt.java +++ b/src/main/java/mekanism/common/block/BlockSalt.java @@ -3,6 +3,8 @@ package mekanism.common.block; import java.util.Random; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,7 +32,7 @@ public class BlockSalt extends Block @Override public Item getItemDropped(int i, Random random, int j) { - return Mekanism.Salt; + return MekanismItems.Salt; } @Override diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java index 0f36ffd3b..281fdab89 100644 --- a/src/main/java/mekanism/common/entity/EntityFlame.java +++ b/src/main/java/mekanism/common/entity/EntityFlame.java @@ -7,7 +7,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.Pos3D; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; @@ -18,7 +18,6 @@ import net.minecraft.item.crafting.FurnaceRecipes; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; -import net.minecraft.util.EntityDamageSourceIndirect; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; diff --git a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java index 84c71aff4..dbdb6beb6 100644 --- a/src/main/java/mekanism/common/entity/EntityObsidianTNT.java +++ b/src/main/java/mekanism/common/entity/EntityObsidianTNT.java @@ -1,6 +1,7 @@ package mekanism.common.entity; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.general; + import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; @@ -34,7 +35,7 @@ public class EntityObsidianTNT extends Entity motionY = 0.2; motionZ = -(Math.cos(randPi))*0.02F; - fuse = Mekanism.obsidianTNTDelay; + fuse = general.obsidianTNTDelay; prevPosX = x; prevPosY = y; @@ -108,7 +109,7 @@ public class EntityObsidianTNT extends Entity private void explode() { - worldObj.createExplosion(null, posX, posY, posZ, Mekanism.obsidianTNTBlastRadius, true); + worldObj.createExplosion(null, posX, posY, posZ, general.obsidianTNTBlastRadius, true); hasExploded = true; } diff --git a/src/main/java/mekanism/common/entity/EntityRobit.java b/src/main/java/mekanism/common/entity/EntityRobit.java index db8abee5a..466a6b2ac 100644 --- a/src/main/java/mekanism/common/entity/EntityRobit.java +++ b/src/main/java/mekanism/common/entity/EntityRobit.java @@ -8,17 +8,20 @@ import java.math.RoundingMode; import java.util.List; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.sound.SoundHandler; import mekanism.common.ISustainedInventory; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.RobitAIFollow; import mekanism.common.RobitAIPickup; import mekanism.common.item.ItemConfigurator; import mekanism.common.item.ItemRobit; import mekanism.common.tile.TileEntityChargepad; import mekanism.common.util.MekanismUtils; + import micdoodle8.mods.galacticraft.api.entity.IEntityBreathable; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.SharedMonsterAttributes; @@ -42,6 +45,7 @@ import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.util.Constants; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; + import cofh.api.energy.IEnergyContainerItem; @Interface(iface = "micdoodle8.mods.galacticraft.api.entity.IEntityBreathable", modid = "Galacticrat API") @@ -180,7 +184,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine if(item.canProvideEnergy(inventory[27])) { - double gain = ElectricItem.manager.discharge(inventory[27], (MAX_ELECTRICITY - getEnergy())*Mekanism.TO_IC2, 4, true, true, false)*Mekanism.FROM_IC2; + double gain = ElectricItem.manager.discharge(inventory[27], (MAX_ELECTRICITY - getEnergy())* general.TO_IC2, 4, true, true, false)* general.FROM_IC2; setEnergy(getEnergy() + gain); } } @@ -190,13 +194,13 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine IEnergyContainerItem item = (IEnergyContainerItem)inventory[27].getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, ((MAX_ELECTRICITY - getEnergy())*Mekanism.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, ((MAX_ELECTRICITY - getEnergy())* general.TO_TE))); - setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)*Mekanism.FROM_TE)); + setEnergy(getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } - else if(inventory[27].getItem() == Items.redstone && getEnergy()+Mekanism.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) + else if(inventory[27].getItem() == Items.redstone && getEnergy()+ general.ENERGY_PER_REDSTONE <= MAX_ELECTRICITY) { - setEnergy(getEnergy() + Mekanism.ENERGY_PER_REDSTONE); + setEnergy(getEnergy() + general.ENERGY_PER_REDSTONE); inventory[27].stackSize--; if(inventory[27].stackSize <= 0) @@ -398,7 +402,7 @@ public class EntityRobit extends EntityCreature implements IInventory, ISustaine public void drop() { - EntityItem entityItem = new EntityItem(worldObj, posX, posY+0.3, posZ, new ItemStack(Mekanism.Robit)); + EntityItem entityItem = new EntityItem(worldObj, posX, posY+0.3, posZ, new ItemStack(MekanismItems.Robit)); ItemRobit item = (ItemRobit)entityItem.getEntityItem().getItem(); item.setEnergy(entityItem.getEntityItem(), getEnergy()); diff --git a/src/main/java/mekanism/common/integration/IC2ItemManager.java b/src/main/java/mekanism/common/integration/IC2ItemManager.java index 93fb6bbb2..7e4ae13f8 100644 --- a/src/main/java/mekanism/common/integration/IC2ItemManager.java +++ b/src/main/java/mekanism/common/integration/IC2ItemManager.java @@ -1,8 +1,10 @@ package mekanism.common.integration; import ic2.api.item.IElectricItemManager; + +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; -import mekanism.common.Mekanism; + import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; @@ -24,14 +26,14 @@ public class IC2ItemManager implements IElectricItemManager if(energizedItem.canReceive(itemStack)) { double energyNeeded = energizedItem.getMaxEnergy(itemStack)-energizedItem.getEnergy(itemStack); - double energyToStore = Math.min(Math.min(amount*Mekanism.FROM_IC2, energizedItem.getMaxEnergy(itemStack)*0.01), energyNeeded); + double energyToStore = Math.min(Math.min(amount* general.FROM_IC2, energizedItem.getMaxEnergy(itemStack)*0.01), energyNeeded); if(!simulate) { energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) + energyToStore); } - return (int)Math.round(energyToStore*Mekanism.TO_IC2); + return (int)Math.round(energyToStore* general.TO_IC2); } return 0; @@ -42,7 +44,7 @@ public class IC2ItemManager implements IElectricItemManager { if(energizedItem.canSend(itemStack)) { - double energyWanted = amount*Mekanism.FROM_IC2; + double energyWanted = amount* general.FROM_IC2; double energyToGive = Math.min(Math.min(energyWanted, energizedItem.getMaxEnergy(itemStack)*0.01), energizedItem.getEnergy(itemStack)); if(!simulate) @@ -50,7 +52,7 @@ public class IC2ItemManager implements IElectricItemManager energizedItem.setEnergy(itemStack, energizedItem.getEnergy(itemStack) - energyToGive); } - return (int)Math.round(energyToGive*Mekanism.TO_IC2); + return (int)Math.round(energyToGive* general.TO_IC2); } return 0; @@ -59,13 +61,13 @@ public class IC2ItemManager implements IElectricItemManager @Override public boolean canUse(ItemStack itemStack, double amount) { - return energizedItem.getEnergy(itemStack) >= amount*Mekanism.FROM_IC2; + return energizedItem.getEnergy(itemStack) >= amount* general.FROM_IC2; } @Override public double getCharge(ItemStack itemStack) { - return (int)Math.round(energizedItem.getEnergy(itemStack)*Mekanism.TO_IC2); + return (int)Math.round(energizedItem.getEnergy(itemStack)* general.TO_IC2); } @Override diff --git a/src/main/java/mekanism/common/integration/MekanismHooks.java b/src/main/java/mekanism/common/integration/MekanismHooks.java index c42a8fcdd..ed0a1f55a 100644 --- a/src/main/java/mekanism/common/integration/MekanismHooks.java +++ b/src/main/java/mekanism/common/integration/MekanismHooks.java @@ -4,6 +4,8 @@ import java.util.List; import java.util.Map; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; import mekanism.common.block.BlockMachine; import mekanism.common.recipe.RecipeHandler; import mekanism.common.util.MekanismUtils; @@ -108,39 +110,39 @@ public final class MekanismHooks } try { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(Mekanism.Dust, 2, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("oreOsmium"), null, new ItemStack(MekanismItems.Dust, 2, 2)); } catch(Exception e) {} try { - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(Mekanism.Dust, 1, 2)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(Mekanism.Dust, 1, 3)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotOsmium"), null, new ItemStack(MekanismItems.Dust, 1, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedObsidian"), null, new ItemStack(MekanismItems.Dust, 1, 3)); Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotRefinedGlowstone"), null, new ItemStack(Items.glowstone_dust)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(Mekanism.Dust, 1, 5)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("ingotSteel"), null, new ItemStack(MekanismItems.Dust, 1, 5)); } catch(Exception e) {} try { - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpIron"), null, new ItemStack(Mekanism.DirtyDust, 1, 0)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpGold"), null, new ItemStack(Mekanism.DirtyDust, 1, 1)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpOsmium"), null, new ItemStack(Mekanism.DirtyDust, 1, 2)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpCopper"), null, new ItemStack(Mekanism.DirtyDust, 1, 3)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpTin"), null, new ItemStack(Mekanism.DirtyDust, 1, 4)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpSilver"), null, new ItemStack(Mekanism.DirtyDust, 1, 5)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpObsidian"), null, new ItemStack(Mekanism.DirtyDust, 1, 6)); - Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpLead"), null, new ItemStack(Mekanism.DirtyDust, 1, 7)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpIron"), null, new ItemStack(MekanismItems.DirtyDust, 1, 0)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpGold"), null, new ItemStack(MekanismItems.DirtyDust, 1, 1)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpOsmium"), null, new ItemStack(MekanismItems.DirtyDust, 1, 2)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpCopper"), null, new ItemStack(MekanismItems.DirtyDust, 1, 3)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpTin"), null, new ItemStack(MekanismItems.DirtyDust, 1, 4)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpSilver"), null, new ItemStack(MekanismItems.DirtyDust, 1, 5)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpObsidian"), null, new ItemStack(MekanismItems.DirtyDust, 1, 6)); + Recipes.macerator.addRecipe(new RecipeInputOreDict("clumpLead"), null, new ItemStack(MekanismItems.DirtyDust, 1, 7)); } catch(Exception e) {} NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("amplification", 50000); - Recipes.matterAmplifier.addRecipe(new RecipeInputItemStack(new ItemStack(Mekanism.EnrichedAlloy), 1), tag); + Recipes.matterAmplifier.addRecipe(new RecipeInputItemStack(new ItemStack(MekanismItems.EnrichedAlloy), 1), tag); } @Method(modid = "ComputerCraft") public void loadCCPeripheralProviders() { try { - ComputerCraftAPI.registerPeripheralProvider((BlockMachine)Mekanism.MachineBlock); + ComputerCraftAPI.registerPeripheralProvider((BlockMachine) MekanismBlocks.MachineBlock); } catch(Exception ex) {} } diff --git a/src/main/java/mekanism/common/integration/OreDictManager.java b/src/main/java/mekanism/common/integration/OreDictManager.java index f5a39c7ff..5ac54b1a6 100644 --- a/src/main/java/mekanism/common/integration/OreDictManager.java +++ b/src/main/java/mekanism/common/integration/OreDictManager.java @@ -5,18 +5,20 @@ import ic2.api.recipe.Recipes; import java.util.ArrayList; -import mekanism.api.AdvancedInput; -import mekanism.api.ChanceOutput; +import mekanism.api.recipe.AdvancedInput; +import mekanism.api.recipe.ChanceOutput; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfusionInput; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; import mekanism.common.recipe.RecipeHandler; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -42,17 +44,17 @@ public final class OreDictManager if(!Recipe.PRECISION_SAWMILL.containsRecipe(wildStack)) { - RecipeHandler.addPrecisionSawmillRecipe(wildStack, new ChanceOutput(new ItemStack(Items.stick, 6), new ItemStack(Mekanism.Sawdust), 0.25)); + RecipeHandler.addPrecisionSawmillRecipe(wildStack, new ChanceOutput(new ItemStack(Items.stick, 6), new ItemStack(MekanismItems.Sawdust), 0.25)); } } else { - RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ChanceOutput(new ItemStack(Items.stick, 6), new ItemStack(Mekanism.Sawdust), 0.25)); + RecipeHandler.addPrecisionSawmillRecipe(StackUtils.size(ore, 1), new ChanceOutput(new ItemStack(Items.stick, 6), new ItemStack(MekanismItems.Sawdust), 0.25)); } } for(ItemStack ore : OreDictionary.getOres("oreNetherSteel")) { - RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 4, 5)); + RecipeHandler.addEnrichmentChamberRecipe(StackUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 4, 5)); } if(OreDictionary.getOres("itemRubber").size() > 0) @@ -75,221 +77,221 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustRefinedObsidian")) { - RecipeHandler.addOsmiumCompressorRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Ingot, 1, 0)); - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 6)); - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.CompressedObsidian)); + RecipeHandler.addOsmiumCompressorRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Ingot, 1, 0)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 6)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.CompressedObsidian)); InfuseRegistry.registerInfuseObject(MekanismUtils.size(ore, 1), new InfuseObject(InfuseRegistry.get("OBSIDIAN"), 10)); } for(ItemStack ore : OreDictionary.getOres("clumpIron")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 0)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 0)); } for(ItemStack ore : OreDictionary.getOres("clumpGold")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 1)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 1)); } for(ItemStack ore : OreDictionary.getOres("clumpOsmium")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 2)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 2)); } for(ItemStack ore : OreDictionary.getOres("clumpCopper")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 3)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 3)); } for(ItemStack ore : OreDictionary.getOres("clumpTin")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 4)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 4)); } for(ItemStack ore : OreDictionary.getOres("clumpSilver")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 5)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 5)); } for(ItemStack ore : OreDictionary.getOres("clumpObsidian")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 6)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 6)); } for(ItemStack ore : OreDictionary.getOres("clumpLead")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.DirtyDust, 1, 7)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.DirtyDust, 1, 7)); } for(ItemStack ore : OreDictionary.getOres("shardIron")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 0)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 0)); } for(ItemStack ore : OreDictionary.getOres("shardGold")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 1)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 1)); } for(ItemStack ore : OreDictionary.getOres("shardOsmium")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 2)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 2)); } for(ItemStack ore : OreDictionary.getOres("shardCopper")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 3)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 3)); } for(ItemStack ore : OreDictionary.getOres("shardTin")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 4)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 4)); } for(ItemStack ore : OreDictionary.getOres("shardSilver")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 5)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 5)); } for(ItemStack ore : OreDictionary.getOres("shardObsidian")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 6)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 6)); } for(ItemStack ore : OreDictionary.getOres("shardLead")) { - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 1, 7)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 1, 7)); } for(ItemStack ore : OreDictionary.getOres("crystalIron")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 0)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 0)); } for(ItemStack ore : OreDictionary.getOres("crystalGold")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 1)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 1)); } for(ItemStack ore : OreDictionary.getOres("crystalOsmium")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 2)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 2)); } for(ItemStack ore : OreDictionary.getOres("crystalCopper")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 3)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 3)); } for(ItemStack ore : OreDictionary.getOres("crystalTin")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 4)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 4)); } for(ItemStack ore : OreDictionary.getOres("crystalSilver")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 5)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 5)); } for(ItemStack ore : OreDictionary.getOres("crystalObsidian")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 6)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 6)); } for(ItemStack ore : OreDictionary.getOres("crystalLead")) { - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 1, 7)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 1, 7)); } for(ItemStack ore : OreDictionary.getOres("dustDirtyIron")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 0)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 0)); } for(ItemStack ore : OreDictionary.getOres("dustDirtyGold")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 1)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 1)); } for(ItemStack ore : OreDictionary.getOres("dustDirtyOsmium")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 2)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 2)); } for(ItemStack ore : OreDictionary.getOres("dustDirtyCopper")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 6)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 6)); } for(ItemStack ore : OreDictionary.getOres("dustDirtyTin")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 7)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 7)); } for(ItemStack ore : OreDictionary.getOres("dustDirtySilver")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 8)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 8)); } for(ItemStack ore : OreDictionary.getOres("dustDirtyLead")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 9)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 9)); } for(ItemStack ore : OreDictionary.getOres("oreCopper")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 6)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 3)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 3)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 6)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 3)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 3)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("copper"), 1000)); } for(ItemStack ore : OreDictionary.getOres("oreTin")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 7)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 4)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 4)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 7)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 4)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 4)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("tin"), 1000)); } for(ItemStack ore : OreDictionary.getOres("oreOsmium")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 2)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 2)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 2)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 2)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 2)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 2)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("osmium"), 1000)); } for(ItemStack ore : OreDictionary.getOres("oreIron")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 0)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 0)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 0)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 0)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 0)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 0)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("iron"), 1000)); } for(ItemStack ore : OreDictionary.getOres("oreGold")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 1)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 1)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 1)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 1)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 1)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 1)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("gold"), 1000)); } for(ItemStack ore : OreDictionary.getOres("oreSilver")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 8)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 5)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 5)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 8)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 5)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 5)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("silver"), 1000)); } for(ItemStack ore : OreDictionary.getOres("oreLead")) { - RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 2, 9)); - RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Clump, 3, 7)); - RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(Mekanism.Shard, 4, 7)); + RecipeHandler.addEnrichmentChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 2, 9)); + RecipeHandler.addPurificationChamberRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Clump, 3, 7)); + RecipeHandler.addChemicalInjectionChamberRecipe(new AdvancedInput(MekanismUtils.size(ore, 1), GasRegistry.getGas("hydrogenChloride")), new ItemStack(MekanismItems.Shard, 4, 7)); RecipeHandler.addChemicalDissolutionChamberRecipe(MekanismUtils.size(ore, 1), new GasStack(GasRegistry.getGas("lead"), 1000)); } @@ -349,33 +351,33 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("ingotCopper")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 6)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 6)); } for(ItemStack ore : OreDictionary.getOres("ingotTin")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 7)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 7)); } for(ItemStack ore : OreDictionary.getOres("ingotLead")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 9)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 9)); } for(ItemStack ore : OreDictionary.getOres("ingotSilver")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 8)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 8)); } for(ItemStack ore : OreDictionary.getOres("ingotRefinedObsidian")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 3)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 3)); } for(ItemStack ore : OreDictionary.getOres("ingotOsmium")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 2)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, MekanismUtils.size(ore, 1)), new ItemStack(Mekanism.ControlCircuit, 1, 0)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 2)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("REDSTONE"), 10, MekanismUtils.size(ore, 1)), new ItemStack(MekanismItems.ControlCircuit, 1, 0)); } for(ItemStack ore : OreDictionary.getOres("ingotRedstone")) @@ -396,7 +398,7 @@ public final class OreDictManager } try { - RecipeHandler.addCrusherRecipe(new ItemStack(Mekanism.Ingot, 1, 2), MekanismUtils.size(OreDictionary.getOres("dustBronze").get(0), 1)); + RecipeHandler.addCrusherRecipe(new ItemStack(MekanismItems.Ingot, 1, 2), MekanismUtils.size(OreDictionary.getOres("dustBronze").get(0), 1)); if(Mekanism.hooks.IC2APILoaded) { @@ -405,11 +407,11 @@ public final class OreDictManager } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Mekanism.Dust, 1, 8), MekanismUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 8), MekanismUtils.size(OreDictionary.getOres("ingotSilver").get(0), 1), 0.0F); } catch(Exception e) {} try { - FurnaceRecipes.smelting().func_151394_a(new ItemStack(Mekanism.Dust, 1, 9), MekanismUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); + FurnaceRecipes.smelting().func_151394_a(new ItemStack(MekanismItems.Dust, 1, 9), MekanismUtils.size(OreDictionary.getOres("ingotLead").get(0), 1), 0.0F); } catch(Exception e) {} try { @@ -423,7 +425,7 @@ public final class OreDictManager try { for(ItemStack ore : OreDictionary.getOres("ingotSilver")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 8)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 8)); } } catch(Exception e) {} @@ -434,7 +436,7 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("ingotSteel")) { - RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(Mekanism.Dust, 1, 5)); + RecipeHandler.addCrusherRecipe(MekanismUtils.size(ore, 1), new ItemStack(MekanismItems.Dust, 1, 5)); } for(ItemStack ore : OreDictionary.getOres("dustGold")) @@ -450,12 +452,12 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustObsidian")) { RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 4), new ItemStack(Blocks.obsidian)); - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("DIAMOND"), 10, MekanismUtils.size(ore, 1)), new ItemStack(Mekanism.Dust, 1, 3)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("DIAMOND"), 10, MekanismUtils.size(ore, 1)), new ItemStack(MekanismItems.Dust, 1, 3)); } for(ItemStack ore : OreDictionary.getOres("dustOsmium")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(Mekanism.OreBlock, 1, 0)); + RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(MekanismBlocks.OreBlock, 1, 0)); } for(ItemStack ore : OreDictionary.getOres("dustDiamond")) @@ -466,17 +468,17 @@ public final class OreDictManager for(ItemStack ore : OreDictionary.getOres("dustCopper")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(Mekanism.OreBlock, 1, 1)); + RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(MekanismBlocks.OreBlock, 1, 1)); } for(ItemStack ore : OreDictionary.getOres("ingotCopper")) { - RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("TIN"), 10, MekanismUtils.size(ore, 1)), new ItemStack(Mekanism.Ingot, 1, 2)); + RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("TIN"), 10, MekanismUtils.size(ore, 1)), new ItemStack(MekanismItems.Ingot, 1, 2)); } for(ItemStack ore : OreDictionary.getOres("dustTin")) { - RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(Mekanism.OreBlock, 1, 2)); + RecipeHandler.addCombinerRecipe(MekanismUtils.size(ore, 8), new ItemStack(MekanismBlocks.OreBlock, 1, 2)); InfuseRegistry.registerInfuseObject(ore, new InfuseObject(InfuseRegistry.get("TIN"), 50)); } @@ -499,7 +501,7 @@ public final class OreDictManager { if(ore.getItemDamage() == 0 || ore.getItemDamage() == OreDictionary.WILDCARD_VALUE) { - RecipeHandler.addCrusherRecipe(new ItemStack(ore.getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(Mekanism.BioFuel, 2)); + RecipeHandler.addCrusherRecipe(new ItemStack(ore.getItem(), 1, OreDictionary.WILDCARD_VALUE), new ItemStack(MekanismItems.BioFuel, 2)); } } } catch(Exception e) {} @@ -549,7 +551,7 @@ public final class OreDictManager if(resultEntry != null) { - RecipeHandler.addPrecisionSawmillRecipe(log, new ChanceOutput(StackUtils.size(resultEntry, 6), new ItemStack(Mekanism.Sawdust), 1)); + RecipeHandler.addPrecisionSawmillRecipe(log, new ChanceOutput(StackUtils.size(resultEntry, 6), new ItemStack(MekanismItems.Sawdust), 1)); } } } @@ -560,7 +562,7 @@ public final class OreDictManager if(resultEntry != null) { - RecipeHandler.addPrecisionSawmillRecipe(log, new ChanceOutput(StackUtils.size(resultEntry, 6), new ItemStack(Mekanism.Sawdust), 1)); + RecipeHandler.addPrecisionSawmillRecipe(log, new ChanceOutput(StackUtils.size(resultEntry, 6), new ItemStack(MekanismItems.Sawdust), 1)); } } } diff --git a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java index a60b384a0..5125ce8b4 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java @@ -2,7 +2,7 @@ package mekanism.common.inventory.container; import java.util.Map; -import mekanism.api.AdvancedInput; +import mekanism.api.recipe.AdvancedInput; import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge; import mekanism.common.inventory.slot.SlotOutput; import mekanism.common.tile.TileEntityAdvancedElectricMachine; diff --git a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java index 56ae1be0a..64c127ddc 100644 --- a/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java +++ b/src/main/java/mekanism/common/item/ItemAtomicDisassembler.java @@ -8,7 +8,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/mekanism/common/item/ItemBlockBasic.java b/src/main/java/mekanism/common/item/ItemBlockBasic.java index 150ca507e..96b26c78c 100644 --- a/src/main/java/mekanism/common/item/ItemBlockBasic.java +++ b/src/main/java/mekanism/common/item/ItemBlockBasic.java @@ -3,7 +3,7 @@ package mekanism.common.item; import java.util.List; import mekanism.api.EnumColor; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.inventory.InventoryBin; import mekanism.common.tile.TileEntityBin; import net.minecraft.block.Block; @@ -51,7 +51,7 @@ public class ItemBlockBasic extends ItemBlock @Override public int getItemStackLimit(ItemStack stack) { - if(Block.getBlockFromItem(this) == Mekanism.BasicBlock) + if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) { if(stack.getItemDamage() == 6) { @@ -78,7 +78,7 @@ public class ItemBlockBasic extends ItemBlock @SideOnly(Side.CLIENT) public void addInformation(ItemStack itemstack, EntityPlayer entityplayer, List list, boolean flag) { - if(Block.getBlockFromItem(this) == Mekanism.BasicBlock && itemstack.getItemDamage() == 6) + if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock && itemstack.getItemDamage() == 6) { InventoryBin inv = new InventoryBin(itemstack); @@ -102,7 +102,7 @@ public class ItemBlockBasic extends ItemBlock @Override public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) { - if(Block.getBlockFromItem(this) == Mekanism.BasicBlock) + if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) { if(stack.getItemDamage() != 6) { @@ -121,7 +121,7 @@ public class ItemBlockBasic extends ItemBlock @Override public ItemStack getContainerItem(ItemStack stack) { - if(Block.getBlockFromItem(this) == Mekanism.BasicBlock) + if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) { if(stack.getItemDamage() != 6 || stack.stackTagCompound == null || !stack.stackTagCompound.hasKey("newCount")) { @@ -142,7 +142,7 @@ public class ItemBlockBasic extends ItemBlock if(place) { - if(Block.getBlockFromItem(this) == Mekanism.BasicBlock) + if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) { if(stack.getItemDamage() == 6 && stack.stackTagCompound != null) { @@ -167,7 +167,7 @@ public class ItemBlockBasic extends ItemBlock { String name = ""; - if(Block.getBlockFromItem(this) == Mekanism.BasicBlock) + if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock) { switch(itemstack.getItemDamage()) { @@ -224,7 +224,7 @@ public class ItemBlockBasic extends ItemBlock break; } } - else if(Block.getBlockFromItem(this) == Mekanism.BasicBlock2) + else if(Block.getBlockFromItem(this) == MekanismBlocks.BasicBlock2) { switch(itemstack.getItemDamage()) { diff --git a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java index 38ef801a5..208900fed 100644 --- a/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java +++ b/src/main/java/mekanism/common/item/ItemBlockCardboardBox.java @@ -4,7 +4,7 @@ import java.util.List; import mekanism.api.EnumColor; import mekanism.api.MekanismAPI; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockCardboardBox.BlockData; import mekanism.common.tile.TileEntityCardboardBox; import mekanism.common.util.LangUtils; @@ -100,7 +100,7 @@ public class ItemBlockCardboardBox extends ItemBlock stack.stackSize--; } - world.setBlock(x, y, z, Mekanism.CardboardBox, 1, 3); + world.setBlock(x, y, z, MekanismBlocks.CardboardBox, 1, 3); isMonitoring = false; diff --git a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java index c8c02cf88..2103d55f3 100644 --- a/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java +++ b/src/main/java/mekanism/common/item/ItemBlockEnergyCube.java @@ -8,6 +8,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IEnergyCube; import mekanism.common.ISustainedInventory; @@ -257,14 +258,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*Mekanism.FROM_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*Mekanism.TO_TE); + return (int)Math.round(toReceive* general.TO_TE); } return 0; @@ -276,14 +277,14 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*Mekanism.FROM_TE), energyRemaining); + double toSend = Math.min((energy* general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*Mekanism.TO_TE); + return (int)Math.round(toSend* general.TO_TE); } return 0; @@ -292,13 +293,13 @@ public class ItemBlockEnergyCube extends ItemBlock implements IEnergizedItem, IE @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)*Mekanism.TO_TE); + return (int)(getEnergy(theItem)* general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)*Mekanism.TO_TE); + return (int)(getMaxEnergy(theItem)* general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 84213b098..6b018eac7 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -10,6 +10,7 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekanismKeyHandler; @@ -373,7 +374,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(item.canProvideEnergy(inv.getStackInSlot(54))) { - double gain = ElectricItem.manager.discharge(inv.getStackInSlot(54), (int)((getMaxEnergy(itemstack) - getEnergy(itemstack))*Mekanism.TO_IC2), 3, false, true, false)*Mekanism.FROM_IC2; + double gain = ElectricItem.manager.discharge(inv.getStackInSlot(54), (int)((getMaxEnergy(itemstack) - getEnergy(itemstack))* general.TO_IC2), 3, false, true, false)* general.FROM_IC2; setEnergy(itemstack, getEnergy(itemstack) + gain); } } @@ -383,13 +384,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec IEnergyContainerItem item = (IEnergyContainerItem)inv.getStackInSlot(54).getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, ((getMaxEnergy(itemstack) - getEnergy(itemstack))*Mekanism.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, ((getMaxEnergy(itemstack) - getEnergy(itemstack))* general.TO_TE))); - setEnergy(itemstack, getEnergy(itemstack) + (item.extractEnergy(itemStack, toTransfer, false)*Mekanism.FROM_TE)); + setEnergy(itemstack, getEnergy(itemstack) + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } - else if(inv.getStackInSlot(54).getItem() == Items.redstone && getEnergy(itemstack)+Mekanism.ENERGY_PER_REDSTONE <= getMaxEnergy(itemstack)) + else if(inv.getStackInSlot(54).getItem() == Items.redstone && getEnergy(itemstack)+ general.ENERGY_PER_REDSTONE <= getMaxEnergy(itemstack)) { - setEnergy(itemstack, getEnergy(itemstack) + Mekanism.ENERGY_PER_REDSTONE); + setEnergy(itemstack, getEnergy(itemstack) + general.ENERGY_PER_REDSTONE); inv.getStackInSlot(54).stackSize--; if(inv.getStackInSlot(54).stackSize <= 0) @@ -864,14 +865,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*Mekanism.FROM_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*Mekanism.TO_TE); + return (int)Math.round(toReceive* general.TO_TE); } return 0; @@ -883,14 +884,14 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*Mekanism.FROM_TE), energyRemaining); + double toSend = Math.min((energy* general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*Mekanism.TO_TE); + return (int)Math.round(toSend* general.TO_TE); } return 0; @@ -899,13 +900,13 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)*Mekanism.TO_TE); + return (int)(getEnergy(theItem)* general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)*Mekanism.TO_TE); + return (int)(getMaxEnergy(theItem)* general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/item/ItemEnergized.java b/src/main/java/mekanism/common/item/ItemEnergized.java index 73104f1d7..1d62f4a0f 100644 --- a/src/main/java/mekanism/common/item/ItemEnergized.java +++ b/src/main/java/mekanism/common/item/ItemEnergized.java @@ -6,6 +6,7 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; @@ -163,14 +164,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*Mekanism.FROM_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*Mekanism.TO_TE); + return (int)Math.round(toReceive* general.TO_TE); } return 0; @@ -182,14 +183,14 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*Mekanism.FROM_TE), energyRemaining); + double toSend = Math.min((energy* general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*Mekanism.TO_TE); + return (int)Math.round(toSend* general.TO_TE); } return 0; @@ -198,13 +199,13 @@ public class ItemEnergized extends ItemMekanism implements IEnergizedItem, ISpec @Override public int getEnergyStored(ItemStack theItem) { - return (int)Math.round(getEnergy(theItem)*Mekanism.TO_TE); + return (int)Math.round(getEnergy(theItem)* general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)Math.round(getMaxEnergy(theItem)*Mekanism.TO_TE); + return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/item/ItemFreeRunners.java b/src/main/java/mekanism/common/item/ItemFreeRunners.java index b0f6cd567..b9836fe59 100644 --- a/src/main/java/mekanism/common/item/ItemFreeRunners.java +++ b/src/main/java/mekanism/common/item/ItemFreeRunners.java @@ -6,6 +6,7 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; @@ -202,14 +203,14 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*Mekanism.FROM_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*Mekanism.TO_TE); + return (int)Math.round(toReceive* general.TO_TE); } return 0; @@ -221,14 +222,14 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*Mekanism.FROM_TE), energyRemaining); + double toSend = Math.min((energy* general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*Mekanism.TO_TE); + return (int)Math.round(toSend* general.TO_TE); } return 0; @@ -237,13 +238,13 @@ public class ItemFreeRunners extends ItemArmor implements IEnergizedItem, ISpeci @Override public int getEnergyStored(ItemStack theItem) { - return (int)Math.round(getEnergy(theItem)*Mekanism.TO_TE); + return (int)Math.round(getEnergy(theItem)* general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)Math.round(getMaxEnergy(theItem)*Mekanism.TO_TE); + return (int)Math.round(getMaxEnergy(theItem)* general.TO_TE); } @Override diff --git a/src/main/java/mekanism/common/item/ItemJetpack.java b/src/main/java/mekanism/common/item/ItemJetpack.java index 5814587a2..a5a2f19b8 100644 --- a/src/main/java/mekanism/common/item/ItemJetpack.java +++ b/src/main/java/mekanism/common/item/ItemJetpack.java @@ -10,6 +10,7 @@ import mekanism.api.gas.IGasItem; import mekanism.client.render.ModelCustomArmor; import mekanism.client.render.ModelCustomArmor.ArmorModel; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.util.MekanismUtils; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; @@ -78,11 +79,11 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor { ModelCustomArmor model = ModelCustomArmor.INSTANCE; - if(this == Mekanism.Jetpack) + if(this == MekanismItems.Jetpack) { model.modelType = ArmorModel.JETPACK; } - else if(this == Mekanism.ArmoredJetpack) + else if(this == MekanismItems.ArmoredJetpack) { model.modelType = ArmorModel.ARMOREDJETPACK; } @@ -283,11 +284,11 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor @Override public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) { - if(this == Mekanism.Jetpack) + if(this == MekanismItems.Jetpack) { return new ArmorProperties(0, 0, 0); } - else if(this == Mekanism.ArmoredJetpack) + else if(this == MekanismItems.ArmoredJetpack) { return new ArmorProperties(1, 0.8, 115); } @@ -298,11 +299,11 @@ public class ItemJetpack extends ItemArmor implements IGasItem, ISpecialArmor @Override public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) { - if(armor.getItem() == Mekanism.Jetpack) + if(armor.getItem() == MekanismItems.Jetpack) { return 0; } - else if(armor.getItem() == Mekanism.ArmoredJetpack) + else if(armor.getItem() == MekanismItems.ArmoredJetpack) { return 12; } diff --git a/src/main/java/mekanism/common/miner/ThreadMinerSearch.java b/src/main/java/mekanism/common/miner/ThreadMinerSearch.java index 738e53cfb..b6d92cf83 100644 --- a/src/main/java/mekanism/common/miner/ThreadMinerSearch.java +++ b/src/main/java/mekanism/common/miner/ThreadMinerSearch.java @@ -4,7 +4,7 @@ import java.util.BitSet; import java.util.HashMap; import java.util.Map; -import mekanism.api.BlockInfo; +import mekanism.api.util.BlockInfo; import mekanism.api.Coord4D; import mekanism.common.tile.TileEntityBoundingBlock; import mekanism.common.tile.TileEntityDigitalMiner; diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 4a58aaf17..64200f982 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -5,7 +5,8 @@ import java.util.Collections; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.client.render.RenderGlowPanel; -import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; + import net.minecraft.client.particle.EffectRenderer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -87,7 +88,7 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco { if(!world().isRemote && !canStay()) { - TileMultipart.dropItem(new ItemStack(Mekanism.GlowPanel, 1, colour.getMetaValue()), world(), Vector3.fromTileEntityCenter(tile())); + TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), world(), Vector3.fromTileEntityCenter(tile())); tile().remPart(this); } } @@ -97,7 +98,7 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco { if(!world().isRemote && !canStay()) { - TileMultipart.dropItem(new ItemStack(Mekanism.GlowPanel, 1, colour.getMetaValue()), world(), Vector3.fromTileEntityCenter(tile())); + TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), world(), Vector3.fromTileEntityCenter(tile())); tile().remPart(this); } } @@ -194,7 +195,7 @@ public class PartGlowPanel extends JCuboidPart implements JNormalOcclusion, JIco @Override public ItemStack pickItem(MovingObjectPosition hit) { - return new ItemStack(Mekanism.GlowPanel, 1, colour.getMetaValue()); + return new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()); } @Override diff --git a/src/main/java/mekanism/common/multipart/PartSidedPipe.java b/src/main/java/mekanism/common/multipart/PartSidedPipe.java index a4227926e..494de793d 100644 --- a/src/main/java/mekanism/common/multipart/PartSidedPipe.java +++ b/src/main/java/mekanism/common/multipart/PartSidedPipe.java @@ -17,7 +17,7 @@ import mekanism.api.transmitters.ITransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.client.render.RenderPartTransmitter; import mekanism.common.ITileNetwork; -import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.Tier; import mekanism.common.item.ItemConfigurator; import mekanism.common.multipart.TransmitterType.Size; @@ -446,7 +446,7 @@ public abstract class PartSidedPipe extends TMultiPart implements TSlottedPart, @Override public ItemStack pickItem(MovingObjectPosition hit) { - return new ItemStack(Mekanism.PartTransmitter, 1, getTransmitter().ordinal()); + return new ItemStack(MekanismItems.PartTransmitter, 1, getTransmitter().ordinal()); } @Override diff --git a/src/main/java/mekanism/common/multipart/PartUniversalCable.java b/src/main/java/mekanism/common/multipart/PartUniversalCable.java index 119060a92..9e65e48e0 100644 --- a/src/main/java/mekanism/common/multipart/PartUniversalCable.java +++ b/src/main/java/mekanism/common/multipart/PartUniversalCable.java @@ -5,13 +5,13 @@ import ic2.api.energy.tile.IEnergySource; import java.util.List; import java.util.Set; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; import mekanism.client.MekanismClient; import mekanism.client.render.RenderPartTransmitter; import mekanism.common.EnergyNetwork; -import mekanism.common.Mekanism; import mekanism.common.Tier; import mekanism.common.util.CableUtils; import mekanism.common.util.MekanismUtils; @@ -105,14 +105,14 @@ public class PartUniversalCable extends PartTransmitter implement if(acceptor instanceof IEnergySource) { - double received = ((IEnergySource) acceptor).getOfferedEnergy() * Mekanism.FROM_IC2; + double received = ((IEnergySource) acceptor).getOfferedEnergy() * general.FROM_IC2; double toDraw = received; if(received > 0) { toDraw -= getTransmitterNetwork().emit(received); } - ((IEnergySource) acceptor).drawEnergy(toDraw * Mekanism.TO_IC2); + ((IEnergySource) acceptor).drawEnergy(toDraw * general.TO_IC2); } } } @@ -271,7 +271,7 @@ public class PartUniversalCable extends PartTransmitter implement { if(!simulate) { - return maxReceive - (int)Math.round(getTransmitterNetwork().emit(maxReceive*Mekanism.FROM_TE)*Mekanism.TO_TE); + return maxReceive - (int)Math.round(getTransmitterNetwork().emit(maxReceive* general.FROM_TE)* general.TO_TE); } return 0; @@ -302,7 +302,7 @@ public class PartUniversalCable extends PartTransmitter implement @Method(modid = "CoFHAPI|energy") public int getMaxEnergyStored(ForgeDirection from) { - return (int)Math.round(getTransmitterNetwork().getEnergyNeeded()*Mekanism.TO_TE); + return (int)Math.round(getTransmitterNetwork().getEnergyNeeded()* general.TO_TE); } @Override @@ -379,7 +379,7 @@ public class PartUniversalCable extends PartTransmitter implement @Method(modid = "BuildCraftAPI|power") private void reconfigure() { - float needed = (float)(getTransmitterNetwork().getEnergyNeeded()*Mekanism.TO_BC); + float needed = (float)(getTransmitterNetwork().getEnergyNeeded()* general.TO_BC); powerHandler.configure(1, needed, 0, needed); } @@ -389,7 +389,7 @@ public class PartUniversalCable extends PartTransmitter implement { if(powerHandler.getEnergyStored() > 0) { - getTransmitterNetwork().emit(powerHandler.getEnergyStored()*Mekanism.FROM_BC); + getTransmitterNetwork().emit(powerHandler.getEnergyStored()* general.FROM_BC); } powerHandler.setEnergy(0); diff --git a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java index 2855a18a0..d291e7526 100644 --- a/src/main/java/mekanism/common/network/PacketBoxBlacklist.java +++ b/src/main/java/mekanism/common/network/PacketBoxBlacklist.java @@ -2,7 +2,7 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import mekanism.api.BlockInfo; +import mekanism.api.util.BlockInfo; import mekanism.api.MekanismAPI; import mekanism.common.Mekanism; import mekanism.common.network.PacketBoxBlacklist.BoxBlacklistMessage; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 36a3f6062..16c6b88bb 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -1,7 +1,10 @@ package mekanism.common.network; import io.netty.buffer.ByteBuf; -import mekanism.common.EnergyDisplay.EnergyType; + +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.usage; +import mekanism.api.util.EnergyUtil.EnergyType; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.network.PacketConfigSync.ConfigSyncMessage; @@ -24,47 +27,47 @@ public class PacketConfigSync implements IMessageHandler 0) { - ItemStack proxy = new ItemStack(Mekanism.ItemProxy); + ItemStack proxy = new ItemStack(MekanismItems.Proxy); ((ItemProxy)proxy.getItem()).setSavedItem(proxy, testRemain.copy()); event.craftMatrix.setInventorySlotContents(other, proxy); } diff --git a/src/main/java/mekanism/common/recipe/RecipeHandler.java b/src/main/java/mekanism/common/recipe/RecipeHandler.java index 859c5b983..2de6ade3f 100644 --- a/src/main/java/mekanism/common/recipe/RecipeHandler.java +++ b/src/main/java/mekanism/common/recipe/RecipeHandler.java @@ -4,18 +4,18 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; -import mekanism.api.AdvancedInput; -import mekanism.api.ChanceOutput; -import mekanism.api.ChemicalPair; -import mekanism.api.PressurizedProducts; -import mekanism.api.PressurizedReactants; -import mekanism.api.PressurizedRecipe; +import mekanism.api.recipe.AdvancedInput; +import mekanism.api.recipe.ChanceOutput; +import mekanism.api.recipe.ChemicalPair; +import mekanism.api.recipe.PressurizedProducts; +import mekanism.api.recipe.PressurizedReactants; +import mekanism.api.recipe.PressurizedRecipe; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.api.infuse.InfusionInput; import mekanism.api.infuse.InfusionOutput; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/mekanism/common/tank/TankUpdateProtocol.java b/src/main/java/mekanism/common/tank/TankUpdateProtocol.java index b9e25561d..196f0adec 100644 --- a/src/main/java/mekanism/common/tank/TankUpdateProtocol.java +++ b/src/main/java/mekanism/common/tank/TankUpdateProtocol.java @@ -5,6 +5,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.tank.SynchronizedTankData.ValveData; import mekanism.common.tile.TileEntityDynamicTank; import mekanism.common.tile.TileEntityDynamicValve; @@ -353,7 +354,7 @@ public class TankUpdateProtocol */ private boolean isValidFrame(int x, int y, int z) { - return pointer.getWorldObj().getBlock(x, y, z) == Mekanism.BasicBlock && pointer.getWorldObj().getBlockMetadata(x, y, z) == 9; + return pointer.getWorldObj().getBlock(x, y, z) == MekanismBlocks.BasicBlock && pointer.getWorldObj().getBlockMetadata(x, y, z) == 9; } /** diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 933cdefba..336c1c5d5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -5,7 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.Map; -import mekanism.api.AdvancedInput; +import mekanism.api.recipe.AdvancedInput; import mekanism.api.EnumColor; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; @@ -13,6 +13,7 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.component.TileComponentEjector; @@ -21,7 +22,7 @@ import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -183,7 +184,7 @@ public abstract class TileEntityAdvancedElectricMachine extends TileEntityBasicM } else if(slotID == 4) { - return itemstack.getItem() == Mekanism.SpeedUpgrade || itemstack.getItem() == Mekanism.EnergyUpgrade; + return itemstack.getItem() == MekanismItems.SpeedUpgrade || itemstack.getItem() == MekanismItems.EnergyUpgrade; } else if(slotID == 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 9e9065ce7..693b1c8e7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.client.sound.IHasSound; import mekanism.common.IActiveState; import mekanism.common.IEjector; @@ -172,7 +173,7 @@ public abstract class TileEntityBasicMachine extends TileEntityElectricBlock imp if(updateDelay == 0 && clientActive != isActive) { - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; isActive = clientActive; MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index ff37442e1..dea7357be 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -14,7 +14,7 @@ import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.transporter.TransporterManager; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import mekanism.common.util.TransporterUtils; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; diff --git a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java index eecb42551..a53649f30 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityChanceMachine.java @@ -2,9 +2,9 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.api.ChanceOutput; +import mekanism.api.recipe.ChanceOutput; import mekanism.api.EnumColor; -import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.component.TileComponentEjector; @@ -86,7 +86,7 @@ public abstract class TileEntityChanceMachine extends TileEntityBasicMachine { if(slotID == 3) { - return itemstack.getItem() == Mekanism.SpeedUpgrade || itemstack.getItem() == Mekanism.EnergyUpgrade; + return itemstack.getItem() == MekanismItems.SpeedUpgrade || itemstack.getItem() == MekanismItems.EnergyUpgrade; } else if(slotID == 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityChargepad.java b/src/main/java/mekanism/common/tile/TileEntityChargepad.java index 1c62163ab..b2074cd30 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChargepad.java +++ b/src/main/java/mekanism/common/tile/TileEntityChargepad.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Random; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.client.sound.IHasSound; @@ -125,7 +126,7 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct } else if(MekanismUtils.useIC2() && itemstack.getItem() instanceof IElectricItem) { - double sent = ElectricItem.manager.charge(itemstack, (int)(getEnergy()*Mekanism.TO_IC2), 4, true, false)*Mekanism.FROM_IC2; + double sent = ElectricItem.manager.charge(itemstack, (int)(getEnergy()* general.TO_IC2), 4, true, false)* general.FROM_IC2; setEnergy(getEnergy() - sent); } else if(MekanismUtils.useRF() && itemstack.getItem() instanceof IEnergyContainerItem) @@ -133,9 +134,9 @@ public class TileEntityChargepad extends TileEntityElectricBlock implements IAct IEnergyContainerItem item = (IEnergyContainerItem)itemstack.getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemstack)), item.getMaxEnergyStored(itemstack) - item.getEnergyStored(itemstack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, (getEnergy()*Mekanism.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, (getEnergy()* general.TO_TE))); - setEnergy(getEnergy() - (item.receiveEnergy(itemstack, toTransfer, false)*Mekanism.FROM_TE)); + setEnergy(getEnergy() - (item.receiveEnergy(itemstack, toTransfer, false)* general.FROM_TE)); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java index 7d676b2e5..283f533f1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -70,7 +71,7 @@ public class TileEntityChemicalCrystallizer extends TileEntityElectricBlock impl public float spin; - public final double ENERGY_USAGE = Mekanism.chemicalCrystallizerUsage; + public final double ENERGY_USAGE = usage.chemicalCrystallizerUsage; /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java index 6c4452fab..ee2f93c80 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -55,7 +56,7 @@ public class TileEntityChemicalDissolutionChamber extends TileEntityElectricBloc public int TICKS_REQUIRED = 100; - public final double ENERGY_USAGE = Mekanism.chemicalDissolutionChamberUsage; + public final double ENERGY_USAGE = usage.chemicalDissolutionChamberUsage; public TileComponentUpgrade upgradeComponent = new TileComponentUpgrade(this, 3); diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java index c28dc2d8d..02b797a30 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -49,7 +50,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement public double prevEnergy; - public final double ENERGY_USAGE = Mekanism.chemicalInfuserUsage; + public final double ENERGY_USAGE = usage.chemicalInfuserUsage; /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java index ad3343c08..29545e3b0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalInjectionChamber.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import java.util.Map; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -9,7 +10,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; @@ -21,7 +22,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr { public TileEntityChemicalInjectionChamber() { - super("ChemicalInjectionChamber.ogg", "ChemicalInjectionChamber", Mekanism.chemicalInjectionChamberUsage, 1, 200, MachineType.CHEMICAL_INJECTION_CHAMBER.baseEnergy); + super("ChemicalInjectionChamber.ogg", "ChemicalInjectionChamber", usage.chemicalInjectionChamberUsage, 1, 200, MachineType.CHEMICAL_INJECTION_CHAMBER.baseEnergy); } @Override @@ -35,7 +36,7 @@ public class TileEntityChemicalInjectionChamber extends TileEntityAdvancedElectr { if(MekanismUtils.getOreDictName(itemstack).contains("dustSulfur")) return new GasStack(GasRegistry.getGas("sulfuricAcid"), 2); if(MekanismUtils.getOreDictName(itemstack).contains("dustSalt")) return new GasStack(GasRegistry.getGas("hydrogenChloride"), 2); - if(Block.getBlockFromItem(itemstack.getItem()) == Mekanism.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && + if(Block.getBlockFromItem(itemstack.getItem()) == MekanismBlocks.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && isValidGas(((IGasItem)itemstack.getItem()).getGas(itemstack).getGas())) return new GasStack(GasRegistry.getGas("sulfuricAcid"), 1); return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java index af8b3c09b..c3f995f23 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalOxidizer.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -51,7 +52,7 @@ public class TileEntityChemicalOxidizer extends TileEntityElectricBlock implemen public int TICKS_REQUIRED = 100; - public final double ENERGY_USAGE = Mekanism.rotaryCondensentratorUsage; + public final double ENERGY_USAGE = usage.rotaryCondensentratorUsage; public RedstoneControl controlType = RedstoneControl.DISABLED; diff --git a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java index 10dae7238..1bc2007b5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java +++ b/src/main/java/mekanism/common/tile/TileEntityChemicalWasher.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -62,7 +63,7 @@ public class TileEntityChemicalWasher extends TileEntityElectricBlock implements public double prevEnergy; - public final double ENERGY_USAGE = Mekanism.chemicalWasherUsage; + public final double ENERGY_USAGE = usage.chemicalWasherUsage; /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; diff --git a/src/main/java/mekanism/common/tile/TileEntityCombiner.java b/src/main/java/mekanism/common/tile/TileEntityCombiner.java index 2ad64a8ee..afdb2ba1a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCombiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityCombiner.java @@ -2,10 +2,10 @@ package mekanism.common.tile; import java.util.Map; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; -import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.block.Block; @@ -17,7 +17,7 @@ public class TileEntityCombiner extends TileEntityAdvancedElectricMachine { public TileEntityCombiner() { - super("Combiner.ogg", "Combiner", Mekanism.combinerUsage, 1, 200, MachineType.COMBINER.baseEnergy); + super("Combiner.ogg", "Combiner", usage.combinerUsage, 1, 200, MachineType.COMBINER.baseEnergy); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityCrusher.java b/src/main/java/mekanism/common/tile/TileEntityCrusher.java index 45e03dd35..16b86d8d1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityCrusher.java +++ b/src/main/java/mekanism/common/tile/TileEntityCrusher.java @@ -2,7 +2,7 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.usage; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; @@ -12,7 +12,7 @@ public class TileEntityCrusher extends TileEntityElectricMachine public TileEntityCrusher() { - super("Crusher.ogg", "Crusher", Mekanism.crusherUsage, 200, MachineType.CRUSHER.baseEnergy); + super("Crusher.ogg", "Crusher", usage.crusherUsage, 200, MachineType.CRUSHER.baseEnergy); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index e0593d037..765742df7 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.usage; import mekanism.common.HashList; import mekanism.common.IActiveState; import mekanism.common.IAdvancedBoundingBlock; @@ -20,6 +21,7 @@ import mekanism.common.IRedstoneControl; import mekanism.common.ISustainedData; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.inventory.container.ContainerFilter; import mekanism.common.inventory.container.ContainerNull; @@ -69,7 +71,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I public ThreadMinerSearch searcher = new ThreadMinerSearch(this); - public final double ENERGY_USAGE = Mekanism.digitalMinerUsage; + public final double ENERGY_USAGE = usage.digitalMinerUsage; public int radius; @@ -1018,7 +1020,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I } MekanismUtils.makeAdvancedBoundingBlock(worldObj, x, y, z, Coord4D.get(this)); - worldObj.notifyBlocksOfNeighborChange(x, y, z, Mekanism.BoundingBlock); + worldObj.notifyBlocksOfNeighborChange(x, y, z, MekanismBlocks.BoundingBlock); } } } diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java index eb2f6b141..9d14d7ec8 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricBlock.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.energy.IStrictEnergyStorage; @@ -209,7 +210,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "BuildCraftAPI|power") protected void reconfigure() { - powerHandler.configure(0, (float)((getMaxEnergy()-getEnergy())*Mekanism.TO_BC), 0, (float)(getMaxEnergy()*Mekanism.TO_BC)); + powerHandler.configure(0, (float)((getMaxEnergy()-getEnergy())* general.TO_BC), 0, (float)(getMaxEnergy()* general.TO_BC)); } @Override @@ -220,7 +221,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(getEnergy() < getMaxEnergy()) { - setEnergy(getEnergy() + powerHandler.useEnergy(0, (float)((getMaxEnergy()-getEnergy())*Mekanism.TO_BC), true)*Mekanism.FROM_BC); + setEnergy(getEnergy() + powerHandler.useEnergy(0, (float)((getMaxEnergy()-getEnergy())* general.TO_BC), true)* general.FROM_BC); } powerHandler.setEnergy(0); @@ -252,14 +253,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(getConsumingSides().contains(from)) { - double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive*Mekanism.FROM_TE); + double toAdd = (int)Math.min(getMaxEnergy()-getEnergy(), maxReceive* general.FROM_TE); if(!simulate) { setEnergy(getEnergy() + toAdd); } - return (int)Math.round(toAdd*Mekanism.TO_TE); + return (int)Math.round(toAdd* general.TO_TE); } return 0; @@ -271,14 +272,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i { if(getOutputtingSides().contains(from)) { - double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract*Mekanism.FROM_TE)); + double toSend = Math.min(getEnergy(), Math.min(getMaxOutput(), maxExtract* general.FROM_TE)); if(!simulate) { setEnergy(getEnergy() - toSend); } - return (int)Math.round(toSend*Mekanism.TO_TE); + return (int)Math.round(toSend* general.TO_TE); } return 0; @@ -295,14 +296,14 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "CoFHAPI|energy") public int getEnergyStored(ForgeDirection from) { - return (int)Math.round(getEnergy()*Mekanism.TO_TE); + return (int)Math.round(getEnergy()* general.TO_TE); } @Override @Method(modid = "CoFHAPI|energy") public int getMaxEnergyStored(ForgeDirection from) { - return (int)Math.round(getMaxEnergy()*Mekanism.TO_TE); + return (int)Math.round(getMaxEnergy()* general.TO_TE); } @Override @@ -316,15 +317,15 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2API") public void setStored(int energy) { - setEnergy(energy*Mekanism.FROM_IC2); + setEnergy(energy* general.FROM_IC2); } @Override @Method(modid = "IC2API") public int addEnergy(int amount) { - setEnergy(getEnergy() + amount*Mekanism.FROM_IC2); - return (int)Math.round(getEnergy()*Mekanism.TO_IC2); + setEnergy(getEnergy() + amount* general.FROM_IC2); + return (int)Math.round(getEnergy()* general.TO_IC2); } @Override @@ -351,28 +352,28 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2API") public int getStored() { - return (int)Math.round(getEnergy()*Mekanism.TO_IC2); + return (int)Math.round(getEnergy()* general.TO_IC2); } @Override @Method(modid = "IC2API") public int getCapacity() { - return (int)Math.round(getMaxEnergy()*Mekanism.TO_IC2); + return (int)Math.round(getMaxEnergy()* general.TO_IC2); } @Override @Method(modid = "IC2API") public int getOutput() { - return (int)Math.round(getMaxOutput()*Mekanism.TO_IC2); + return (int)Math.round(getMaxOutput()* general.TO_IC2); } @Override @Method(modid = "IC2API") public double getDemandedEnergy() { - return (getMaxEnergy() - getEnergy())*Mekanism.TO_IC2; + return (getMaxEnergy() - getEnergy())* general.TO_IC2; } @Override @@ -385,7 +386,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i @Method(modid = "IC2API") public double getOutputEnergyUnitsPerTick() { - return getMaxOutput()*Mekanism.TO_IC2; + return getMaxOutput()* general.TO_IC2; } @Override @@ -397,7 +398,7 @@ public abstract class TileEntityElectricBlock extends TileEntityContainerBlock i return i; } - return i-transferEnergyToAcceptor(direction, i*Mekanism.FROM_IC2)*Mekanism.TO_IC2; + return i-transferEnergyToAcceptor(direction, i* general.FROM_IC2)* general.TO_IC2; } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index 596f6fb3d..8e363cf6a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.recipe.RecipeHandler; import mekanism.common.tile.component.TileComponentEjector; @@ -96,7 +97,7 @@ public abstract class TileEntityElectricMachine extends TileEntityBasicMachine } else if(slotID == 3) { - return itemstack.getItem() == Mekanism.SpeedUpgrade || itemstack.getItem() == Mekanism.EnergyUpgrade; + return itemstack.getItem() == MekanismItems.SpeedUpgrade || itemstack.getItem() == MekanismItems.EnergyUpgrade; } else if(slotID == 0) { diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java index ebba91428..df04ec107 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricPump.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricPump.java @@ -13,6 +13,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; +import mekanism.api.MekanismConfig.usage; import mekanism.common.ISustainedTank; import mekanism.common.Mekanism; import mekanism.common.network.PacketTileEntity.TileEntityMessage; @@ -123,7 +124,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I if(!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0) { - if(getEnergy() >= Mekanism.electricPumpUsage && (fluidTank.getFluid() == null || fluidTank.getFluid().amount+FluidContainerRegistry.BUCKET_VOLUME <= fluidTank.getCapacity())) + if(getEnergy() >= usage.electricPumpUsage && (fluidTank.getFluid() == null || fluidTank.getFluid().amount+FluidContainerRegistry.BUCKET_VOLUME <= fluidTank.getCapacity())) { if(suck(true)) { @@ -171,7 +172,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { if(take) { - setEnergy(getEnergy() - Mekanism.electricPumpUsage); + setEnergy(getEnergy() - usage.electricPumpUsage); recurringNodes.add(wrapper.clone()); fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); @@ -190,7 +191,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { if(take) { - setEnergy(getEnergy() - Mekanism.electricPumpUsage); + setEnergy(getEnergy() - usage.electricPumpUsage); fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); } @@ -208,7 +209,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { if(take) { - setEnergy(getEnergy() - Mekanism.electricPumpUsage); + setEnergy(getEnergy() - usage.electricPumpUsage); fluidTank.fill(MekanismUtils.getFluid(worldObj, wrapper.xCoord, wrapper.yCoord, wrapper.zCoord), true); worldObj.setBlockToAir(wrapper.xCoord, wrapper.yCoord, wrapper.zCoord); } @@ -229,7 +230,7 @@ public class TileEntityElectricPump extends TileEntityElectricBlock implements I { if(take) { - setEnergy(getEnergy() - Mekanism.electricPumpUsage); + setEnergy(getEnergy() - usage.electricPumpUsage); recurringNodes.add(side); fluidTank.fill(MekanismUtils.getFluid(worldObj, side.xCoord, side.yCoord, side.zCoord), true); worldObj.setBlockToAir(side.xCoord, side.yCoord, side.zCoord); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java index fac5b03e2..c033ddafc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectrolyticSeparator.java @@ -4,7 +4,8 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; -import mekanism.api.ChemicalPair; +import mekanism.api.MekanismConfig.general; +import mekanism.api.recipe.ChemicalPair; import mekanism.api.Coord4D; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; @@ -134,7 +135,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp { setActive(true); fillTanks(RecipeHandler.getElectrolyticSeparatorOutput(fluidTank, true)); - setEnergy(getEnergy() - Mekanism.FROM_H2*2); + setEnergy(getEnergy() - general.FROM_H2*2); } else { setActive(false); @@ -197,7 +198,7 @@ public class TileEntityElectrolyticSeparator extends TileEntityElectricBlock imp public boolean canOperate() { - return canFillWithSwap(RecipeHandler.getElectrolyticSeparatorOutput(fluidTank, false)) && getEnergy() >= Mekanism.FROM_H2*2; + return canFillWithSwap(RecipeHandler.getElectrolyticSeparatorOutput(fluidTank, false)) && getEnergy() >= general.FROM_H2*2; } public boolean canFillWithSwap(ChemicalPair gases) diff --git a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java index ef7ca3590..8b87108dd 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnergizedSmelter.java @@ -3,7 +3,7 @@ package mekanism.common.tile; import java.util.HashMap; import java.util.Map; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.usage; import mekanism.common.block.BlockMachine.MachineType; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ public class TileEntityEnergizedSmelter extends TileEntityElectricMachine public TileEntityEnergizedSmelter() { - super("Smelter.ogg", "EnergizedSmelter", Mekanism.energizedSmelterUsage, 200, MachineType.ENERGIZED_SMELTER.baseEnergy); + super("Smelter.ogg", "EnergizedSmelter", usage.energizedSmelterUsage, 200, MachineType.ENERGIZED_SMELTER.baseEnergy); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java index f3f9c39c5..e1b5f7cd1 100644 --- a/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityEnrichmentChamber.java @@ -2,7 +2,7 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.usage; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; @@ -10,7 +10,7 @@ public class TileEntityEnrichmentChamber extends TileEntityElectricMachine { public TileEntityEnrichmentChamber() { - super("Chamber.ogg", "EnrichmentChamber", Mekanism.enrichmentChamberUsage, 200, MachineType.ENRICHMENT_CHAMBER.baseEnergy); + super("Chamber.ogg", "EnrichmentChamber", usage.enrichmentChamberUsage, 200, MachineType.ENRICHMENT_CHAMBER.baseEnergy); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index 614498058..a1325fc0b 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -7,6 +7,8 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; @@ -22,6 +24,7 @@ import mekanism.common.IInvConfiguration; import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.SideData; import mekanism.common.Tier.FactoryTier; import mekanism.common.block.BlockMachine.MachineType; @@ -31,7 +34,7 @@ import mekanism.common.tile.component.TileComponentUpgrade; import mekanism.common.util.ChargeUtils; import mekanism.common.util.InventoryUtils; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -61,7 +64,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip public int TICKS_REQUIRED = 200; /** How much energy each operation consumes per tick. */ - public double ENERGY_PER_TICK = Mekanism.factoryUsage; + public double ENERGY_PER_TICK = usage.factoryUsage; /** How long it takes this factory to switch recipe types. */ public int RECIPE_TICKS_REQUIRED = 40; @@ -453,7 +456,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip if(slotID == 0) { - return itemstack.getItem() == Mekanism.SpeedUpgrade || itemstack.getItem() == Mekanism.EnergyUpgrade; + return itemstack.getItem() == MekanismItems.SpeedUpgrade || itemstack.getItem() == MekanismItems.EnergyUpgrade; } else if(slotID == 1) { @@ -590,7 +593,7 @@ public class TileEntityFactory extends TileEntityElectricBlock implements IPerip if(updateDelay == 0 && clientActive != isActive) { - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; isActive = clientActive; MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java index dd26b55b3..210ffa146 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java +++ b/src/main/java/mekanism/common/tile/TileEntityFluidicPlenisher.java @@ -10,8 +10,8 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.api.IConfigurable; +import mekanism.api.MekanismConfig.usage; import mekanism.common.ISustainedTank; -import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; @@ -126,7 +126,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen } } - if(getEnergy() >= Mekanism.fluidicPlenisherUsage && worldObj.getWorldTime() % 10 == 0 && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME && !finishedCalc) + if(getEnergy() >= usage.fluidicPlenisherUsage && worldObj.getWorldTime() % 10 == 0 && fluidTank.getFluidAmount() >= FluidContainerRegistry.BUCKET_VOLUME && !finishedCalc) { if(fluidTank.getFluid().getFluid().canBePlacedInWorld()) { @@ -172,7 +172,7 @@ public class TileEntityFluidicPlenisher extends TileEntityElectricBlock implemen { worldObj.setBlock(coord.xCoord, coord.yCoord, coord.zCoord, MekanismUtils.getFlowingBlock(fluidTank.getFluid().getFluid()), 0, 3); - setEnergy(getEnergy() - Mekanism.fluidicPlenisherUsage); + setEnergy(getEnergy() - usage.fluidicPlenisherUsage); fluidTank.drain(FluidContainerRegistry.BUCKET_VOLUME, true); for(ForgeDirection dir : dirs) diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index db16f53c9..78ac39326 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -6,6 +6,8 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.usage; import mekanism.api.infuse.InfuseObject; import mekanism.api.infuse.InfuseRegistry; import mekanism.api.infuse.InfuseType; @@ -18,6 +20,7 @@ import mekanism.common.IInvConfiguration; import mekanism.common.IRedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.PacketHandler; import mekanism.common.SideData; import mekanism.common.block.BlockMachine.MachineType; @@ -53,7 +56,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem public int MAX_INFUSE = 1000; /** How much energy this machine consumes per-tick. */ - public double ENERGY_PER_TICK = Mekanism.metallurgicInfuserUsage; + public double ENERGY_PER_TICK = usage.metallurgicInfuserUsage; /** How many ticks it takes to run an operation. */ public int TICKS_REQUIRED = 200; @@ -222,7 +225,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem } else if(slotID == 0) { - return itemstack.getItem() == Mekanism.SpeedUpgrade || itemstack.getItem() == Mekanism.EnergyUpgrade; + return itemstack.getItem() == MekanismItems.SpeedUpgrade || itemstack.getItem() == MekanismItems.EnergyUpgrade; } else if(slotID == 2) { @@ -403,7 +406,7 @@ public class TileEntityMetallurgicInfuser extends TileEntityElectricBlock implem if(updateDelay == 0 && clientActive != isActive) { - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; isActive = clientActive; MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java index a7492c6a3..621212021 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java +++ b/src/main/java/mekanism/common/tile/TileEntityOsmiumCompressor.java @@ -2,10 +2,10 @@ package mekanism.common.tile; import java.util.Map; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; -import mekanism.common.Mekanism; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.item.ItemStack; @@ -15,7 +15,7 @@ public class TileEntityOsmiumCompressor extends TileEntityAdvancedElectricMachin { public TileEntityOsmiumCompressor() { - super("Compressor.ogg", "OsmiumCompressor", Mekanism.osmiumCompressorUsage, 1, 200, MachineType.OSMIUM_COMPRESSOR.baseEnergy); + super("Compressor.ogg", "OsmiumCompressor", usage.osmiumCompressorUsage, 1, 200, MachineType.OSMIUM_COMPRESSOR.baseEnergy); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index 25ea7829e..9177cfdc5 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -7,8 +7,9 @@ import java.util.Map; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.PressurizedProducts; -import mekanism.api.PressurizedRecipe; +import mekanism.api.MekanismConfig.usage; +import mekanism.api.recipe.PressurizedProducts; +import mekanism.api.recipe.PressurizedRecipe; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -16,7 +17,6 @@ import mekanism.api.gas.GasTank; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.ITubeConnection; import mekanism.common.ISustainedData; -import mekanism.common.Mekanism; import mekanism.common.SideData; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.item.ItemUpgrade; @@ -51,7 +51,7 @@ public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandl public TileEntityPRC() { - super("PressurizedReactionChamber.ogg", "PressurizedReactionChamber", new ResourceLocation("mekanism", "gui/GuiPRC.png"), Mekanism.pressurizedReactionBaseUsage, 100, MachineType.PRESSURIZED_REACTION_CHAMBER.baseEnergy); + super("PressurizedReactionChamber.ogg", "PressurizedReactionChamber", new ResourceLocation("mekanism", "gui/GuiPRC.png"), usage.pressurizedReactionBaseUsage, 100, MachineType.PRESSURIZED_REACTION_CHAMBER.baseEnergy); sideOutputs.add(new SideData(EnumColor.GREY, InventoryUtils.EMPTY)); sideOutputs.add(new SideData(EnumColor.DARK_RED, new int[] {0})); diff --git a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java index cd9ac4143..864eca402 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPortableTank.java +++ b/src/main/java/mekanism/common/tile/TileEntityPortableTank.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import mekanism.api.Coord4D; import mekanism.api.IConfigurable; +import mekanism.api.MekanismConfig.general; import mekanism.api.gas.IGasItem; import mekanism.common.IActiveState; import mekanism.common.IFluidContainerManager; @@ -392,7 +393,7 @@ public class TileEntityPortableTank extends TileEntityContainerBlock implements if(updateDelay == 0 && clientActive != isActive) { - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; isActive = clientActive; MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java index 1dbe0c144..225afdd07 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java +++ b/src/main/java/mekanism/common/tile/TileEntityPrecisionSawmill.java @@ -2,7 +2,7 @@ package mekanism.common.tile; import java.util.Map; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.usage; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import mekanism.common.util.MekanismUtils; @@ -12,7 +12,7 @@ public class TileEntityPrecisionSawmill extends TileEntityChanceMachine { public TileEntityPrecisionSawmill() { - super("PrecisionSawmill.ogg", "PrecisionSawmill", MekanismUtils.getResource(ResourceType.GUI, "GuiBasicMachine.png"), Mekanism.precisionSawmillUsage, 200, MachineType.PRECISION_SAWMILL.baseEnergy); + super("PrecisionSawmill.ogg", "PrecisionSawmill", MekanismUtils.getResource(ResourceType.GUI, "GuiBasicMachine.png"), usage.precisionSawmillUsage, 200, MachineType.PRECISION_SAWMILL.baseEnergy); } @Override diff --git a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java index 3bb8c1757..39c3fd337 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java +++ b/src/main/java/mekanism/common/tile/TileEntityPurificationChamber.java @@ -2,6 +2,7 @@ package mekanism.common.tile; import java.util.Map; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -9,7 +10,7 @@ import mekanism.api.gas.GasTransmission; import mekanism.api.gas.IGasHandler; import mekanism.api.gas.IGasItem; import mekanism.api.gas.ITubeConnection; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.recipe.RecipeHandler.Recipe; import net.minecraft.block.Block; @@ -21,7 +22,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac { public TileEntityPurificationChamber() { - super("PurificationChamber.ogg", "PurificationChamber", Mekanism.purificationChamberUsage, 1, 200, MachineType.PURIFICATION_CHAMBER.baseEnergy); + super("PurificationChamber.ogg", "PurificationChamber", usage.purificationChamberUsage, 1, 200, MachineType.PURIFICATION_CHAMBER.baseEnergy); } @Override @@ -34,7 +35,7 @@ public class TileEntityPurificationChamber extends TileEntityAdvancedElectricMac public GasStack getItemGas(ItemStack itemstack) { if(itemstack.isItemEqual(new ItemStack(Items.flint))) return new GasStack(GasRegistry.getGas("oxygen"), 10); - if(Block.getBlockFromItem(itemstack.getItem()) == Mekanism.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && + if(Block.getBlockFromItem(itemstack.getItem()) == MekanismBlocks.GasTank && ((IGasItem)itemstack.getItem()).getGas(itemstack) != null && ((IGasItem)itemstack.getItem()).getGas(itemstack).getGas() == GasRegistry.getGas("oxygen")) return new GasStack(GasRegistry.getGas("oxygen"), 1); return null; diff --git a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java index 05dd9e206..4f31ffd72 100644 --- a/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java +++ b/src/main/java/mekanism/common/tile/TileEntityRotaryCondensentrator.java @@ -5,6 +5,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.usage; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -57,7 +58,7 @@ public class TileEntityRotaryCondensentrator extends TileEntityElectricBlock imp public double prevEnergy; - public final double ENERGY_USAGE = Mekanism.rotaryCondensentratorUsage; + public final double ENERGY_USAGE = usage.rotaryCondensentratorUsage; /** This machine's current RedstoneControl type. */ public RedstoneControl controlType = RedstoneControl.DISABLED; diff --git a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java index 6fb13fd9f..751da6d4d 100644 --- a/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java +++ b/src/main/java/mekanism/common/tile/TileEntitySeismicVibrator.java @@ -6,6 +6,8 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.usage; import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; import mekanism.common.Mekanism; @@ -67,10 +69,10 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement ChargeUtils.discharge(0, this); - if(MekanismUtils.canFunction(this) && getEnergy() >= Mekanism.seismicVibratorUsage) + if(MekanismUtils.canFunction(this) && getEnergy() >= usage.seismicVibratorUsage) { setActive(true); - setEnergy(getEnergy()-Mekanism.seismicVibratorUsage); + setEnergy(getEnergy()- usage.seismicVibratorUsage); } else { setActive(false); @@ -122,7 +124,7 @@ public class TileEntitySeismicVibrator extends TileEntityElectricBlock implement if(updateDelay == 0 && clientActive != isActive) { - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; isActive = clientActive; MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java index 2e2ae0661..a9160fb60 100644 --- a/src/main/java/mekanism/common/tile/TileEntityTeleporter.java +++ b/src/main/java/mekanism/common/tile/TileEntityTeleporter.java @@ -11,6 +11,7 @@ import java.util.Set; import mekanism.api.Coord4D; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.Teleporter; import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.network.PacketPortalFX.PortalFXMessage; @@ -429,7 +430,7 @@ public class TileEntityTeleporter extends TileEntityElectricBlock implements IPe public boolean isFrame(int x, int y, int z) { - return worldObj.getBlock(x, y, z) == Mekanism.BasicBlock && worldObj.getBlockMetadata(x, y, z) == 7; + return worldObj.getBlock(x, y, z) == MekanismBlocks.BasicBlock && worldObj.getBlockMetadata(x, y, z) == 7; } @Override diff --git a/src/main/java/mekanism/common/transporter/Finder.java b/src/main/java/mekanism/common/transporter/Finder.java index 5cfa3bbb5..f6b6d587a 100644 --- a/src/main/java/mekanism/common/transporter/Finder.java +++ b/src/main/java/mekanism/common/transporter/Finder.java @@ -3,7 +3,7 @@ package mekanism.common.transporter; import java.util.List; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/mekanism/common/util/CableUtils.java b/src/main/java/mekanism/common/util/CableUtils.java index 42c1bea85..31129f478 100644 --- a/src/main/java/mekanism/common/util/CableUtils.java +++ b/src/main/java/mekanism/common/util/CableUtils.java @@ -13,11 +13,11 @@ import java.util.List; import java.util.Set; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.ICableOutputter; import mekanism.api.energy.IStrictEnergyAcceptor; import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.TransmissionType; -import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityElectricBlock; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; @@ -311,16 +311,16 @@ public final class CableUtils if(handler.canConnectEnergy(side.getOpposite())) { - int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(sendingEnergy*Mekanism.TO_TE), false); - sent += used*Mekanism.FROM_TE; + int used = handler.receiveEnergy(side.getOpposite(), (int)Math.round(sendingEnergy* general.TO_TE), false); + sent += used* general.FROM_TE; } } else if(MekanismUtils.useIC2() && tileEntity instanceof IEnergySink) { if(((IEnergySink)tileEntity).acceptsEnergyFrom(from, side.getOpposite())) { - double toSend = Math.min(sendingEnergy, Math.min(EnergyNet.instance.getPowerFromTier(((IEnergySink) tileEntity).getSinkTier()), ((IEnergySink)tileEntity).getDemandedEnergy())*Mekanism.FROM_IC2); - double rejects = ((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend*Mekanism.TO_IC2, 0)*Mekanism.FROM_IC2; + double toSend = Math.min(sendingEnergy, Math.min(EnergyNet.instance.getPowerFromTier(((IEnergySink) tileEntity).getSinkTier()), ((IEnergySink)tileEntity).getDemandedEnergy())* general.FROM_IC2); + double rejects = ((IEnergySink)tileEntity).injectEnergy(side.getOpposite(), toSend* general.TO_IC2, 0)* general.FROM_IC2; sent += (toSend - rejects); } } @@ -330,9 +330,9 @@ public final class CableUtils if(battery != null) { - double transferEnergy = Math.min(sendingEnergy, battery.getEnergyRequested()*Mekanism.FROM_BC); - double used = battery.addEnergy(transferEnergy*Mekanism.TO_BC); - sent += used*Mekanism.FROM_BC; + double transferEnergy = Math.min(sendingEnergy, battery.getEnergyRequested()* general.FROM_BC); + double used = battery.addEnergy(transferEnergy* general.TO_BC); + sent += used* general.FROM_BC; } } diff --git a/src/main/java/mekanism/common/util/ChargeUtils.java b/src/main/java/mekanism/common/util/ChargeUtils.java index aa6c5dadb..ab15baf83 100644 --- a/src/main/java/mekanism/common/util/ChargeUtils.java +++ b/src/main/java/mekanism/common/util/ChargeUtils.java @@ -2,6 +2,8 @@ package mekanism.common.util; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; + +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.EnergizedItemManager; import mekanism.api.energy.IEnergizedItem; import mekanism.common.Mekanism; @@ -31,7 +33,7 @@ public final class ChargeUtils if(item.canProvideEnergy(storer.inventory[slotID])) { - double gain = ElectricItem.manager.discharge(storer.inventory[slotID], (int)((storer.getMaxEnergy() - storer.getEnergy())*Mekanism.TO_IC2), 4, true, true, false)*Mekanism.FROM_IC2; + double gain = ElectricItem.manager.discharge(storer.inventory[slotID], (int)((storer.getMaxEnergy() - storer.getEnergy())* general.TO_IC2), 4, true, true, false)* general.FROM_IC2; storer.setEnergy(storer.getEnergy() + gain); } } @@ -41,13 +43,13 @@ public final class ChargeUtils IEnergyContainerItem item = (IEnergyContainerItem)storer.inventory[slotID].getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, ((storer.getMaxEnergy() - storer.getEnergy())*Mekanism.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, ((storer.getMaxEnergy() - storer.getEnergy())* general.TO_TE))); - storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)*Mekanism.FROM_TE)); + storer.setEnergy(storer.getEnergy() + (item.extractEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } - else if(storer.inventory[slotID].getItem() == Items.redstone && storer.getEnergy()+Mekanism.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) + else if(storer.inventory[slotID].getItem() == Items.redstone && storer.getEnergy()+ general.ENERGY_PER_REDSTONE <= storer.getMaxEnergy()) { - storer.setEnergy(storer.getEnergy() + Mekanism.ENERGY_PER_REDSTONE); + storer.setEnergy(storer.getEnergy() + general.ENERGY_PER_REDSTONE); storer.inventory[slotID].stackSize--; if(storer.inventory[slotID].stackSize <= 0) @@ -73,7 +75,7 @@ public final class ChargeUtils } else if(Mekanism.hooks.IC2APILoaded && storer.inventory[slotID].getItem() instanceof IElectricItem) { - double sent = ElectricItem.manager.charge(storer.inventory[slotID], (int)(storer.getEnergy()*Mekanism.TO_IC2), 4, true, false)*Mekanism.FROM_IC2; + double sent = ElectricItem.manager.charge(storer.inventory[slotID], (int)(storer.getEnergy()* general.TO_IC2), 4, true, false)* general.FROM_IC2; storer.setEnergy(storer.getEnergy() - sent); } else if(MekanismUtils.useRF() && storer.inventory[slotID].getItem() instanceof IEnergyContainerItem) @@ -82,9 +84,9 @@ public final class ChargeUtils IEnergyContainerItem item = (IEnergyContainerItem)storer.inventory[slotID].getItem(); int itemEnergy = (int)Math.round(Math.min(Math.sqrt(item.getMaxEnergyStored(itemStack)), item.getMaxEnergyStored(itemStack) - item.getEnergyStored(itemStack))); - int toTransfer = (int)Math.round(Math.min(itemEnergy, (storer.getEnergy()*Mekanism.TO_TE))); + int toTransfer = (int)Math.round(Math.min(itemEnergy, (storer.getEnergy()* general.TO_TE))); - storer.setEnergy(storer.getEnergy() - (item.receiveEnergy(itemStack, toTransfer, false)*Mekanism.FROM_TE)); + storer.setEnergy(storer.getEnergy() - (item.receiveEnergy(itemStack, toTransfer, false)* general.FROM_TE)); } } } diff --git a/src/main/java/mekanism/common/util/InventoryUtils.java b/src/main/java/mekanism/common/util/InventoryUtils.java index 7b6d6edf8..86d2a1795 100644 --- a/src/main/java/mekanism/common/util/InventoryUtils.java +++ b/src/main/java/mekanism/common/util/InventoryUtils.java @@ -1,7 +1,7 @@ package mekanism.common.util; import mekanism.api.EnumColor; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import mekanism.common.IInvConfiguration; import mekanism.common.tile.TileEntityBin; import mekanism.common.tile.TileEntityLogisticalSorter; diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index c5460269b..3a8627f30 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -16,10 +16,11 @@ import java.util.Map; import mekanism.api.Chunk3D; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasStack; -import mekanism.common.EnergyDisplay; -import mekanism.common.EnergyDisplay.ElectricUnit; +import mekanism.api.util.EnergyUtil; +import mekanism.api.util.EnergyUtil.ElectricUnit; import mekanism.common.IActiveState; import mekanism.common.IFactory; import mekanism.common.IFactory.RecipeType; @@ -29,6 +30,7 @@ import mekanism.common.IRedstoneControl; import mekanism.common.IRedstoneControl.RedstoneControl; import mekanism.common.IUpgradeTile; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.OreDictCache; import mekanism.common.Teleporter; import mekanism.common.Tier.EnergyCubeTier; @@ -90,7 +92,7 @@ public final class MekanismUtils public static boolean checkForUpdates(EntityPlayer entityplayer) { try { - if(Mekanism.updateNotifications && Mekanism.latestVersionNumber != null && Mekanism.recentNews != null) + if(general.updateNotifications && Mekanism.latestVersionNumber != null && Mekanism.recentNews != null) { if(!Mekanism.latestVersionNumber.equals("null")) { @@ -370,7 +372,7 @@ public final class MekanismUtils */ public static ItemStack getEnergyCube(EnergyCubeTier tier) { - ItemStack itemstack = ((ItemBlockEnergyCube)new ItemStack(Mekanism.EnergyCube).getItem()).getUnchargedItem(tier); + ItemStack itemstack = ((ItemBlockEnergyCube)new ItemStack(MekanismBlocks.EnergyCube).getItem()).getUnchargedItem(tier); return itemstack; } @@ -380,7 +382,7 @@ public final class MekanismUtils */ public static ItemStack getEmptyGasTank() { - ItemStack itemstack = ((ItemBlockGasTank)new ItemStack(Mekanism.GasTank).getItem()).getEmptyItem(); + ItemStack itemstack = ((ItemBlockGasTank)new ItemStack(MekanismBlocks.GasTank).getItem()).getEmptyItem(); return itemstack; } @@ -392,7 +394,7 @@ public final class MekanismUtils */ public static ItemStack getFactory(FactoryTier tier, RecipeType type) { - ItemStack itemstack = new ItemStack(Mekanism.MachineBlock, 1, 5+tier.ordinal()); + ItemStack itemstack = new ItemStack(MekanismBlocks.MachineBlock, 1, 5+tier.ordinal()); ((IFactory)itemstack.getItem()).setRecipeType(type.ordinal(), itemstack); return itemstack; } @@ -607,7 +609,7 @@ public final class MekanismUtils */ public static int getTicks(IUpgradeTile mgmt, int def) { - return (int)(def * Math.pow(Mekanism.maxUpgradeMultiplier, (float)-mgmt.getComponent().getUpgrades(Upgrade.SPEED)/(float)Upgrade.SPEED.getMax())); + return (int)(def * Math.pow(general.maxUpgradeMultiplier, (float)-mgmt.getComponent().getUpgrades(Upgrade.SPEED)/(float)Upgrade.SPEED.getMax())); } /** @@ -618,7 +620,7 @@ public final class MekanismUtils */ public static double getEnergyPerTick(IUpgradeTile mgmt, double def) { - return def * Math.pow(Mekanism.maxUpgradeMultiplier, (2*mgmt.getComponent().getUpgrades(Upgrade.SPEED)-(float)mgmt.getComponent().getUpgrades(Upgrade.ENERGY))/(float)Upgrade.SPEED.getMax()); + return def * Math.pow(general.maxUpgradeMultiplier, (2*mgmt.getComponent().getUpgrades(Upgrade.SPEED)-(float)mgmt.getComponent().getUpgrades(Upgrade.ENERGY))/(float)Upgrade.SPEED.getMax()); } /** @@ -629,7 +631,7 @@ public final class MekanismUtils */ public static double getMaxEnergy(IUpgradeTile mgmt, double def) { - return def * Math.pow(Mekanism.maxUpgradeMultiplier, (float)mgmt.getComponent().getUpgrades(Upgrade.ENERGY)/(float)Upgrade.ENERGY.getMax()); + return def * Math.pow(general.maxUpgradeMultiplier, (float)mgmt.getComponent().getUpgrades(Upgrade.ENERGY)/(float)Upgrade.ENERGY.getMax()); } /** @@ -642,7 +644,7 @@ public final class MekanismUtils { Map upgrades = Upgrade.buildMap(itemStack.stackTagCompound); float numUpgrades = upgrades.get(Upgrade.ENERGY) == null ? 0 : (float)upgrades.get(Upgrade.ENERGY); - return def * Math.pow(Mekanism.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax()); + return def * Math.pow(general.maxUpgradeMultiplier, numUpgrades/(float)Upgrade.ENERGY.getMax()); } /** @@ -655,7 +657,7 @@ public final class MekanismUtils */ public static void makeBoundingBlock(World world, int x, int y, int z, Coord4D orig) { - world.setBlock(x, y, z, Mekanism.BoundingBlock); + world.setBlock(x, y, z, MekanismBlocks.BoundingBlock); if(!world.isRemote) { @@ -673,7 +675,7 @@ public final class MekanismUtils */ public static void makeAdvancedBoundingBlock(World world, int x, int y, int z, Coord4D orig) { - world.setBlock(x, y, z, Mekanism.BoundingBlock, 1, 0); + world.setBlock(x, y, z, MekanismBlocks.BoundingBlock, 1, 0); if(!world.isRemote) { @@ -695,7 +697,7 @@ public final class MekanismUtils world.func_147479_m(x, y, z); } - if(!(world.getTileEntity(x, y, z) instanceof IActiveState) || ((IActiveState)world.getTileEntity(x, y, z)).lightUpdate() && Mekanism.machineEffects) + if(!(world.getTileEntity(x, y, z) instanceof IActiveState) || ((IActiveState)world.getTileEntity(x, y, z)).lightUpdate() && general.machineEffects) { updateAllLightTypes(world, x, y, z); } @@ -1161,16 +1163,16 @@ public final class MekanismUtils return localize("gui.infinite"); } - switch(Mekanism.activeType) + switch(general.activeType) { case J: - return EnergyDisplay.getDisplayShort(energy, ElectricUnit.JOULES); + return EnergyUtil.getDisplayShort(energy, ElectricUnit.JOULES); case RF: - return EnergyDisplay.getDisplayShort(energy*Mekanism.TO_TE, ElectricUnit.REDSTONE_FLUX, 0); + return EnergyUtil.getDisplayShort(energy * general.TO_TE, ElectricUnit.REDSTONE_FLUX, 0); case EU: - return EnergyDisplay.getDisplayShort(energy*Mekanism.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0); + return EnergyUtil.getDisplayShort(energy * general.TO_IC2, ElectricUnit.ELECTRICAL_UNITS, 0); case MJ: - return EnergyDisplay.getDisplayShort(energy*Mekanism.TO_BC, ElectricUnit.MINECRAFT_JOULES); + return EnergyUtil.getDisplayShort(energy * general.TO_BC, ElectricUnit.MINECRAFT_JOULES); } return "error"; diff --git a/src/main/java/mekanism/common/util/MinerUtils.java b/src/main/java/mekanism/common/util/MinerUtils.java index c51edadb6..31d3ecc23 100644 --- a/src/main/java/mekanism/common/util/MinerUtils.java +++ b/src/main/java/mekanism/common/util/MinerUtils.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/mekanism/common/util/TransporterUtils.java b/src/main/java/mekanism/common/util/TransporterUtils.java index e1ee78343..9c79b2c8b 100644 --- a/src/main/java/mekanism/common/util/TransporterUtils.java +++ b/src/main/java/mekanism/common/util/TransporterUtils.java @@ -5,7 +5,7 @@ import java.util.List; import mekanism.api.Coord4D; import mekanism.api.EnumColor; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.transmitters.IGridTransmitter; import mekanism.common.ILogisticalTransporter; import mekanism.common.tile.TileEntityLogisticalSorter; diff --git a/src/main/java/mekanism/common/voice/VoiceServerManager.java b/src/main/java/mekanism/common/voice/VoiceServerManager.java index c933f4672..eac64775d 100644 --- a/src/main/java/mekanism/common/voice/VoiceServerManager.java +++ b/src/main/java/mekanism/common/voice/VoiceServerManager.java @@ -6,6 +6,7 @@ import java.net.SocketException; import java.util.HashSet; import java.util.Set; +import mekanism.api.MekanismConfig.general; import mekanism.common.Mekanism; public class VoiceServerManager @@ -26,7 +27,7 @@ public class VoiceServerManager try { running = true; - serverSocket = new ServerSocket(Mekanism.VOICE_PORT); + serverSocket = new ServerSocket(general.VOICE_PORT); (listenThread = new ListenThread()).start(); } catch(Exception e) {} } diff --git a/src/main/java/mekanism/common/world/GenHandler.java b/src/main/java/mekanism/common/world/GenHandler.java index 741ce5960..487353a5a 100644 --- a/src/main/java/mekanism/common/world/GenHandler.java +++ b/src/main/java/mekanism/common/world/GenHandler.java @@ -2,7 +2,9 @@ package mekanism.common.world; import java.util.Random; -import mekanism.common.Mekanism; +import mekanism.api.MekanismConfig.general; +import mekanism.common.MekanismBlocks; + import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraft.world.chunk.IChunkProvider; @@ -18,31 +20,31 @@ public class GenHandler implements IWorldGenerator { if(!(chunkGenerator instanceof ChunkProviderHell) && !(chunkGenerator instanceof ChunkProviderEnd)) { - for(int i = 0; i < Mekanism.osmiumPerChunk; i++) + for(int i = 0; i < general.osmiumPerChunk; 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); + new WorldGenMinable(MekanismBlocks.OreBlock, 0, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); } - for(int i = 0; i < Mekanism.copperPerChunk; i++) + for(int i = 0; i < general.copperPerChunk; 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); + new WorldGenMinable(MekanismBlocks.OreBlock, 1, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); } - for(int i = 0; i < Mekanism.tinPerChunk; i++) + for(int i = 0; i < general.tinPerChunk; 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); + new WorldGenMinable(MekanismBlocks.OreBlock, 2, 8, Blocks.stone).generate(world, random, randPosX, randPosY, randPosZ); } - for(int i = 0; i < Mekanism.saltPerChunk; i++) + for(int i = 0; i < general.saltPerChunk; i++) { int randPosX = (chunkX*16) + random.nextInt(16); int randPosZ = (chunkZ*16) + random.nextInt(16); diff --git a/src/main/java/mekanism/common/world/WorldGenSalt.java b/src/main/java/mekanism/common/world/WorldGenSalt.java index a33fc2b5d..4793e945d 100644 --- a/src/main/java/mekanism/common/world/WorldGenSalt.java +++ b/src/main/java/mekanism/common/world/WorldGenSalt.java @@ -2,7 +2,8 @@ package mekanism.common.world; import java.util.Random; -import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -17,7 +18,7 @@ public class WorldGenSalt extends WorldGenerator public WorldGenSalt(int blockNum) { - blockGen = Mekanism.SaltBlock; + blockGen = MekanismBlocks.SaltBlock; numberOfBlocks = blockNum; } @@ -45,7 +46,7 @@ public class WorldGenSalt extends WorldGenerator { Block block = world.getBlock(xPos, yPos, zPos); - if(block == Blocks.dirt || block == Blocks.clay || block == Mekanism.SaltBlock) + if(block == Blocks.dirt || block == Blocks.clay || block == MekanismBlocks.SaltBlock) { world.setBlock(xPos, yPos, zPos, blockGen, 0, 2); } diff --git a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java index 90568aff2..77cb9639b 100644 --- a/src/main/java/mekanism/generators/client/BlockRenderingHandler.java +++ b/src/main/java/mekanism/generators/client/BlockRenderingHandler.java @@ -9,7 +9,7 @@ import mekanism.generators.client.model.ModelHeatGenerator; import mekanism.generators.client.model.ModelGasGenerator; import mekanism.generators.client.model.ModelSolarGenerator; import mekanism.generators.client.model.ModelWindTurbine; -import mekanism.generators.common.MekanismGenerators; +import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.block.BlockGenerator.GeneratorType; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -38,7 +38,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler GL11.glPushMatrix(); GL11.glRotatef(90F, 0.0F, 1.0F, 0.0F); - if(block == MekanismGenerators.Generator) + if(block == GeneratorsBlocks.Generator) { if(metadata == GeneratorType.BIO_GENERATOR.meta) { @@ -100,7 +100,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler @Override public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - if(block == MekanismGenerators.Generator) + if(block == GeneratorsBlocks.Generator) { int metadata = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java index 12d3ca377..226aa2b65 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiBioGenerator.java @@ -2,7 +2,8 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; @@ -13,7 +14,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerBioGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; import net.minecraft.entity.player.InventoryPlayer; @@ -39,7 +39,7 @@ public class GuiBioGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? MekanismGenerators.bioGeneration : 0) + "/t", + "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.bioGeneration : 0) + "/t", "Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), "Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java index 511196e2b..39435bebd 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiGasGenerator.java @@ -2,7 +2,7 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; diff --git a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java index a2264d7dd..c7be00746 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiHeatGenerator.java @@ -2,7 +2,8 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge; @@ -16,7 +17,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerHeatGenerator; import mekanism.generators.common.tile.TileEntityHeatGenerator; import net.minecraft.entity.player.InventoryPlayer; @@ -43,7 +43,7 @@ public class GuiHeatGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? MekanismGenerators.heatGeneration : tileEntity.getBoost()) + "/t", + "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.heatGeneration : tileEntity.getBoost()) + "/t", "Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), "Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java index 17c7e0eba..c4ba6e8eb 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java +++ b/src/main/java/mekanism/generators/client/gui/GuiNeutronCapture.java @@ -2,7 +2,7 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; @@ -14,8 +14,6 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerNeutronCapture; -import mekanism.generators.common.inventory.container.ContainerReactorController; -import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorNeutronCapture; import net.minecraft.entity.player.InventoryPlayer; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java index 9700acffc..52ff33b7b 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorController.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorController.java @@ -4,19 +4,10 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; -import mekanism.api.gas.GasTank; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; -import mekanism.client.gui.GuiFluidGauge; -import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; -import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; -import mekanism.client.gui.GuiNumberGauge; -import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiSlot; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.client.sound.SoundHandler; @@ -27,10 +18,7 @@ import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; -import net.minecraft.block.BlockStaticLiquid; import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.FluidTank; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java index 06f31aa01..c79e448d5 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorFuel.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import mekanism.api.Coord4D; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; @@ -22,7 +22,6 @@ import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import mekanism.generators.common.tile.reactor.TileEntityReactorController; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; import net.minecraft.entity.player.InventoryPlayer; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java index e8d5aa58f..5aa6d2db3 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java +++ b/src/main/java/mekanism/generators/client/gui/GuiReactorHeat.java @@ -2,31 +2,24 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.util.ListUtils; import mekanism.api.energy.IStrictEnergyStorage; -import mekanism.api.gas.GasTank; import mekanism.client.gui.GuiEnergyGauge; import mekanism.client.gui.GuiEnergyGauge.IEnergyInfoHandler; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiFluidGauge; import mekanism.client.gui.GuiFluidGauge.IFluidInfoHandler; -import mekanism.client.gui.GuiGasGauge; -import mekanism.client.gui.GuiGasGauge.IGasInfoHandler; import mekanism.client.gui.GuiGauge.Type; import mekanism.client.gui.GuiMekanism; import mekanism.client.gui.GuiNumberGauge; import mekanism.client.gui.GuiNumberGauge.INumberInfoHandler; -import mekanism.client.gui.GuiPowerBar; import mekanism.client.gui.GuiProgress; import mekanism.client.gui.GuiProgress.IProgressInfoHandler; import mekanism.client.gui.GuiProgress.ProgressBar; -import mekanism.client.gui.GuiSlot; -import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerNull; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.inventory.container.ContainerReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import net.minecraft.block.BlockStaticLiquid; diff --git a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java index 4d0546c00..b020e96d4 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java +++ b/src/main/java/mekanism/generators/client/gui/GuiSolarGenerator.java @@ -2,7 +2,8 @@ package mekanism.generators.client.gui; import java.util.List; -import mekanism.api.ListUtils; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; @@ -13,7 +14,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerSolarGenerator; import mekanism.generators.common.tile.TileEntitySolarGenerator; import net.minecraft.entity.player.InventoryPlayer; @@ -39,7 +39,7 @@ public class GuiSolarGenerator extends GuiMekanism public List getInfo() { return ListUtils.asList( - "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? MekanismGenerators.solarGeneration : 0) + "/t", + "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.solarGeneration : 0) + "/t", "Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), "Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } diff --git a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java index eb8204a26..b095e2141 100644 --- a/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java +++ b/src/main/java/mekanism/generators/client/gui/GuiWindTurbine.java @@ -3,7 +3,8 @@ package mekanism.generators.client.gui; import java.util.List; import mekanism.api.EnumColor; -import mekanism.api.ListUtils; +import mekanism.api.MekanismConfig.generators; +import mekanism.api.util.ListUtils; import mekanism.client.gui.GuiEnergyInfo; import mekanism.client.gui.GuiEnergyInfo.IInfoHandler; import mekanism.client.gui.GuiMekanism; @@ -14,7 +15,6 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; -import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.inventory.container.ContainerWindTurbine; import mekanism.generators.common.tile.TileEntityWindTurbine; import net.minecraft.entity.player.InventoryPlayer; @@ -40,7 +40,7 @@ public class GuiWindTurbine extends GuiMekanism public List getInfo() { return ListUtils.asList( - "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? MekanismGenerators.windGeneration*tileEntity.getMultiplier() : 0) + "/t", + "Producing: " + MekanismUtils.getEnergyDisplay(tileEntity.isActive ? generators.windGeneration*tileEntity.getMultiplier() : 0) + "/t", "Storing: " + MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), "Max Output: " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t"); } @@ -57,7 +57,7 @@ public class GuiWindTurbine extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 96) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(MekanismUtils.localize("gui.power") + ": " + MekanismGenerators.windGeneration*tileEntity.getMultiplier(), 51, 35, 0x00CD00); + fontRendererObj.drawString(MekanismUtils.localize("gui.power") + ": " + generators.windGeneration*tileEntity.getMultiplier(), 51, 35, 0x00CD00); fontRendererObj.drawString(MekanismUtils.localize("gui.out") + ": " + MekanismUtils.getEnergyDisplay(tileEntity.getMaxOutput()) + "/t", 51, 44, 0x00CD00); int size = 44; diff --git a/src/main/java/mekanism/generators/common/GeneratorsBlocks.java b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java new file mode 100644 index 000000000..853a767fb --- /dev/null +++ b/src/main/java/mekanism/generators/common/GeneratorsBlocks.java @@ -0,0 +1,16 @@ +package mekanism.generators.common; + +import mekanism.generators.common.block.BlockGenerator; +import mekanism.generators.common.block.BlockReactor; + +import net.minecraft.block.Block; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder("MekanismGenerators") +public class GeneratorsBlocks +{ + //Blocks + public static final Block Generator = new BlockGenerator().setBlockName("Generator"); + public static final Block Reactor = new BlockReactor().setBlockName("Reactor"); + public static final Block ReactorGlass = new BlockReactor().setBlockName("ReactorGlass"); +} diff --git a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java index 7171bac6c..a5b65ea90 100644 --- a/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java +++ b/src/main/java/mekanism/generators/common/GeneratorsCommonProxy.java @@ -1,5 +1,6 @@ package mekanism.generators.common; +import mekanism.api.MekanismConfig.generators; import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerNull; import mekanism.generators.common.inventory.container.ContainerBioGenerator; @@ -71,11 +72,11 @@ public class GeneratorsCommonProxy */ public void loadConfiguration() { - MekanismGenerators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D); - MekanismGenerators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D); - MekanismGenerators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D); - MekanismGenerators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D); - MekanismGenerators.windGeneration = Mekanism.configuration.get("generation", "WindGeneration", 60D).getDouble(60D); + generators.advancedSolarGeneration = Mekanism.configuration.get("generation", "AdvancedSolarGeneration", 300D).getDouble(300D); + generators.bioGeneration = Mekanism.configuration.get("generation", "BioGeneration", 350D).getDouble(350D); + generators.heatGeneration = Mekanism.configuration.get("generation", "HeatGeneration", 150D).getDouble(150D); + generators.solarGeneration = Mekanism.configuration.get("generation", "SolarGeneration", 50D).getDouble(50D); + generators.windGeneration = Mekanism.configuration.get("generation", "WindGeneration", 60D).getDouble(60D); if(Mekanism.configuration.hasChanged()) Mekanism.configuration.save(); diff --git a/src/main/java/mekanism/generators/common/GeneratorsItems.java b/src/main/java/mekanism/generators/common/GeneratorsItems.java new file mode 100644 index 000000000..0ffa09df8 --- /dev/null +++ b/src/main/java/mekanism/generators/common/GeneratorsItems.java @@ -0,0 +1,13 @@ +package mekanism.generators.common; + +import mekanism.common.item.ItemMekanism; + +import net.minecraft.item.Item; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder("MekanismGenerators") +public class GeneratorsItems +{ + //Items + public static final Item SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel");; +} diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index 4f41f93af..b52060f78 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -4,11 +4,15 @@ import io.netty.buffer.ByteBuf; import java.io.IOException; +import mekanism.api.MekanismConfig.general; +import mekanism.api.MekanismConfig.generators; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.common.FuelHandler; import mekanism.common.IModule; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; +import mekanism.common.MekanismItems; import mekanism.common.Version; import mekanism.common.item.ItemMekanism; import mekanism.common.recipe.MekanismRecipe; @@ -16,10 +20,9 @@ import mekanism.generators.common.block.BlockGenerator; import mekanism.generators.common.block.BlockReactor; import mekanism.generators.common.item.ItemBlockGenerator; import mekanism.generators.common.item.ItemBlockReactor; -import net.minecraft.block.Block; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraftforge.fluids.Fluid; @@ -53,21 +56,6 @@ public class MekanismGenerators implements IModule /** MekanismGenerators version number */ public static Version versionNumber = new Version(8, 0, 0); - - //Items - public static Item SolarPanel; - - //Blocks - public static Block Generator; - public static Block Reactor; - public static Block ReactorGlass; - - //Generation Configuration - public static double advancedSolarGeneration; - public static double bioGeneration; - public static double heatGeneration; - public static double solarGeneration; - public static double windGeneration; @EventHandler public void postInit(FMLPostInitializationEvent event) @@ -84,7 +72,7 @@ public class MekanismGenerators implements IModule } } - IronEngineFuel.addFuel("ethene", (float) (240 * Mekanism.TO_BC), 40 * FluidContainerRegistry.BUCKET_VOLUME); + IronEngineFuel.addFuel("ethene", (float) (240 * general.TO_BC), 40 * FluidContainerRegistry.BUCKET_VOLUME); } } @@ -107,7 +95,7 @@ public class MekanismGenerators implements IModule proxy.registerRenderInformation(); //Load this module - addBlocks(); + registerBlocks(); addItems(); addRecipes(); @@ -117,51 +105,43 @@ public class MekanismGenerators implements IModule public void addRecipes() { - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 0), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 0), new Object[] { "III", "WOW", "CFC", Character.valueOf('I'), "ingotIron", Character.valueOf('C'), "ingotCopper", Character.valueOf('O'), "ingotOsmium", Character.valueOf('F'), Blocks.furnace, Character.valueOf('W'), Blocks.planks })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 1), new Object[] { - "SSS", "AIA", "PEP", Character.valueOf('S'), SolarPanel, Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('I'), Items.iron_ingot, Character.valueOf('P'), "dustOsmium", Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem() + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 1), new Object[] { + "SSS", "AIA", "PEP", Character.valueOf('S'), GeneratorsItems.SolarPanel, Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), Items.iron_ingot, Character.valueOf('P'), "dustOsmium", Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem() })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 5), new Object[] { - "SES", "SES", "III", Character.valueOf('S'), new ItemStack(Generator, 1, 1), Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('I'), Items.iron_ingot + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 5), new Object[] { + "SES", "SES", "III", Character.valueOf('S'), new ItemStack(GeneratorsBlocks.Generator, 1, 1), Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 4), new Object[] { - "RER", "BCB", "NEN", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('B'), Mekanism.BioFuel, Character.valueOf('C'), "circuitBasic", Character.valueOf('N'), Items.iron_ingot + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 4), new Object[] { + "RER", "BCB", "NEN", Character.valueOf('R'), Items.redstone, Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('B'), MekanismItems.BioFuel, Character.valueOf('C'), "circuitBasic", Character.valueOf('N'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 3), new Object[] { - "PEP", "ICI", "PEP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('E'), Mekanism.EnrichedAlloy, Character.valueOf('I'), new ItemStack(Mekanism.BasicBlock, 1, 8), Character.valueOf('C'), Mekanism.ElectrolyticCore + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 3), new Object[] { + "PEP", "ICI", "PEP", Character.valueOf('P'), "ingotOsmium", Character.valueOf('E'), MekanismItems.EnrichedAlloy, Character.valueOf('I'), new ItemStack(MekanismBlocks.BasicBlock, 1, 8), Character.valueOf('C'), MekanismItems.ElectrolyticCore })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SolarPanel), new Object[] { - "GGG", "RAR", "PPP", Character.valueOf('G'), Blocks.glass_pane, Character.valueOf('R'), Items.redstone, Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('P'), "ingotOsmium" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsItems.SolarPanel), new Object[] { + "GGG", "RAR", "PPP", Character.valueOf('G'), Blocks.glass_pane, Character.valueOf('R'), Items.redstone, Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('P'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(Generator, 1, 6), new Object[] { - " O ", "OAO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('A'), Mekanism.EnrichedAlloy, Character.valueOf('E'), Mekanism.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic" + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GeneratorsBlocks.Generator, 1, 6), new Object[] { + " O ", "OAO", "ECE", Character.valueOf('O'), "ingotOsmium", Character.valueOf('A'), MekanismItems.EnrichedAlloy, Character.valueOf('E'), MekanismItems.EnergyTablet.getUnchargedItem(), Character.valueOf('C'), "circuitBasic" })); - FuelHandler.addGas(GasRegistry.getGas("ethene"), 40, Mekanism.FROM_H2 + bioGeneration * 80); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus + FuelHandler.addGas(GasRegistry.getGas("ethene"), 40, general.FROM_H2 + generators.bioGeneration * 80); //1mB hydrogen + 2*bioFuel/tick*200ticks/100mB * 20x efficiency bonus } - public void addBlocks() + public void registerBlocks() { - //Declarations - Generator = new BlockGenerator().setBlockName("Generator"); - Reactor = new BlockReactor().setBlockName("Reactor"); - ReactorGlass = new BlockReactor().setBlockName("ReactorGlass"); - - GameRegistry.registerBlock(Generator, ItemBlockGenerator.class, "Generator"); - GameRegistry.registerBlock(Reactor, ItemBlockReactor.class, "Reactor"); - GameRegistry.registerBlock(ReactorGlass, ItemBlockReactor.class, "ReactorGlass"); + GameRegistry.registerBlock(GeneratorsBlocks.Generator, ItemBlockGenerator.class, "Generator"); + GameRegistry.registerBlock(GeneratorsBlocks.Reactor, ItemBlockReactor.class, "Reactor"); + GameRegistry.registerBlock(GeneratorsBlocks.ReactorGlass, ItemBlockReactor.class, "ReactorGlass"); } public void addItems() { - //Declarations - SolarPanel = new ItemMekanism().setUnlocalizedName("SolarPanel"); - //Registrations - GameRegistry.registerItem(SolarPanel, "SolarPanel"); + GameRegistry.registerItem(GeneratorsItems.SolarPanel, "SolarPanel"); } @Override @@ -179,21 +159,21 @@ public class MekanismGenerators implements IModule @Override public void writeConfig(ByteBuf dataStream) throws IOException { - dataStream.writeDouble(advancedSolarGeneration); - dataStream.writeDouble(bioGeneration); - dataStream.writeDouble(heatGeneration); - dataStream.writeDouble(solarGeneration); - dataStream.writeDouble(windGeneration); + dataStream.writeDouble(generators.advancedSolarGeneration); + dataStream.writeDouble(generators.bioGeneration); + dataStream.writeDouble(generators.heatGeneration); + dataStream.writeDouble(generators.solarGeneration); + dataStream.writeDouble(generators.windGeneration); } @Override public void readConfig(ByteBuf dataStream) throws IOException { - advancedSolarGeneration = dataStream.readDouble(); - bioGeneration = dataStream.readDouble(); - heatGeneration = dataStream.readDouble(); - solarGeneration = dataStream.readDouble(); - windGeneration = dataStream.readDouble(); + generators.advancedSolarGeneration = dataStream.readDouble(); + generators.bioGeneration = dataStream.readDouble(); + generators.heatGeneration = dataStream.readDouble(); + generators.solarGeneration = dataStream.readDouble(); + generators.windGeneration = dataStream.readDouble(); } @SubscribeEvent diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 6e29d2b4c..1420b06be 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -3,6 +3,7 @@ package mekanism.generators.common.block; import java.util.List; import java.util.Random; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.common.IActiveState; import mekanism.common.IBoundingBlock; @@ -16,6 +17,7 @@ import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; import mekanism.generators.client.GeneratorsClientProxy; +import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; import mekanism.generators.common.tile.TileEntityAdvancedSolarGenerator; import mekanism.generators.common.tile.TileEntityBioGenerator; @@ -340,7 +342,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds } } - if(metadata == 3 && entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().isItemEqual(new ItemStack(MekanismGenerators.Generator, 1, 2))) + if(metadata == 3 && entityplayer.getCurrentEquippedItem() != null && entityplayer.getCurrentEquippedItem().isItemEqual(new ItemStack(GeneratorsBlocks.Generator, 1, 2))) { if(((TileEntityBasicBlock)world.getTileEntity(x, y, z)).facing != facing) { @@ -426,7 +428,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds } @Override - public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) + public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest) { if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) { @@ -449,7 +451,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { TileEntityElectricBlock tileEntity = (TileEntityElectricBlock)world.getTileEntity(x, y, z); - ItemStack itemStack = new ItemStack(MekanismGenerators.Generator, 1, world.getBlockMetadata(x, y, z)); + ItemStack itemStack = new ItemStack(GeneratorsBlocks.Generator, 1, world.getBlockMetadata(x, y, z)); if(tileEntity == null) { @@ -533,7 +535,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds { HEAT_GENERATOR(0, "HeatGenerator", 0, 160000, TileEntityHeatGenerator.class, true), SOLAR_GENERATOR(1, "SolarGenerator", 1, 96000, TileEntitySolarGenerator.class, true), - GAS_GENERATOR(3, "GasGenerator", 3, Mekanism.FROM_H2*100, TileEntityGasGenerator.class, true), + GAS_GENERATOR(3, "GasGenerator", 3, general.FROM_H2*100, TileEntityGasGenerator.class, true), BIO_GENERATOR(4, "BioGenerator", 4, 160000, TileEntityBioGenerator.class, true), ADVANCED_SOLAR_GENERATOR(5, "AdvancedSolarGenerator", 1, 200000, TileEntityAdvancedSolarGenerator.class, true), WIND_TURBINE(6, "WindTurbine", 5, 200000, TileEntityWindTurbine.class, true); @@ -583,7 +585,7 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds public ItemStack getStack() { - return new ItemStack(MekanismGenerators.Generator, 1, meta); + return new ItemStack(GeneratorsBlocks.Generator, 1, meta); } @Override diff --git a/src/main/java/mekanism/generators/common/block/BlockReactor.java b/src/main/java/mekanism/generators/common/block/BlockReactor.java index 5874ef5c3..053d603fb 100644 --- a/src/main/java/mekanism/generators/common/block/BlockReactor.java +++ b/src/main/java/mekanism/generators/common/block/BlockReactor.java @@ -7,8 +7,8 @@ import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.MekanismUtils; +import mekanism.generators.common.GeneratorsBlocks; import mekanism.generators.common.MekanismGenerators; -import mekanism.generators.common.tile.reactor.TileEntityReactorBlock; import mekanism.generators.common.tile.reactor.TileEntityReactorController; import mekanism.generators.common.tile.reactor.TileEntityReactorFrame; import mekanism.generators.common.tile.reactor.TileEntityReactorGlass; @@ -49,7 +49,7 @@ public class BlockReactor extends BlockContainer @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister register) { - if(this == MekanismGenerators.Reactor) + if(this == GeneratorsBlocks.Reactor) { icons[0][0] = register.registerIcon("mekanism:ReactorControllerOff"); icons[0][1] = register.registerIcon("mekanism:ReactorControllerOn"); @@ -58,7 +58,7 @@ public class BlockReactor extends BlockContainer icons[2][0] = register.registerIcon("mekanism:ReactorNeutronCapture"); icons[3][0] = register.registerIcon("mekanism:ReactorPort"); } - else if(this == MekanismGenerators.ReactorGlass) + else if(this == GeneratorsBlocks.ReactorGlass) { icons[0][0] = register.registerIcon("mekanism:ReactorGlass"); icons[1][0] = register.registerIcon("mekanism:ReactorLaserFocus"); @@ -69,7 +69,7 @@ public class BlockReactor extends BlockContainer @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - if(this == MekanismGenerators.Reactor) + if(this == GeneratorsBlocks.Reactor) { if(meta == 0) { @@ -79,7 +79,7 @@ public class BlockReactor extends BlockContainer return icons[meta][0]; } } - else if(this == MekanismGenerators.ReactorGlass) + else if(this == GeneratorsBlocks.ReactorGlass) { return icons[meta][0]; } @@ -93,7 +93,7 @@ public class BlockReactor extends BlockContainer { int metadata = world.getBlockMetadata(x, y, z); - if(this == MekanismGenerators.Reactor) + if(this == GeneratorsBlocks.Reactor) { if(metadata == 0) { @@ -109,7 +109,7 @@ public class BlockReactor extends BlockContainer return icons[metadata][0]; } } - else if(this == MekanismGenerators.ReactorGlass) + else if(this == GeneratorsBlocks.ReactorGlass) { return icons[metadata][0]; } @@ -238,7 +238,7 @@ public class BlockReactor extends BlockContainer @Override public int getRenderBlockPass() { - return this == MekanismGenerators.Reactor ? 0 : 1; + return this == GeneratorsBlocks.Reactor ? 0 : 1; } @Override @@ -256,12 +256,12 @@ public class BlockReactor extends BlockContainer public static enum ReactorBlockType { - CONTROLLER(MekanismGenerators.Reactor, 0, "ReactorController", 10, TileEntityReactorController.class), - FRAME(MekanismGenerators.Reactor, 1, "ReactorFrame", -1, TileEntityReactorFrame.class), - NEUTRON_CAPTURE(MekanismGenerators.Reactor, 2, "ReactorNeutronCapturePlate", 13, TileEntityReactorNeutronCapture.class), - PORT(MekanismGenerators.Reactor, 3, "ReactorInOutPort", -1, TileEntityReactorPort.class), - GLASS(MekanismGenerators.ReactorGlass, 0, "ReactorGlass", -1, TileEntityReactorGlass.class), - LASER_FOCUS_MATRIX(MekanismGenerators.ReactorGlass, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class); + CONTROLLER(GeneratorsBlocks.Reactor, 0, "ReactorController", 10, TileEntityReactorController.class), + FRAME(GeneratorsBlocks.Reactor, 1, "ReactorFrame", -1, TileEntityReactorFrame.class), + NEUTRON_CAPTURE(GeneratorsBlocks.Reactor, 2, "ReactorNeutronCapturePlate", 13, TileEntityReactorNeutronCapture.class), + PORT(GeneratorsBlocks.Reactor, 3, "ReactorInOutPort", -1, TileEntityReactorPort.class), + GLASS(GeneratorsBlocks.ReactorGlass, 0, "ReactorGlass", -1, TileEntityReactorGlass.class), + LASER_FOCUS_MATRIX(GeneratorsBlocks.ReactorGlass, 1, "ReactorLaserFocusMatrix", -1, TileEntityReactorLaserFocusMatrix.class); public Block typeBlock; public int meta; diff --git a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java index aebb87527..f17831f86 100644 --- a/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java +++ b/src/main/java/mekanism/generators/common/item/ItemBlockGenerator.java @@ -6,12 +6,12 @@ import ic2.api.item.ISpecialElectricItem; import java.util.List; import mekanism.api.EnumColor; +import mekanism.api.MekanismConfig.general; import mekanism.api.energy.IEnergizedItem; import mekanism.client.MekanismKeyHandler; import mekanism.common.ISustainedData; import mekanism.common.ISustainedInventory; import mekanism.common.ISustainedTank; -import mekanism.common.Mekanism; import mekanism.common.integration.IC2ItemManager; import mekanism.common.tile.TileEntityElectricBlock; import mekanism.common.util.LangUtils; @@ -369,14 +369,14 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(canReceive(theItem)) { double energyNeeded = getMaxEnergy(theItem)-getEnergy(theItem); - double toReceive = Math.min(energy*Mekanism.FROM_TE, energyNeeded); + double toReceive = Math.min(energy* general.FROM_TE, energyNeeded); if(!simulate) { setEnergy(theItem, getEnergy(theItem) + toReceive); } - return (int)Math.round(toReceive*Mekanism.TO_TE); + return (int)Math.round(toReceive* general.TO_TE); } return 0; @@ -388,14 +388,14 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp if(canSend(theItem)) { double energyRemaining = getEnergy(theItem); - double toSend = Math.min((energy*Mekanism.FROM_TE), energyRemaining); + double toSend = Math.min((energy* general.FROM_TE), energyRemaining); if(!simulate) { setEnergy(theItem, getEnergy(theItem) - toSend); } - return (int)Math.round(toSend*Mekanism.TO_TE); + return (int)Math.round(toSend* general.TO_TE); } return 0; @@ -404,13 +404,13 @@ public class ItemBlockGenerator extends ItemBlock implements IEnergizedItem, ISp @Override public int getEnergyStored(ItemStack theItem) { - return (int)(getEnergy(theItem)*Mekanism.TO_TE); + return (int)(getEnergy(theItem)* general.TO_TE); } @Override public int getMaxEnergyStored(ItemStack theItem) { - return (int)(getMaxEnergy(theItem)*Mekanism.TO_TE); + return (int)(getMaxEnergy(theItem)* general.TO_TE); } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java index 4533b155d..6acb194e3 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityAdvancedSolarGenerator.java @@ -4,17 +4,18 @@ import java.util.EnumSet; import mekanism.api.Coord4D; import mekanism.api.ISalinationSolar; +import mekanism.api.MekanismConfig.generators; import mekanism.common.IBoundingBlock; import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.MekanismGenerators; + import net.minecraftforge.common.util.ForgeDirection; public class TileEntityAdvancedSolarGenerator extends TileEntitySolarGenerator implements IBoundingBlock, ISalinationSolar { public TileEntityAdvancedSolarGenerator() { - super("AdvancedSolarGenerator", 200000, MekanismGenerators.advancedSolarGeneration*2); - GENERATION_RATE = MekanismGenerators.advancedSolarGeneration; + super("AdvancedSolarGenerator", 200000, generators.advancedSolarGeneration*2); + GENERATION_RATE = generators.advancedSolarGeneration; } @Override diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java index 33170f7a6..46fae1ae7 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityBioGenerator.java @@ -5,13 +5,15 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; +import mekanism.api.MekanismConfig.generators; import mekanism.client.sound.TileSound; import mekanism.common.FluidSlot; import mekanism.common.ISustainedData; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.MekanismGenerators; + import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -38,7 +40,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui public TileEntityBioGenerator() { - super("BioGenerator", 160000, MekanismGenerators.bioGeneration*2); + super("BioGenerator", 160000, generators.bioGeneration*2); inventory = new ItemStack[2]; } @@ -115,7 +117,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui } bioFuelSlot.setFluid(bioFuelSlot.fluidStored - 1); - setEnergy(electricityStored + MekanismGenerators.bioGeneration); + setEnergy(electricityStored + generators.bioGeneration); } else { if(!worldObj.isRemote) @@ -181,7 +183,7 @@ public class TileEntityBioGenerator extends TileEntityGenerator implements IFlui public int getFuel(ItemStack itemstack) { - return itemstack.getItem() == Mekanism.BioFuel ? 200 : 0; + return itemstack.getItem() == MekanismItems.BioFuel ? 200 : 0; } /** diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java index 61c38c3d4..549c26f80 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGasGenerator.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.MekanismConfig.general; import mekanism.api.gas.Gas; import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; @@ -38,7 +39,7 @@ public class TileEntityGasGenerator extends TileEntityGenerator implements IGasH public TileEntityGasGenerator() { - super("GasGenerator", Mekanism.FROM_H2*100, Mekanism.FROM_H2*2); + super("GasGenerator", general.FROM_H2*100, general.FROM_H2*2); inventory = new ItemStack[2]; fuelTank = new GasTank(MAX_GAS); } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java index ced442567..6f3522377 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityGenerator.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.EnumSet; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.general; import mekanism.client.sound.IHasSound; import mekanism.common.IActiveState; import mekanism.common.IRedstoneControl; @@ -153,7 +154,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem { Mekanism.packetHandler.sendToAll(new TileEntityMessage(Coord4D.get(this), getNetworkedData(new ArrayList()))); - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; clientActive = active; } } @@ -196,7 +197,7 @@ public abstract class TileEntityGenerator extends TileEntityElectricBlock implem if(updateDelay == 0 && clientActive != isActive) { - updateDelay = Mekanism.UPDATE_DELAY; + updateDelay = general.UPDATE_DELAY; isActive = clientActive; MekanismUtils.updateBlock(worldObj, xCoord, yCoord, zCoord); } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java index 690df00cf..36944b89f 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityHeatGenerator.java @@ -4,13 +4,14 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import mekanism.api.MekanismConfig.generators; import mekanism.api.lasers.ILaserReceptor; import mekanism.common.ISustainedData; import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.FluidContainerUtils; import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.MekanismGenerators; + import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -36,7 +37,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu public TileEntityHeatGenerator() { - super("HeatGenerator", 160000, MekanismGenerators.heatGeneration*2); + super("HeatGenerator", 160000, generators.heatGeneration*2); inventory = new ItemStack[2]; } @@ -115,7 +116,7 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements IFlu setActive(true); lavaTank.drain(10, true); - setEnergy(electricityStored + MekanismGenerators.heatGeneration); + setEnergy(electricityStored + generators.heatGeneration); } else { setActive(false); diff --git a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java index 45a642c26..0e1902132 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntitySolarGenerator.java @@ -5,10 +5,11 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; import java.util.EnumSet; +import mekanism.api.MekanismConfig.generators; import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.MekanismGenerators; + import micdoodle8.mods.galacticraft.api.world.ISolarLevel; import net.minecraft.item.ItemStack; import net.minecraft.world.biome.BiomeGenDesert; @@ -28,8 +29,8 @@ public class TileEntitySolarGenerator extends TileEntityGenerator public TileEntitySolarGenerator() { - super("SolarGenerator", 96000, MekanismGenerators.solarGeneration*2); - GENERATION_RATE = MekanismGenerators.solarGeneration; + super("SolarGenerator", 96000, generators.solarGeneration*2); + GENERATION_RATE = generators.solarGeneration; inventory = new ItemStack[1]; } diff --git a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java index f423f951b..4e1557c33 100644 --- a/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java +++ b/src/main/java/mekanism/generators/common/tile/TileEntityWindTurbine.java @@ -1,11 +1,12 @@ package mekanism.generators.common.tile; import mekanism.api.Coord4D; +import mekanism.api.MekanismConfig.generators; import mekanism.common.IBoundingBlock; import mekanism.common.Mekanism; import mekanism.common.util.ChargeUtils; import mekanism.common.util.MekanismUtils; -import mekanism.generators.common.MekanismGenerators; + import net.minecraft.item.ItemStack; import cpw.mods.fml.common.Optional.Method; import dan200.computercraft.api.lua.ILuaContext; @@ -18,7 +19,7 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound public TileEntityWindTurbine() { - super("WindTurbine", 200000, (MekanismGenerators.windGeneration*8)*2); + super("WindTurbine", 200000, (generators.windGeneration*8)*2); inventory = new ItemStack[1]; } @@ -34,7 +35,7 @@ public class TileEntityWindTurbine extends TileEntityGenerator implements IBound if(canOperate()) { setActive(true); - setEnergy(electricityStored + (MekanismGenerators.windGeneration*getMultiplier())); + setEnergy(electricityStored + (generators.windGeneration*getMultiplier())); } else { setActive(false); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index 3f62fdd45..02d432bed 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -4,21 +4,15 @@ import io.netty.buffer.ByteBuf; import java.io.IOException; +import mekanism.api.MekanismConfig.tools; import mekanism.common.IModule; import mekanism.common.Mekanism; import mekanism.common.Version; import mekanism.common.recipe.MekanismRecipe; -import mekanism.tools.item.ItemMekanismArmor; -import mekanism.tools.item.ItemMekanismAxe; -import mekanism.tools.item.ItemMekanismHoe; -import mekanism.tools.item.ItemMekanismPaxel; -import mekanism.tools.item.ItemMekanismPickaxe; -import mekanism.tools.item.ItemMekanismShovel; -import mekanism.tools.item.ItemMekanismSword; + import net.minecraft.entity.monster.EntitySkeleton; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemArmor.ArmorMaterial; import net.minecraft.item.ItemStack; @@ -70,88 +64,6 @@ public class MekanismTools implements IModule public static ArmorMaterial armorGLOWSTONE; public static ArmorMaterial armorSTEEL; - //Base Items - public static Item WoodPaxel; - public static Item StonePaxel; - public static Item IronPaxel; - public static Item DiamondPaxel; - public static Item GoldPaxel; - - //Glowstone Items - public static Item GlowstonePaxel; - public static Item GlowstonePickaxe; - public static Item GlowstoneAxe; - public static Item GlowstoneShovel; - public static Item GlowstoneHoe; - public static Item GlowstoneSword; - public static Item GlowstoneHelmet; - public static Item GlowstoneChestplate; - public static Item GlowstoneLeggings; - public static Item GlowstoneBoots; - - //Redstone Items - public static Item BronzePaxel; - public static Item BronzePickaxe; - public static Item BronzeAxe; - public static Item BronzeShovel; - public static Item BronzeHoe; - public static Item BronzeSword; - public static Item BronzeHelmet; - public static Item BronzeChestplate; - public static Item BronzeLeggings; - public static Item BronzeBoots; - - //Osmium Items - public static Item OsmiumPaxel; - public static Item OsmiumPickaxe; - public static Item OsmiumAxe; - public static Item OsmiumShovel; - public static Item OsmiumHoe; - public static Item OsmiumSword; - public static Item OsmiumHelmet; - public static Item OsmiumChestplate; - public static Item OsmiumLeggings; - public static Item OsmiumBoots; - - //Obsidian Items - public static Item ObsidianHelmet; - public static Item ObsidianChestplate; - public static Item ObsidianLeggings; - public static Item ObsidianBoots; - public static Item ObsidianPaxel; - public static Item ObsidianPickaxe; - public static Item ObsidianAxe; - public static Item ObsidianShovel; - public static Item ObsidianHoe; - public static Item ObsidianSword; - - //Lazuli Items - public static Item LazuliPaxel; - public static Item LazuliPickaxe; - public static Item LazuliAxe; - public static Item LazuliShovel; - public static Item LazuliHoe; - public static Item LazuliSword; - public static Item LazuliHelmet; - public static Item LazuliChestplate; - public static Item LazuliLeggings; - public static Item LazuliBoots; - - //Steel Items - public static Item SteelPaxel; - public static Item SteelPickaxe; - public static Item SteelAxe; - public static Item SteelShovel; - public static Item SteelHoe; - public static Item SteelSword; - public static Item SteelHelmet; - public static Item SteelChestplate; - public static Item SteelLeggings; - public static Item SteelBoots; - - //Tools Configuration - public static double armorSpawnRate; - @EventHandler public void init(FMLInitializationEvent event) { @@ -177,211 +89,211 @@ public class MekanismTools implements IModule { //Crafting Recipes //Base - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(WoodPaxel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.WoodPaxel, 1), new Object[] { "XYZ", " T ", " T ", Character.valueOf('X'), Items.wooden_axe, Character.valueOf('Y'), Items.wooden_pickaxe, Character.valueOf('Z'), Items.wooden_shovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(StonePaxel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.StonePaxel, 1), new Object[] { "XYZ", " T ", " T ", Character.valueOf('X'), Items.stone_axe, Character.valueOf('Y'), Items.stone_pickaxe, Character.valueOf('Z'), Items.stone_shovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(IronPaxel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.IronPaxel, 1), new Object[] { "XYZ", " T ", " T ", Character.valueOf('X'), Items.iron_axe, Character.valueOf('Y'), Items.iron_pickaxe, Character.valueOf('Z'), Items.iron_shovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(DiamondPaxel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.DiamondPaxel, 1), new Object[] { "XYZ", " T ", " T ", Character.valueOf('X'), Items.diamond_axe, Character.valueOf('Y'), Items.diamond_pickaxe, Character.valueOf('Z'), Items.diamond_shovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GoldPaxel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GoldPaxel, 1), new Object[] { "XYZ", " T ", " T ", Character.valueOf('X'), Items.golden_axe, Character.valueOf('Y'), Items.golden_pickaxe, Character.valueOf('Z'), Items.golden_shovel, Character.valueOf('T'), Items.stick })); //Obsidian - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianHelmet, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianChestplate, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianLeggings, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianBoots, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), "ingotRefinedObsidian" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianPaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), ObsidianAxe, Character.valueOf('Y'), ObsidianPickaxe, Character.valueOf('Z'), ObsidianShovel, Character.valueOf('T'), Items.stick + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianPaxel, 1), new Object[] { + "XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.ObsidianAxe, Character.valueOf('Y'), MekanismToolsItems.ObsidianPickaxe, Character.valueOf('Z'), MekanismToolsItems.ObsidianShovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianPickaxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianPickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianAxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianShovel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianHoe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianHoe, 1), new Object[] { "XX", " T", " T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(ObsidianSword, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.ObsidianSword, 1), new Object[] { "X", "X", "T", Character.valueOf('X'), "ingotRefinedObsidian", Character.valueOf('T'), Items.stick })); //Glowstone - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstonePaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), GlowstoneAxe, Character.valueOf('Y'), GlowstonePickaxe, Character.valueOf('Z'), GlowstoneShovel, Character.valueOf('T'), Items.stick + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstonePaxel, 1), new Object[] { + "XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.GlowstoneAxe, Character.valueOf('Y'), MekanismToolsItems.GlowstonePickaxe, Character.valueOf('Z'), MekanismToolsItems.GlowstoneShovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstonePickaxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstonePickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneAxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneShovel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneHoe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneHoe, 1), new Object[] { "XX", " T", " T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneSword, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneSword, 1), new Object[] { "X", "X", "T", Character.valueOf('X'), "ingotRefinedGlowstone", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneHelmet, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneChestplate, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneLeggings, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotRefinedGlowstone" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(GlowstoneBoots, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.GlowstoneBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), "ingotRefinedGlowstone" })); //Lazuli - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliHelmet, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliChestplate, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliLeggings, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliBoots, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), new ItemStack(Items.dye, 1, 4) })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliPaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), LazuliAxe, Character.valueOf('Y'), LazuliPickaxe, Character.valueOf('Z'), LazuliShovel, Character.valueOf('T'), Items.stick + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliPaxel, 1), new Object[] { + "XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.LazuliAxe, Character.valueOf('Y'), MekanismToolsItems.LazuliPickaxe, Character.valueOf('Z'), MekanismToolsItems.LazuliShovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliPickaxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliPickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliAxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliShovel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliHoe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliHoe, 1), new Object[] { "XX", " T", " T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(LazuliSword, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.LazuliSword, 1), new Object[] { "X", "X", "T", Character.valueOf('X'), new ItemStack(Items.dye, 1, 4), Character.valueOf('T'), Items.stick })); //Osmium - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumPaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), OsmiumAxe, Character.valueOf('Y'), OsmiumPickaxe, Character.valueOf('Z'), OsmiumShovel, Character.valueOf('T'), Items.stick + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumPaxel, 1), new Object[] { + "XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.OsmiumAxe, Character.valueOf('Y'), MekanismToolsItems.OsmiumPickaxe, Character.valueOf('Z'), MekanismToolsItems.OsmiumShovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumPickaxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumPickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumAxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumShovel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumHoe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumHoe, 1), new Object[] { "XX", " T", " T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumSword, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumSword, 1), new Object[] { "X", "X", "T", Character.valueOf('X'), "ingotOsmium", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumHelmet, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumChestplate, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumLeggings, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotOsmium" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(OsmiumBoots, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.OsmiumBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), "ingotOsmium" })); //Bronze - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzePaxel, 1), new Object[] { - "XYZ", " T ", " T ", Character.valueOf('X'), BronzeAxe, Character.valueOf('Y'), BronzePickaxe, Character.valueOf('Z'), BronzeShovel, Character.valueOf('T'), Items.stick + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzePaxel, 1), new Object[] { + "XYZ", " T ", " T ", Character.valueOf('X'), MekanismToolsItems.BronzeAxe, Character.valueOf('Y'), MekanismToolsItems.BronzePickaxe, Character.valueOf('Z'), MekanismToolsItems.BronzeShovel, Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzePickaxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzePickaxe, 1), new Object[] { "XXX", " T ", " T ", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeAxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeAxe, 1), new Object[] { "XX", "XT", " T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeShovel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeShovel, 1), new Object[] { "X", "T", "T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeHoe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeHoe, 1), new Object[] { "XX", " T", " T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeSword, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeSword, 1), new Object[] { "X", "X", "T", Character.valueOf('X'), "ingotBronze", Character.valueOf('T'), Items.stick })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeHelmet, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeHelmet, 1), new Object[] { "***", "* *", Character.valueOf('*'), "ingotBronze" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeChestplate, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeChestplate, 1), new Object[] { "* *", "***", "***", Character.valueOf('*'), "ingotBronze" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeLeggings, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeLeggings, 1), new Object[] { "***", "* *", "* *", Character.valueOf('*'), "ingotBronze" })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(BronzeBoots, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.BronzeBoots, 1), new Object[] { "* *", "* *", Character.valueOf('*'), "ingotBronze" })); //Steel - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelPaxel, 1), new Object[] { - "XYZ", " I ", " I ", Character.valueOf('X'), SteelAxe, Character.valueOf('Y'), SteelPickaxe, Character.valueOf('Z'), SteelShovel, Character.valueOf('I'), Items.iron_ingot + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelPaxel, 1), new Object[] { + "XYZ", " I ", " I ", Character.valueOf('X'), MekanismToolsItems.SteelAxe, Character.valueOf('Y'), MekanismToolsItems.SteelPickaxe, Character.valueOf('Z'), MekanismToolsItems.SteelShovel, Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelPickaxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelPickaxe, 1), new Object[] { "XXX", " I ", " I ", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelAxe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelAxe, 1), new Object[] { "XX", "XI", " I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelShovel, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelShovel, 1), new Object[] { "X", "I", "I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelHoe, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelHoe, 1), new Object[] { "XX", " I", " I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelSword, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelSword, 1), new Object[] { "X", "X", "I", Character.valueOf('X'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelHelmet, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelHelmet, 1), new Object[] { "***", "I I", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelChestplate, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelChestplate, 1), new Object[] { "I I", "*I*", "***", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelLeggings, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelLeggings, 1), new Object[] { "I*I", "* *", "* *", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); - CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(SteelBoots, 1), new Object[] { + CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismToolsItems.SteelBoots, 1), new Object[] { "I *", "* I", Character.valueOf('*'), "ingotSteel", Character.valueOf('I'), Items.iron_ingot })); } @@ -541,212 +453,99 @@ public class MekanismTools implements IModule } , Mekanism.configuration.get("tools.armor-balance.steel", "enchantability", 10).getInt() ); - - //Bronze - BronzeHelmet = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet"); - BronzeChestplate = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate"); - BronzeLeggings = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setUnlocalizedName("BronzeLeggings"); - BronzeBoots = (new ItemMekanismArmor(armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setUnlocalizedName("BronzeBoots"); - BronzePaxel = new ItemMekanismPaxel(toolBRONZE2).setUnlocalizedName("BronzePaxel"); - BronzePickaxe = new ItemMekanismPickaxe(toolBRONZE).setUnlocalizedName("BronzePickaxe"); - BronzeAxe = new ItemMekanismAxe(toolBRONZE).setUnlocalizedName("BronzeAxe"); - BronzeShovel = new ItemMekanismShovel(toolBRONZE).setUnlocalizedName("BronzeShovel"); - BronzeHoe = new ItemMekanismHoe(toolBRONZE).setUnlocalizedName("BronzeHoe"); - BronzeSword = new ItemMekanismSword(toolBRONZE).setUnlocalizedName("BronzeSword"); - - BronzePaxel.setHarvestLevel("paxel", toolBRONZE2.getHarvestLevel()); - BronzePickaxe.setHarvestLevel("pickaxe", toolBRONZE.getHarvestLevel()); - BronzeAxe.setHarvestLevel("axe", toolBRONZE.getHarvestLevel()); - BronzeShovel.setHarvestLevel("shovel", toolBRONZE.getHarvestLevel()); - - //Osmium - OsmiumHelmet = (new ItemMekanismArmor(armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 0)).setUnlocalizedName("OsmiumHelmet"); - OsmiumChestplate = (new ItemMekanismArmor(armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 1)).setUnlocalizedName("OsmiumChestplate"); - OsmiumLeggings = (new ItemMekanismArmor(armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 2)).setUnlocalizedName("OsmiumLeggings"); - OsmiumBoots = (new ItemMekanismArmor(armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 3)).setUnlocalizedName("OsmiumBoots"); - OsmiumPaxel = new ItemMekanismPaxel(toolOSMIUM2).setUnlocalizedName("OsmiumPaxel"); - OsmiumPickaxe = new ItemMekanismPickaxe(toolOSMIUM).setUnlocalizedName("OsmiumPickaxe"); - OsmiumAxe = new ItemMekanismAxe(toolOSMIUM).setUnlocalizedName("OsmiumAxe"); - OsmiumShovel = new ItemMekanismShovel(toolOSMIUM).setUnlocalizedName("OsmiumShovel"); - OsmiumHoe = new ItemMekanismHoe(toolOSMIUM).setUnlocalizedName("OsmiumHoe"); - OsmiumSword = new ItemMekanismSword(toolOSMIUM).setUnlocalizedName("OsmiumSword"); - - OsmiumPaxel.setHarvestLevel("paxel", toolOSMIUM2.getHarvestLevel()); - OsmiumPickaxe.setHarvestLevel("pickaxe", toolOSMIUM.getHarvestLevel()); - OsmiumAxe.setHarvestLevel("axe", toolOSMIUM.getHarvestLevel()); - OsmiumShovel.setHarvestLevel("shovel", toolOSMIUM.getHarvestLevel()); - - //Obsidian - ObsidianHelmet = (new ItemMekanismArmor(armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setUnlocalizedName("ObsidianHelmet"); - ObsidianChestplate = (new ItemMekanismArmor(armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setUnlocalizedName("ObsidianChestplate"); - ObsidianLeggings = (new ItemMekanismArmor(armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setUnlocalizedName("ObsidianLeggings"); - ObsidianBoots = (new ItemMekanismArmor(armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setUnlocalizedName("ObsidianBoots"); - ObsidianPaxel = new ItemMekanismPaxel(toolOBSIDIAN2).setUnlocalizedName("ObsidianPaxel"); - ObsidianPickaxe = new ItemMekanismPickaxe(toolOBSIDIAN).setUnlocalizedName("ObsidianPickaxe"); - ObsidianAxe = new ItemMekanismAxe(toolOBSIDIAN).setUnlocalizedName("ObsidianAxe"); - ObsidianShovel = new ItemMekanismShovel(toolOBSIDIAN).setUnlocalizedName("ObsidianShovel"); - ObsidianHoe = new ItemMekanismHoe(toolOBSIDIAN).setUnlocalizedName("ObsidianHoe"); - ObsidianSword = new ItemMekanismSword(toolOBSIDIAN).setUnlocalizedName("ObsidianSword"); - - ObsidianPaxel.setHarvestLevel("paxel", toolOBSIDIAN2.getHarvestLevel()); - ObsidianPickaxe.setHarvestLevel("pickaxe", toolOBSIDIAN.getHarvestLevel()); - ObsidianAxe.setHarvestLevel("axe", toolOBSIDIAN.getHarvestLevel()); - ObsidianShovel.setHarvestLevel("shovel", toolOBSIDIAN.getHarvestLevel()); - - //Lazuli - LazuliHelmet = (new ItemMekanismArmor(armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setUnlocalizedName("LazuliHelmet"); - LazuliChestplate = (new ItemMekanismArmor(armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setUnlocalizedName("LazuliChestplate"); - LazuliLeggings = (new ItemMekanismArmor(armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setUnlocalizedName("LazuliLeggings"); - LazuliBoots = (new ItemMekanismArmor(armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setUnlocalizedName("LazuliBoots"); - LazuliPaxel = new ItemMekanismPaxel(toolLAZULI2).setUnlocalizedName("LazuliPaxel"); - LazuliPickaxe = new ItemMekanismPickaxe(toolLAZULI).setUnlocalizedName("LazuliPickaxe"); - LazuliAxe = new ItemMekanismAxe(toolLAZULI).setUnlocalizedName("LazuliAxe"); - LazuliShovel = new ItemMekanismShovel(toolLAZULI).setUnlocalizedName("LazuliShovel"); - LazuliHoe = new ItemMekanismHoe(toolLAZULI).setUnlocalizedName("LazuliHoe"); - LazuliSword = new ItemMekanismSword(toolLAZULI).setUnlocalizedName("LazuliSword"); - - LazuliPaxel.setHarvestLevel("paxel", toolLAZULI2.getHarvestLevel()); - LazuliPickaxe.setHarvestLevel("pickaxe", toolLAZULI.getHarvestLevel()); - LazuliAxe.setHarvestLevel("axe", toolLAZULI.getHarvestLevel()); - LazuliShovel.setHarvestLevel("shovel", toolLAZULI.getHarvestLevel()); - - //Glowstone - GlowstoneHelmet = new ItemMekanismArmor(armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setUnlocalizedName("GlowstoneHelmet"); - GlowstoneChestplate = new ItemMekanismArmor(armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setUnlocalizedName("GlowstoneChestplate"); - GlowstoneLeggings = new ItemMekanismArmor(armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setUnlocalizedName("GlowstoneLeggings"); - GlowstoneBoots = new ItemMekanismArmor(armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setUnlocalizedName("GlowstoneBoots"); - GlowstonePaxel = new ItemMekanismPaxel(toolGLOWSTONE2).setUnlocalizedName("GlowstonePaxel"); - GlowstonePickaxe = new ItemMekanismPickaxe(toolGLOWSTONE).setUnlocalizedName("GlowstonePickaxe"); - GlowstoneAxe = new ItemMekanismAxe(toolGLOWSTONE).setUnlocalizedName("GlowstoneAxe"); - GlowstoneShovel = new ItemMekanismShovel(toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel"); - GlowstoneHoe = new ItemMekanismHoe(toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe"); - GlowstoneSword = new ItemMekanismSword(toolGLOWSTONE).setUnlocalizedName("GlowstoneSword"); - - GlowstonePaxel.setHarvestLevel("paxel", toolGLOWSTONE2.getHarvestLevel()); - GlowstonePickaxe.setHarvestLevel("pickaxe", toolGLOWSTONE.getHarvestLevel()); - GlowstoneAxe.setHarvestLevel("axe", toolGLOWSTONE.getHarvestLevel()); - GlowstoneShovel.setHarvestLevel("shovel", toolGLOWSTONE.getHarvestLevel()); - - //Steel - SteelHelmet = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet"); - SteelChestplate = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate"); - SteelLeggings = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setUnlocalizedName("SteelLeggings"); - SteelBoots = new ItemMekanismArmor(armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setUnlocalizedName("SteelBoots"); - SteelPaxel = new ItemMekanismPaxel(toolSTEEL2).setUnlocalizedName("SteelPaxel"); - SteelPickaxe = new ItemMekanismPickaxe(toolSTEEL).setUnlocalizedName("SteelPickaxe"); - SteelAxe = new ItemMekanismAxe(toolSTEEL).setUnlocalizedName("SteelAxe"); - SteelShovel = new ItemMekanismShovel(toolSTEEL).setUnlocalizedName("SteelShovel"); - SteelHoe = new ItemMekanismHoe(toolSTEEL).setUnlocalizedName("SteelHoe"); - SteelSword = new ItemMekanismSword(toolSTEEL).setUnlocalizedName("SteelSword"); - - SteelPaxel.setHarvestLevel("paxel", toolSTEEL2.getHarvestLevel()); - SteelPickaxe.setHarvestLevel("pickaxe", toolSTEEL.getHarvestLevel()); - SteelAxe.setHarvestLevel("axe", toolSTEEL.getHarvestLevel()); - SteelShovel.setHarvestLevel("shovel", toolSTEEL.getHarvestLevel()); - - //Base Paxels - WoodPaxel = new ItemMekanismPaxel(ToolMaterial.WOOD).setUnlocalizedName("WoodPaxel"); - StonePaxel = new ItemMekanismPaxel(ToolMaterial.STONE).setUnlocalizedName("StonePaxel"); - IronPaxel = new ItemMekanismPaxel(ToolMaterial.IRON).setUnlocalizedName("IronPaxel"); - DiamondPaxel = new ItemMekanismPaxel(ToolMaterial.EMERALD).setUnlocalizedName("DiamondPaxel"); - GoldPaxel = new ItemMekanismPaxel(ToolMaterial.GOLD).setUnlocalizedName("GoldPaxel"); - - WoodPaxel.setHarvestLevel("paxel", ToolMaterial.WOOD.getHarvestLevel()); - StonePaxel.setHarvestLevel("paxel", ToolMaterial.STONE.getHarvestLevel()); - IronPaxel.setHarvestLevel("paxel", ToolMaterial.IRON.getHarvestLevel()); - DiamondPaxel.setHarvestLevel("paxel", ToolMaterial.EMERALD.getHarvestLevel()); - GoldPaxel.setHarvestLevel("paxel", ToolMaterial.GOLD.getHarvestLevel()); - Mekanism.configuration.save(); - + + MekanismToolsItems.initializeItems(); + MekanismToolsItems.setHarvestLevels(); + //Registrations //Base - GameRegistry.registerItem(WoodPaxel, "WoodPaxel"); - GameRegistry.registerItem(StonePaxel, "StonePaxel"); - GameRegistry.registerItem(IronPaxel, "IronPaxel"); - GameRegistry.registerItem(DiamondPaxel, "DiamondPaxel"); - GameRegistry.registerItem(GoldPaxel, "GoldPaxel"); + GameRegistry.registerItem(MekanismToolsItems.WoodPaxel, "WoodPaxel"); + GameRegistry.registerItem(MekanismToolsItems.StonePaxel, "StonePaxel"); + GameRegistry.registerItem(MekanismToolsItems.IronPaxel, "IronPaxel"); + GameRegistry.registerItem(MekanismToolsItems.DiamondPaxel, "DiamondPaxel"); + GameRegistry.registerItem(MekanismToolsItems.GoldPaxel, "GoldPaxel"); //Obsidian - GameRegistry.registerItem(ObsidianHelmet, "ObsidianHelmet"); - GameRegistry.registerItem(ObsidianChestplate, "ObsidianChestplate"); - GameRegistry.registerItem(ObsidianLeggings, "ObsidianLeggings"); - GameRegistry.registerItem(ObsidianBoots, "ObsidianBoots"); - GameRegistry.registerItem(ObsidianPaxel, "ObsidianPaxel"); - GameRegistry.registerItem(ObsidianPickaxe, "ObsidianPickaxe"); - GameRegistry.registerItem(ObsidianAxe, "ObsidianAxe"); - GameRegistry.registerItem(ObsidianShovel, "ObsidianShovel"); - GameRegistry.registerItem(ObsidianHoe, "ObsidianHoe"); - GameRegistry.registerItem(ObsidianSword, "ObsidianSword"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianHelmet, "ObsidianHelmet"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianChestplate, "ObsidianChestplate"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianLeggings, "ObsidianLeggings"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianBoots, "ObsidianBoots"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianPaxel, "ObsidianPaxel"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianPickaxe, "ObsidianPickaxe"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianAxe, "ObsidianAxe"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianShovel, "ObsidianShovel"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianHoe, "ObsidianHoe"); + GameRegistry.registerItem(MekanismToolsItems.ObsidianSword, "ObsidianSword"); //Lazuli - GameRegistry.registerItem(LazuliHelmet, "LapisLazuliHelmet"); - GameRegistry.registerItem(LazuliChestplate, "LapisLazuliChestplate"); - GameRegistry.registerItem(LazuliLeggings, "LapisLazuliLeggings"); - GameRegistry.registerItem(LazuliBoots, "LapisLazuliBoots"); - GameRegistry.registerItem(LazuliPaxel, "LapisLazuliPaxel"); - GameRegistry.registerItem(LazuliPickaxe, "LapisLazuliPickaxe"); - GameRegistry.registerItem(LazuliAxe, "LapisLazuliAxe"); - GameRegistry.registerItem(LazuliShovel, "LapisLazuliShovel"); - GameRegistry.registerItem(LazuliHoe, "LapisLazuliHoe"); - GameRegistry.registerItem(LazuliSword, "LapisLazuliSword"); + GameRegistry.registerItem(MekanismToolsItems.LazuliHelmet, "LapisLazuliHelmet"); + GameRegistry.registerItem(MekanismToolsItems.LazuliChestplate, "LapisLazuliChestplate"); + GameRegistry.registerItem(MekanismToolsItems.LazuliLeggings, "LapisLazuliLeggings"); + GameRegistry.registerItem(MekanismToolsItems.LazuliBoots, "LapisLazuliBoots"); + GameRegistry.registerItem(MekanismToolsItems.LazuliPaxel, "LapisLazuliPaxel"); + GameRegistry.registerItem(MekanismToolsItems.LazuliPickaxe, "LapisLazuliPickaxe"); + GameRegistry.registerItem(MekanismToolsItems.LazuliAxe, "LapisLazuliAxe"); + GameRegistry.registerItem(MekanismToolsItems.LazuliShovel, "LapisLazuliShovel"); + GameRegistry.registerItem(MekanismToolsItems.LazuliHoe, "LapisLazuliHoe"); + GameRegistry.registerItem(MekanismToolsItems.LazuliSword, "LapisLazuliSword"); //Osmium - GameRegistry.registerItem(OsmiumHelmet, "OsmiumHelmet"); - GameRegistry.registerItem(OsmiumChestplate, "OsmiumChestplate"); - GameRegistry.registerItem(OsmiumLeggings, "OsmiumLeggings"); - GameRegistry.registerItem(OsmiumBoots, "OsmiumBoots"); - GameRegistry.registerItem(OsmiumPaxel, "OsmiumPaxel"); - GameRegistry.registerItem(OsmiumPickaxe, "OsmiumPickaxe"); - GameRegistry.registerItem(OsmiumAxe, "OsmiumAxe"); - GameRegistry.registerItem(OsmiumShovel, "OsmiumShovel"); - GameRegistry.registerItem(OsmiumHoe, "OsmiumHoe"); - GameRegistry.registerItem(OsmiumSword, "OsmiumSword"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumHelmet, "OsmiumHelmet"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumChestplate, "OsmiumChestplate"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumLeggings, "OsmiumLeggings"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumBoots, "OsmiumBoots"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumPaxel, "OsmiumPaxel"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumPickaxe, "OsmiumPickaxe"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumAxe, "OsmiumAxe"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumShovel, "OsmiumShovel"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumHoe, "OsmiumHoe"); + GameRegistry.registerItem(MekanismToolsItems.OsmiumSword, "OsmiumSword"); //Redstone - GameRegistry.registerItem(BronzeHelmet, "BronzeHelmet"); - GameRegistry.registerItem(BronzeChestplate, "BronzeChestplate"); - GameRegistry.registerItem(BronzeLeggings, "BronzeLeggings"); - GameRegistry.registerItem(BronzeBoots, "BronzeBoots"); - GameRegistry.registerItem(BronzePaxel, "BronzePaxel"); - GameRegistry.registerItem(BronzePickaxe, "BronzePickaxe"); - GameRegistry.registerItem(BronzeAxe, "BronzeAxe"); - GameRegistry.registerItem(BronzeShovel, "BronzeShovel"); - GameRegistry.registerItem(BronzeHoe, "BronzeHoe"); - GameRegistry.registerItem(BronzeSword, "BronzeSword"); + GameRegistry.registerItem(MekanismToolsItems.BronzeHelmet, "BronzeHelmet"); + GameRegistry.registerItem(MekanismToolsItems.BronzeChestplate, "BronzeChestplate"); + GameRegistry.registerItem(MekanismToolsItems.BronzeLeggings, "BronzeLeggings"); + GameRegistry.registerItem(MekanismToolsItems.BronzeBoots, "BronzeBoots"); + GameRegistry.registerItem(MekanismToolsItems.BronzePaxel, "BronzePaxel"); + GameRegistry.registerItem(MekanismToolsItems.BronzePickaxe, "BronzePickaxe"); + GameRegistry.registerItem(MekanismToolsItems.BronzeAxe, "BronzeAxe"); + GameRegistry.registerItem(MekanismToolsItems.BronzeShovel, "BronzeShovel"); + GameRegistry.registerItem(MekanismToolsItems.BronzeHoe, "BronzeHoe"); + GameRegistry.registerItem(MekanismToolsItems.BronzeSword, "BronzeSword"); //Glowstone - GameRegistry.registerItem(GlowstonePaxel, "GlowstonePaxel"); - GameRegistry.registerItem(GlowstonePickaxe, "GlowstonePickaxe"); - GameRegistry.registerItem(GlowstoneAxe, "GlowstoneAxe"); - GameRegistry.registerItem(GlowstoneShovel, "GlowstoneShovel"); - GameRegistry.registerItem(GlowstoneHoe, "GlowstoneHoe"); - GameRegistry.registerItem(GlowstoneSword, "GlowstoneSword"); - GameRegistry.registerItem(GlowstoneHelmet, "GlowstoneHelmet"); - GameRegistry.registerItem(GlowstoneChestplate, "GlowstoneChestplate"); - GameRegistry.registerItem(GlowstoneLeggings, "GlowstoneLeggings"); - GameRegistry.registerItem(GlowstoneBoots, "GlowstoneBoots"); + GameRegistry.registerItem(MekanismToolsItems.GlowstonePaxel, "GlowstonePaxel"); + GameRegistry.registerItem(MekanismToolsItems.GlowstonePickaxe, "GlowstonePickaxe"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneAxe, "GlowstoneAxe"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneShovel, "GlowstoneShovel"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneHoe, "GlowstoneHoe"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneSword, "GlowstoneSword"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneHelmet, "GlowstoneHelmet"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneChestplate, "GlowstoneChestplate"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneLeggings, "GlowstoneLeggings"); + GameRegistry.registerItem(MekanismToolsItems.GlowstoneBoots, "GlowstoneBoots"); //Steel - GameRegistry.registerItem(SteelPaxel, "SteelPaxel"); - GameRegistry.registerItem(SteelPickaxe, "SteelPickaxe"); - GameRegistry.registerItem(SteelAxe, "SteelAxe"); - GameRegistry.registerItem(SteelShovel, "SteelShovel"); - GameRegistry.registerItem(SteelHoe, "SteelHoe"); - GameRegistry.registerItem(SteelSword, "SteelSword"); - GameRegistry.registerItem(SteelHelmet, "SteelHelmet"); - GameRegistry.registerItem(SteelChestplate, "SteelChestplate"); - GameRegistry.registerItem(SteelLeggings, "SteelLeggings"); - GameRegistry.registerItem(SteelBoots, "SteelBoots"); + GameRegistry.registerItem(MekanismToolsItems.SteelPaxel, "SteelPaxel"); + GameRegistry.registerItem(MekanismToolsItems.SteelPickaxe, "SteelPickaxe"); + GameRegistry.registerItem(MekanismToolsItems.SteelAxe, "SteelAxe"); + GameRegistry.registerItem(MekanismToolsItems.SteelShovel, "SteelShovel"); + GameRegistry.registerItem(MekanismToolsItems.SteelHoe, "SteelHoe"); + GameRegistry.registerItem(MekanismToolsItems.SteelSword, "SteelSword"); + GameRegistry.registerItem(MekanismToolsItems.SteelHelmet, "SteelHelmet"); + GameRegistry.registerItem(MekanismToolsItems.SteelChestplate, "SteelChestplate"); + GameRegistry.registerItem(MekanismToolsItems.SteelLeggings, "SteelLeggings"); + GameRegistry.registerItem(MekanismToolsItems.SteelBoots, "SteelBoots"); } - + @SubscribeEvent public void onLivingSpecialSpawn(LivingSpawnEvent event) { double chance = event.world.rand.nextDouble(); int armorType = event.world.rand.nextInt(4); - if(chance < armorSpawnRate) + if(chance < tools.armorSpawnRate) { if(event.entityLiving instanceof EntityZombie || event.entityLiving instanceof EntitySkeleton) { @@ -758,43 +557,43 @@ public class MekanismTools implements IModule if(armorType == 0) { - if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(GlowstoneSword)); - if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(GlowstoneHelmet)); - if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(GlowstoneChestplate)); - if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(GlowstoneLeggings)); - if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(GlowstoneBoots)); + if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.GlowstoneSword)); + if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.GlowstoneHelmet)); + if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.GlowstoneChestplate)); + if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.GlowstoneLeggings)); + if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.GlowstoneBoots)); } else if(armorType == 1) { - if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(LazuliSword)); - if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(LazuliHelmet)); - if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(LazuliChestplate)); - if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(LazuliLeggings)); - if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(LazuliBoots)); + if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.LazuliSword)); + if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.LazuliHelmet)); + if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.LazuliChestplate)); + if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.LazuliLeggings)); + if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.LazuliBoots)); } else if(armorType == 2) { - if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(OsmiumSword)); - if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(OsmiumHelmet)); - if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(OsmiumChestplate)); - if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(OsmiumLeggings)); - if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(OsmiumBoots)); + if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.OsmiumSword)); + if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.OsmiumHelmet)); + if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.OsmiumChestplate)); + if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.OsmiumLeggings)); + if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.OsmiumBoots)); } else if(armorType == 3) { - if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(SteelSword)); - if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(SteelHelmet)); - if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(SteelChestplate)); - if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(SteelLeggings)); - if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(SteelBoots)); + if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.SteelSword)); + if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.SteelHelmet)); + if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.SteelChestplate)); + if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.SteelLeggings)); + if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.SteelBoots)); } else if(armorType == 4) { - if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(BronzeSword)); - if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(BronzeHelmet)); - if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(BronzeChestplate)); - if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(BronzeLeggings)); - if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(BronzeBoots)); + if(event.entityLiving instanceof EntityZombie && sword < 50) event.entityLiving.setCurrentItemOrArmor(0, new ItemStack(MekanismToolsItems.BronzeSword)); + if(helmet < 50) event.entityLiving.setCurrentItemOrArmor(1, new ItemStack(MekanismToolsItems.BronzeHelmet)); + if(chestplate < 50) event.entityLiving.setCurrentItemOrArmor(2, new ItemStack(MekanismToolsItems.BronzeChestplate)); + if(leggings < 50) event.entityLiving.setCurrentItemOrArmor(3, new ItemStack(MekanismToolsItems.BronzeLeggings)); + if(boots < 50) event.entityLiving.setCurrentItemOrArmor(4, new ItemStack(MekanismToolsItems.BronzeBoots)); } } } @@ -815,13 +614,13 @@ public class MekanismTools implements IModule @Override public void writeConfig(ByteBuf dataStream) throws IOException { - dataStream.writeDouble(armorSpawnRate); + dataStream.writeDouble(tools.armorSpawnRate); } @Override public void readConfig(ByteBuf dataStream) throws IOException { - armorSpawnRate = dataStream.readDouble(); + tools.armorSpawnRate = dataStream.readDouble(); } @SubscribeEvent diff --git a/src/main/java/mekanism/tools/common/MekanismToolsItems.java b/src/main/java/mekanism/tools/common/MekanismToolsItems.java new file mode 100644 index 000000000..449d8459d --- /dev/null +++ b/src/main/java/mekanism/tools/common/MekanismToolsItems.java @@ -0,0 +1,205 @@ +package mekanism.tools.common; + +import mekanism.common.Mekanism; +import mekanism.tools.item.ItemMekanismArmor; +import mekanism.tools.item.ItemMekanismAxe; +import mekanism.tools.item.ItemMekanismHoe; +import mekanism.tools.item.ItemMekanismPaxel; +import mekanism.tools.item.ItemMekanismPickaxe; +import mekanism.tools.item.ItemMekanismShovel; +import mekanism.tools.item.ItemMekanismSword; + +import net.minecraft.item.Item; +import net.minecraft.item.Item.ToolMaterial; +import cpw.mods.fml.common.registry.GameRegistry.ObjectHolder; + +@ObjectHolder("MekanismTools") +public class MekanismToolsItems +{ + //Vanilla Material Paxels + public static Item WoodPaxel; + public static Item StonePaxel; + public static Item IronPaxel; + public static Item DiamondPaxel; + public static Item GoldPaxel; + + //Glowstone Items + public static Item GlowstonePaxel; + public static Item GlowstonePickaxe; + public static Item GlowstoneAxe; + public static Item GlowstoneShovel; + public static Item GlowstoneHoe; + public static Item GlowstoneSword; + public static Item GlowstoneHelmet; + public static Item GlowstoneChestplate; + public static Item GlowstoneLeggings; + public static Item GlowstoneBoots; + + //Bronze Items + public static Item BronzePaxel; + public static Item BronzePickaxe; + public static Item BronzeAxe; + public static Item BronzeShovel; + public static Item BronzeHoe; + public static Item BronzeSword; + public static Item BronzeHelmet; + public static Item BronzeChestplate; + public static Item BronzeLeggings; + public static Item BronzeBoots; + + //Osmium Items + public static Item OsmiumPaxel; + public static Item OsmiumPickaxe; + public static Item OsmiumAxe; + public static Item OsmiumShovel; + public static Item OsmiumHoe; + public static Item OsmiumSword; + public static Item OsmiumHelmet; + public static Item OsmiumChestplate; + public static Item OsmiumLeggings; + public static Item OsmiumBoots; + + //Obsidian Items + public static Item ObsidianPaxel; + public static Item ObsidianPickaxe; + public static Item ObsidianAxe; + public static Item ObsidianShovel; + public static Item ObsidianHoe; + public static Item ObsidianSword; + public static Item ObsidianHelmet; + public static Item ObsidianChestplate; + public static Item ObsidianLeggings; + public static Item ObsidianBoots; + + //Lazuli Items + public static Item LazuliPaxel; + public static Item LazuliPickaxe; + public static Item LazuliAxe; + public static Item LazuliShovel; + public static Item LazuliHoe; + public static Item LazuliSword; + public static Item LazuliHelmet; + public static Item LazuliChestplate; + public static Item LazuliLeggings; + public static Item LazuliBoots; + + //Steel Items + public static Item SteelPaxel; + public static Item SteelPickaxe; + public static Item SteelAxe; + public static Item SteelShovel; + public static Item SteelHoe; + public static Item SteelSword; + public static Item SteelHelmet; + public static Item SteelChestplate; + public static Item SteelLeggings; + public static Item SteelBoots; + + public static void initializeItems() + { + WoodPaxel = new ItemMekanismPaxel(ToolMaterial.WOOD).setUnlocalizedName("WoodPaxel"); + StonePaxel = new ItemMekanismPaxel(ToolMaterial.STONE).setUnlocalizedName("StonePaxel"); + IronPaxel = new ItemMekanismPaxel(ToolMaterial.IRON).setUnlocalizedName("IronPaxel"); + DiamondPaxel = new ItemMekanismPaxel(ToolMaterial.EMERALD).setUnlocalizedName("DiamondPaxel"); + GoldPaxel = new ItemMekanismPaxel(ToolMaterial.GOLD).setUnlocalizedName("GoldPaxel"); + GlowstonePaxel = new ItemMekanismPaxel(MekanismTools.toolGLOWSTONE2).setUnlocalizedName("GlowstonePaxel"); + GlowstonePickaxe = new ItemMekanismPickaxe(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstonePickaxe"); + GlowstoneAxe = new ItemMekanismAxe(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneAxe"); + GlowstoneShovel = new ItemMekanismShovel(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel"); + GlowstoneHoe = new ItemMekanismHoe(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe"); + GlowstoneSword = new ItemMekanismSword(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneSword"); + GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setUnlocalizedName("GlowstoneHelmet"); + GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setUnlocalizedName("GlowstoneChestplate"); + GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setUnlocalizedName("GlowstoneLeggings"); + GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setUnlocalizedName("GlowstoneBoots"); + BronzePaxel = new ItemMekanismPaxel(MekanismTools.toolBRONZE2).setUnlocalizedName("BronzePaxel"); + BronzePickaxe = new ItemMekanismPickaxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzePickaxe"); + BronzeAxe = new ItemMekanismAxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeAxe"); + BronzeShovel = new ItemMekanismShovel(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeShovel"); + BronzeHoe = new ItemMekanismHoe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeHoe"); + BronzeSword = new ItemMekanismSword(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeSword"); + BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet"); + BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate"); + BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setUnlocalizedName("BronzeLeggings"); + BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setUnlocalizedName("BronzeBoots"); + OsmiumPaxel = new ItemMekanismPaxel(MekanismTools.toolOSMIUM2).setUnlocalizedName("OsmiumPaxel"); + OsmiumPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumPickaxe"); + OsmiumAxe = new ItemMekanismAxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumAxe"); + OsmiumShovel = new ItemMekanismShovel(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumShovel"); + OsmiumHoe = new ItemMekanismHoe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumHoe"); + OsmiumSword = new ItemMekanismSword(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumSword"); + OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 0)).setUnlocalizedName("OsmiumHelmet"); + OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 1)).setUnlocalizedName("OsmiumChestplate"); + OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 2)).setUnlocalizedName("OsmiumLeggings"); + OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 3)).setUnlocalizedName("OsmiumBoots"); + ObsidianPaxel = new ItemMekanismPaxel(MekanismTools.toolOBSIDIAN2).setUnlocalizedName("ObsidianPaxel"); + ObsidianPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianPickaxe"); + ObsidianAxe = new ItemMekanismAxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianAxe"); + ObsidianShovel = new ItemMekanismShovel(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianShovel"); + ObsidianHoe = new ItemMekanismHoe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianHoe"); + ObsidianSword = new ItemMekanismSword(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianSword"); + ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setUnlocalizedName("ObsidianHelmet"); + ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setUnlocalizedName("ObsidianChestplate"); + ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setUnlocalizedName("ObsidianLeggings"); + ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setUnlocalizedName("ObsidianBoots"); + LazuliPaxel = new ItemMekanismPaxel(MekanismTools.toolLAZULI2).setUnlocalizedName("LazuliPaxel"); + LazuliPickaxe = new ItemMekanismPickaxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliPickaxe"); + LazuliAxe = new ItemMekanismAxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliAxe"); + LazuliShovel = new ItemMekanismShovel(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliShovel"); + LazuliHoe = new ItemMekanismHoe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliHoe"); + LazuliSword = new ItemMekanismSword(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliSword"); + LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setUnlocalizedName("LazuliHelmet"); + LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setUnlocalizedName("LazuliChestplate"); + LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setUnlocalizedName("LazuliLeggings"); + LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setUnlocalizedName("LazuliBoots"); + SteelPaxel = new ItemMekanismPaxel(MekanismTools.toolSTEEL2).setUnlocalizedName("SteelPaxel"); + SteelPickaxe = new ItemMekanismPickaxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelPickaxe"); + SteelAxe = new ItemMekanismAxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelAxe"); + SteelShovel = new ItemMekanismShovel(MekanismTools.toolSTEEL).setUnlocalizedName("SteelShovel"); + SteelHoe = new ItemMekanismHoe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelHoe"); + SteelSword = new ItemMekanismSword(MekanismTools.toolSTEEL).setUnlocalizedName("SteelSword"); + SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet"); + SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate"); + SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setUnlocalizedName("SteelLeggings"); + SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setUnlocalizedName("SteelBoots"); + } + + public static void setHarvestLevels() + { + BronzePaxel.setHarvestLevel("paxel", MekanismTools.toolBRONZE2.getHarvestLevel()); + BronzePickaxe.setHarvestLevel("pickaxe", MekanismTools.toolBRONZE.getHarvestLevel()); + BronzeAxe.setHarvestLevel("axe", MekanismTools.toolBRONZE.getHarvestLevel()); + BronzeShovel.setHarvestLevel("shovel", MekanismTools.toolBRONZE.getHarvestLevel()); + + OsmiumPaxel.setHarvestLevel("paxel", MekanismTools.toolOSMIUM2.getHarvestLevel()); + OsmiumPickaxe.setHarvestLevel("pickaxe", MekanismTools.toolOSMIUM.getHarvestLevel()); + OsmiumAxe.setHarvestLevel("axe", MekanismTools.toolOSMIUM.getHarvestLevel()); + OsmiumShovel.setHarvestLevel("shovel", MekanismTools.toolOSMIUM.getHarvestLevel()); + + ObsidianPaxel.setHarvestLevel("paxel", MekanismTools.toolOBSIDIAN2.getHarvestLevel()); + ObsidianPickaxe.setHarvestLevel("pickaxe", MekanismTools.toolOBSIDIAN.getHarvestLevel()); + ObsidianAxe.setHarvestLevel("axe", MekanismTools.toolOBSIDIAN.getHarvestLevel()); + ObsidianShovel.setHarvestLevel("shovel", MekanismTools.toolOBSIDIAN.getHarvestLevel()); + + LazuliPaxel.setHarvestLevel("paxel", MekanismTools.toolLAZULI2.getHarvestLevel()); + LazuliPickaxe.setHarvestLevel("pickaxe", MekanismTools.toolLAZULI.getHarvestLevel()); + LazuliAxe.setHarvestLevel("axe", MekanismTools.toolLAZULI.getHarvestLevel()); + LazuliShovel.setHarvestLevel("shovel", MekanismTools.toolLAZULI.getHarvestLevel()); + + GlowstonePaxel.setHarvestLevel("paxel", MekanismTools.toolGLOWSTONE2.getHarvestLevel()); + GlowstonePickaxe.setHarvestLevel("pickaxe", MekanismTools.toolGLOWSTONE.getHarvestLevel()); + GlowstoneAxe.setHarvestLevel("axe", MekanismTools.toolGLOWSTONE.getHarvestLevel()); + GlowstoneShovel.setHarvestLevel("shovel", MekanismTools.toolGLOWSTONE.getHarvestLevel()); + + SteelPaxel.setHarvestLevel("paxel", MekanismTools.toolSTEEL2.getHarvestLevel()); + SteelPickaxe.setHarvestLevel("pickaxe", MekanismTools.toolSTEEL.getHarvestLevel()); + SteelAxe.setHarvestLevel("axe", MekanismTools.toolSTEEL.getHarvestLevel()); + SteelShovel.setHarvestLevel("shovel", MekanismTools.toolSTEEL.getHarvestLevel()); + + WoodPaxel.setHarvestLevel("paxel", ToolMaterial.WOOD.getHarvestLevel()); + StonePaxel.setHarvestLevel("paxel", ToolMaterial.STONE.getHarvestLevel()); + IronPaxel.setHarvestLevel("paxel", ToolMaterial.IRON.getHarvestLevel()); + DiamondPaxel.setHarvestLevel("paxel", ToolMaterial.EMERALD.getHarvestLevel()); + GoldPaxel.setHarvestLevel("paxel", ToolMaterial.GOLD.getHarvestLevel()); + } +} diff --git a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java index e9e100e2e..96092d71c 100644 --- a/src/main/java/mekanism/tools/common/ToolsCommonProxy.java +++ b/src/main/java/mekanism/tools/common/ToolsCommonProxy.java @@ -1,5 +1,6 @@ package mekanism.tools.common; +import mekanism.api.MekanismConfig.tools; import mekanism.common.Mekanism; public class ToolsCommonProxy @@ -9,7 +10,7 @@ public class ToolsCommonProxy */ public void loadConfiguration() { - MekanismTools.armorSpawnRate = Mekanism.configuration.get("tools.general", "MobArmorSpawnRate", 0.03, null, 0.00, 1.00).getDouble(0.03); + tools.armorSpawnRate = Mekanism.configuration.get("tools.general", "MobArmorSpawnRate", 0.03, null, 0.00, 1.00).getDouble(0.03); if(Mekanism.configuration.hasChanged()) Mekanism.configuration.save(); diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 70ea0beb7..a668c6967 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -4,9 +4,12 @@ import java.util.List; import mekanism.client.render.ModelCustomArmor; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import mekanism.tools.common.MekanismTools; +import mekanism.tools.common.MekanismToolsItems; + import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; @@ -55,7 +58,7 @@ public class ItemMekanismArmor extends ItemArmor { if(getArmorMaterial() == MekanismTools.armorOBSIDIAN) { - return new ItemStack(Mekanism.Ingot, 1, 0); + return new ItemStack(MekanismItems.Ingot, 1, 0); } else if(getArmorMaterial() == MekanismTools.armorLAZULI) { @@ -63,19 +66,19 @@ public class ItemMekanismArmor extends ItemArmor } else if(getArmorMaterial() == MekanismTools.armorOSMIUM) { - return new ItemStack(Mekanism.Ingot, 1, 1); + return new ItemStack(MekanismItems.Ingot, 1, 1); } else if(getArmorMaterial() == MekanismTools.armorBRONZE) { - return new ItemStack(Mekanism.Ingot, 1, 2); + return new ItemStack(MekanismItems.Ingot, 1, 2); } else if(getArmorMaterial() == MekanismTools.armorGLOWSTONE) { - return new ItemStack(Mekanism.Ingot, 1, 3); + return new ItemStack(MekanismItems.Ingot, 1, 3); } else if(getArmorMaterial() == MekanismTools.armorSTEEL) { - return new ItemStack(Mekanism.Ingot, 1, 4); + return new ItemStack(MekanismItems.Ingot, 1, 4); } return new ItemStack(getArmorMaterial().func_151685_b()); @@ -85,8 +88,8 @@ public class ItemMekanismArmor extends ItemArmor @SideOnly(Side.CLIENT) public ModelBiped getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int armorSlot) { - if(itemStack.getItem() == MekanismTools.GlowstoneHelmet || itemStack.getItem() == MekanismTools.GlowstoneChestplate || - itemStack.getItem() == MekanismTools.GlowstoneLeggings || itemStack.getItem() == MekanismTools.GlowstoneBoots) + if(itemStack.getItem() == MekanismToolsItems.GlowstoneHelmet || itemStack.getItem() == MekanismToolsItems.GlowstoneChestplate || + itemStack.getItem() == MekanismToolsItems.GlowstoneLeggings || itemStack.getItem() == MekanismToolsItems.GlowstoneBoots) { return ModelCustomArmor.getGlow(armorSlot); } diff --git a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java index b47ab340d..ab6626f06 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismHoe.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismHoe.java @@ -4,7 +4,7 @@ import java.util.List; import mekanism.common.item.ItemMekanism; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/mekanism/tools/item/ItemMekanismTool.java b/src/main/java/mekanism/tools/item/ItemMekanismTool.java index 5e7aa0dbf..461c61243 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismTool.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismTool.java @@ -5,8 +5,9 @@ import java.util.HashSet; import java.util.List; import mekanism.common.Mekanism; +import mekanism.common.MekanismItems; import mekanism.common.util.MekanismUtils; -import mekanism.api.StackUtils; +import mekanism.api.util.StackUtils; import mekanism.tools.common.MekanismTools; import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; @@ -44,7 +45,7 @@ public class ItemMekanismTool extends ItemTool { if(material == MekanismTools.toolOBSIDIAN || material == MekanismTools.toolOBSIDIAN2) { - return new ItemStack(Mekanism.Ingot, 1, 0); + return new ItemStack(MekanismItems.Ingot, 1, 0); } else if(material == MekanismTools.toolLAZULI || material == MekanismTools.toolLAZULI2) { @@ -52,19 +53,19 @@ public class ItemMekanismTool extends ItemTool } else if(material == MekanismTools.toolOSMIUM || material == MekanismTools.toolOSMIUM2) { - return new ItemStack(Mekanism.Ingot, 1, 1); + return new ItemStack(MekanismItems.Ingot, 1, 1); } else if(material == MekanismTools.toolBRONZE || material == MekanismTools.toolBRONZE2) { - return new ItemStack(Mekanism.Ingot, 1, 2); + return new ItemStack(MekanismItems.Ingot, 1, 2); } else if(material == MekanismTools.toolGLOWSTONE || material == MekanismTools.toolGLOWSTONE2) { - return new ItemStack(Mekanism.Ingot, 1, 3); + return new ItemStack(MekanismItems.Ingot, 1, 3); } else if(material == MekanismTools.toolSTEEL || material == MekanismTools.toolSTEEL2) { - return new ItemStack(Mekanism.Ingot, 1, 4); + return new ItemStack(MekanismItems.Ingot, 1, 4); } return new ItemStack(material.func_150995_f());