tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Make the mod classes significantly less godlike.

Browse source 
Move Config variables into their own class, (in api because other stuff in API references config, may make sense to move it back to common later), and move Blocks and Items into final variables in their own classes. It looks a lot cleaner this way and my OCD can finally rest now.
This commit is contained in:
Ben Spiers 2014-08-01 00:58:12 +01:00
parent 6762f416d3
commit 725b7463f0
163 changed files with 1848 additions and 1789 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/mekanism/api/MekanismAPI.java
View file

@ -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;

80
src/main/java/mekanism/api/MekanismConfig.java Normal file
View file

@ -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;
}
}

2
src/main/java/mekanism/api/gas/GasNetwork.java
View file

@ -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;

3
src/main/java/mekanism/api/AdvancedInput.java → src/main/java/mekanism/api/recipe/AdvancedInput.java
View file

@ -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;

4
src/main/java/mekanism/api/ChanceOutput.java → src/main/java/mekanism/api/recipe/ChanceOutput.java
View file

@ -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

2
src/main/java/mekanism/api/ChemicalPair.java → src/main/java/mekanism/api/recipe/ChemicalPair.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.recipe;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;

2
src/main/java/mekanism/api/PressurizedProducts.java → src/main/java/mekanism/api/recipe/PressurizedProducts.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.recipe;
import mekanism.api.gas.GasStack;
import mekanism.api.gas.GasTank;

3
src/main/java/mekanism/api/PressurizedReactants.java → src/main/java/mekanism/api/recipe/PressurizedReactants.java
View file

@ -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;

2
src/main/java/mekanism/api/PressurizedRecipe.java → src/main/java/mekanism/api/recipe/PressurizedRecipe.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.recipe;
public class PressurizedRecipe
{

2
src/main/java/mekanism/api/RecipeHelper.java → src/main/java/mekanism/api/recipe/RecipeHelper.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.recipe;
import java.lang.reflect.Method;

2
src/main/java/mekanism/api/BlockInfo.java → src/main/java/mekanism/api/util/BlockInfo.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.util;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;

4
src/main/java/mekanism/common/EnergyDisplay.java → src/main/java/mekanism/api/util/EnergyUtil.java
View file

@ -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
{

2
src/main/java/mekanism/api/ItemInfo.java → src/main/java/mekanism/api/util/ItemInfo.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.util;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;

2
src/main/java/mekanism/api/ListUtils.java → src/main/java/mekanism/api/util/ListUtils.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.util;
import java.util.ArrayList;
import java.util.Arrays;

2
src/main/java/mekanism/api/StackUtils.java → src/main/java/mekanism/api/util/StackUtils.java
View file

@ -1,4 +1,4 @@
package mekanism.api;
package mekanism.api.util;
import java.util.ArrayList;
import java.util.List;

3
src/main/java/mekanism/client/ClientConnectionHandler.java
View file

@ -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)
{

43
src/main/java/mekanism/client/ClientProxy.java
View file

@ -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();
}

2
src/main/java/mekanism/client/ClientTickHandler.java
View file

@ -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;

7
src/main/java/mekanism/client/MekanismClient.java
View file

@ -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)
{

4
src/main/java/mekanism/client/ThreadTankSparkle.java
View file

@ -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));
}

2
src/main/java/mekanism/client/gui/GuiAdvancedElectricMachine.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiChanceMachine.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiChemicalCrystallizer.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiChemicalDissolutionChamber.java
View file

@ -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;

3
src/main/java/mekanism/client/gui/GuiChemicalInfuser.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiChemicalOxidizer.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiChemicalWasher.java
View file

@ -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;

4
src/main/java/mekanism/client/gui/GuiDigitalMiner.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiElectricMachine.java
View file

@ -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;

5
src/main/java/mekanism/client/gui/GuiElectrolyticSeparator.java
View file

@ -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<String> 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")));

2
src/main/java/mekanism/client/gui/GuiEnergyCube.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiFactory.java
View file

@ -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;

2
src/main/java/mekanism/client/gui/GuiMetallurgicInfuser.java
View file

@ -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;

2
src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java
View file

@ -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;

2
src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java
View file

@ -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;

3
src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java
View file

@ -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;

2
src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java
View file

@ -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;

1
src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java
View file

@ -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;

2
src/main/java/mekanism/client/nei/CombinerRecipeHandler.java
View file

@ -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;

2
src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java
View file

@ -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;

8
src/main/java/mekanism/client/nei/NEIMekanismConfig.java
View file

@ -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

6
src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java
View file

@ -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<ItemStack> getFuelStacks(Gas gasType)
{
return ListUtils.asList(new ItemStack(Mekanism.Ingot, 1, 1));
return ListUtils.asList(new ItemStack(MekanismItems.Ingot, 1, 1));
}
@Override

4
src/main/java/mekanism/client/nei/PRCRecipeHandler.java
View file

@ -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;

2
src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java
View file

@ -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;

11
src/main/java/mekanism/client/render/block/BasicRenderingHandler.java
View file

@ -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);

15
src/main/java/mekanism/client/render/item/ItemRenderingHandler.java
View file

@ -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);

4
src/main/java/mekanism/client/render/tileentity/RenderTeleporter.java
View file

@ -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;
}

3
src/main/java/mekanism/client/voice/VoiceClient.java
View file

@ -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()));

3
src/main/java/mekanism/common/CommandMekanism.java
View file

@ -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."));
}

112
src/main/java/mekanism/common/CommonProxy.java
View file

@ -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);
}

4
src/main/java/mekanism/common/CreativeTabMekanism.java
View file

@ -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;
}
}

21
src/main/java/mekanism/common/EnergyNetwork.java
View file

@ -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<TileEntity, EnergyNetwork>
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<TileEntity, EnergyNetwork>
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<TileEntity, EnergyNetwork>
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);

2
src/main/java/mekanism/common/FluidNetwork.java
View file

@ -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;

4
src/main/java/mekanism/common/FuelHandler.java
View file

@ -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;
}
}
}

4
src/main/java/mekanism/common/IFactory.java
View file

@ -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;

2
src/main/java/mekanism/common/ItemAttacher.java
View file

@ -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()));
}
}

983
src/main/java/mekanism/common/Mekanism.java
View file

File diff suppressed because it is too large Load diff

38
src/main/java/mekanism/common/MekanismBlocks.java Normal file
View file

@ -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");
}

90
src/main/java/mekanism/common/MekanismItems.java Normal file
View file

@ -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();
}

2
src/main/java/mekanism/common/OreDictCache.java
View file

@ -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;

7
src/main/java/mekanism/common/Upgrade.java
View file

@ -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");
}

42
src/main/java/mekanism/common/block/BlockBasic.java
View file

@ -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);
}

5
src/main/java/mekanism/common/block/BlockCardboardBox.java
View file

@ -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)
{

3
src/main/java/mekanism/common/block/BlockEnergyCube.java
View file

@ -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);

3
src/main/java/mekanism/common/block/BlockGasTank.java
View file

@ -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());

81
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -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;

18
src/main/java/mekanism/common/block/BlockPlastic.java
View file

@ -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;
}

4
src/main/java/mekanism/common/block/BlockSalt.java
View file

@ -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

3
src/main/java/mekanism/common/entity/EntityFlame.java
View file

@ -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;

7
src/main/java/mekanism/common/entity/EntityObsidianTNT.java
View file

@ -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;
}

16
src/main/java/mekanism/common/entity/EntityRobit.java
View file

@ -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());

16
src/main/java/mekanism/common/integration/IC2ItemManager.java
View file

@ -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

30
src/main/java/mekanism/common/integration/MekanismHooks.java
View file

@ -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) {}
}

164
src/main/java/mekanism/common/integration/OreDictManager.java
View file

@ -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));
}
}
}

2
src/main/java/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java
View file

@ -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;

2
src/main/java/mekanism/common/item/ItemAtomicDisassembler.java
View file

@ -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;

16
src/main/java/mekanism/common/item/ItemBlockBasic.java
View file

@ -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())
{

4
src/main/java/mekanism/common/item/ItemBlockCardboardBox.java
View file

@ -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;

13
src/main/java/mekanism/common/item/ItemBlockEnergyCube.java
View file

@ -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

23
src/main/java/mekanism/common/item/ItemBlockMachine.java
View file

@ -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

13
src/main/java/mekanism/common/item/ItemEnergized.java
View file

@ -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

13
src/main/java/mekanism/common/item/ItemFreeRunners.java
View file

@ -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

13
src/main/java/mekanism/common/item/ItemJetpack.java
View file

@ -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;
}

2
src/main/java/mekanism/common/miner/ThreadMinerSearch.java
View file

@ -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;

9
src/main/java/mekanism/common/multipart/PartGlowPanel.java
View file

@ -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

4
src/main/java/mekanism/common/multipart/PartSidedPipe.java
View file

@ -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

14
src/main/java/mekanism/common/multipart/PartUniversalCable.java
View file

@ -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<EnergyNetwork> 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<EnergyNetwork> 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<EnergyNetwork> 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<EnergyNetwork> 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<EnergyNetwork> implement
{
if(powerHandler.getEnergyStored() > 0)
{
getTransmitterNetwork().emit(powerHandler.getEnergyStored()*Mekanism.FROM_BC);
getTransmitterNetwork().emit(powerHandler.getEnergyStored()* general.FROM_BC);
}
powerHandler.setEnergy(0);

2
src/main/java/mekanism/common/network/PacketBoxBlacklist.java
View file

@ -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;

169
src/main/java/mekanism/common/network/PacketConfigSync.java
View file

@ -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<ConfigSyncMessage, IMes
@Override
public void toBytes(ByteBuf dataStream)
{
dataStream.writeBoolean(Mekanism.updateNotifications);
dataStream.writeBoolean(Mekanism.controlCircuitOreDict);
dataStream.writeBoolean(Mekanism.logPackets);
dataStream.writeBoolean(Mekanism.dynamicTankEasterEgg);
dataStream.writeBoolean(Mekanism.voiceServerEnabled);
dataStream.writeBoolean(Mekanism.cardboardSpawners);
dataStream.writeBoolean(Mekanism.creativeOverrideElectricChest);
dataStream.writeBoolean(Mekanism.spawnBabySkeletons);
dataStream.writeInt(Mekanism.obsidianTNTDelay);
dataStream.writeInt(Mekanism.obsidianTNTBlastRadius);
dataStream.writeInt(Mekanism.UPDATE_DELAY);
dataStream.writeDouble(Mekanism.FROM_IC2);
dataStream.writeDouble(Mekanism.TO_IC2);
dataStream.writeDouble(Mekanism.FROM_BC);
dataStream.writeDouble(Mekanism.TO_BC);
dataStream.writeDouble(Mekanism.FROM_H2);
dataStream.writeDouble(Mekanism.ENERGY_PER_REDSTONE);
dataStream.writeInt(Mekanism.VOICE_PORT);
dataStream.writeInt(Mekanism.maxUpgradeMultiplier);
dataStream.writeInt(Mekanism.activeType.ordinal());
dataStream.writeBoolean(general.updateNotifications);
dataStream.writeBoolean(general.controlCircuitOreDict);
dataStream.writeBoolean(general.logPackets);
dataStream.writeBoolean(general.dynamicTankEasterEgg);
dataStream.writeBoolean(general.voiceServerEnabled);
dataStream.writeBoolean(general.cardboardSpawners);
dataStream.writeBoolean(general.creativeOverrideElectricChest);
dataStream.writeBoolean(general.spawnBabySkeletons);
dataStream.writeInt(general.obsidianTNTDelay);
dataStream.writeInt(general.obsidianTNTBlastRadius);
dataStream.writeInt(general.UPDATE_DELAY);
dataStream.writeDouble(general.FROM_IC2);
dataStream.writeDouble(general.TO_IC2);
dataStream.writeDouble(general.FROM_BC);
dataStream.writeDouble(general.TO_BC);
dataStream.writeDouble(general.FROM_H2);
dataStream.writeDouble(general.ENERGY_PER_REDSTONE);
dataStream.writeInt(general.VOICE_PORT);
dataStream.writeInt(general.maxUpgradeMultiplier);
dataStream.writeInt(general.activeType.ordinal());
dataStream.writeDouble(Mekanism.enrichmentChamberUsage);
dataStream.writeDouble(Mekanism.osmiumCompressorUsage);
dataStream.writeDouble(Mekanism.combinerUsage);
dataStream.writeDouble(Mekanism.crusherUsage);
dataStream.writeDouble(Mekanism.factoryUsage);
dataStream.writeDouble(Mekanism.metallurgicInfuserUsage);
dataStream.writeDouble(Mekanism.purificationChamberUsage);
dataStream.writeDouble(Mekanism.energizedSmelterUsage);
dataStream.writeDouble(Mekanism.digitalMinerUsage);
dataStream.writeDouble(Mekanism.electricPumpUsage);
dataStream.writeDouble(Mekanism.rotaryCondensentratorUsage);
dataStream.writeDouble(Mekanism.oxidationChamberUsage);
dataStream.writeDouble(Mekanism.chemicalInfuserUsage);
dataStream.writeDouble(Mekanism.chemicalInjectionChamberUsage);
dataStream.writeDouble(Mekanism.precisionSawmillUsage);
dataStream.writeDouble(Mekanism.chemicalDissolutionChamberUsage);
dataStream.writeDouble(Mekanism.chemicalWasherUsage);
dataStream.writeDouble(Mekanism.chemicalCrystallizerUsage);
dataStream.writeDouble(Mekanism.seismicVibratorUsage);
dataStream.writeDouble(Mekanism.fluidicPlenisherUsage);
dataStream.writeDouble(usage.enrichmentChamberUsage);
dataStream.writeDouble(usage.osmiumCompressorUsage);
dataStream.writeDouble(usage.combinerUsage);
dataStream.writeDouble(usage.crusherUsage);
dataStream.writeDouble(usage.factoryUsage);
dataStream.writeDouble(usage.metallurgicInfuserUsage);
dataStream.writeDouble(usage.purificationChamberUsage);
dataStream.writeDouble(usage.energizedSmelterUsage);
dataStream.writeDouble(usage.digitalMinerUsage);
dataStream.writeDouble(usage.electricPumpUsage);
dataStream.writeDouble(usage.rotaryCondensentratorUsage);
dataStream.writeDouble(usage.oxidationChamberUsage);
dataStream.writeDouble(usage.chemicalInfuserUsage);
dataStream.writeDouble(usage.chemicalInjectionChamberUsage);
dataStream.writeDouble(usage.precisionSawmillUsage);
dataStream.writeDouble(usage.chemicalDissolutionChamberUsage);
dataStream.writeDouble(usage.chemicalWasherUsage);
dataStream.writeDouble(usage.chemicalCrystallizerUsage);
dataStream.writeDouble(usage.seismicVibratorUsage);
dataStream.writeDouble(usage.fluidicPlenisherUsage);
try {
for(IModule module : Mekanism.modulesLoaded)
@ -79,50 +82,50 @@ public class PacketConfigSync implements IMessageHandler<ConfigSyncMessage, IMes
@Override
public void fromBytes(ByteBuf dataStream)
{
Mekanism.updateNotifications = dataStream.readBoolean();
Mekanism.controlCircuitOreDict = dataStream.readBoolean();
Mekanism.logPackets = dataStream.readBoolean();
Mekanism.dynamicTankEasterEgg = dataStream.readBoolean();
Mekanism.voiceServerEnabled = dataStream.readBoolean();
Mekanism.cardboardSpawners = dataStream.readBoolean();
Mekanism.creativeOverrideElectricChest = dataStream.readBoolean();
Mekanism.spawnBabySkeletons = dataStream.readBoolean();
Mekanism.obsidianTNTDelay = dataStream.readInt();
Mekanism.obsidianTNTBlastRadius = dataStream.readInt();
Mekanism.UPDATE_DELAY = dataStream.readInt();
Mekanism.FROM_IC2 = dataStream.readDouble();
Mekanism.TO_IC2 = dataStream.readDouble();
Mekanism.FROM_BC = dataStream.readDouble();
Mekanism.TO_BC = dataStream.readDouble();
Mekanism.FROM_H2 = dataStream.readDouble();
Mekanism.ENERGY_PER_REDSTONE = dataStream.readDouble();
Mekanism.VOICE_PORT = dataStream.readInt();
Mekanism.maxUpgradeMultiplier = dataStream.readInt();
Mekanism.activeType = EnergyType.values()[dataStream.readInt()];
general.updateNotifications = dataStream.readBoolean();
general.controlCircuitOreDict = dataStream.readBoolean();
general.logPackets = dataStream.readBoolean();
general.dynamicTankEasterEgg = dataStream.readBoolean();
general.voiceServerEnabled = dataStream.readBoolean();
general.cardboardSpawners = dataStream.readBoolean();
general.creativeOverrideElectricChest = dataStream.readBoolean();
general.spawnBabySkeletons = dataStream.readBoolean();
general.obsidianTNTDelay = dataStream.readInt();
general.obsidianTNTBlastRadius = dataStream.readInt();
general.UPDATE_DELAY = dataStream.readInt();
general.FROM_IC2 = dataStream.readDouble();
general.TO_IC2 = dataStream.readDouble();
general.FROM_BC = dataStream.readDouble();
general.TO_BC = dataStream.readDouble();
general.FROM_H2 = dataStream.readDouble();
general.ENERGY_PER_REDSTONE = dataStream.readDouble();
general.VOICE_PORT = dataStream.readInt();
general.maxUpgradeMultiplier = dataStream.readInt();
general.activeType = EnergyType.values()[dataStream.readInt()];
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;
Mekanism.enrichmentChamberUsage = dataStream.readDouble();
Mekanism.osmiumCompressorUsage = dataStream.readDouble();
Mekanism.combinerUsage = dataStream.readDouble();
Mekanism.crusherUsage = dataStream.readDouble();
Mekanism.factoryUsage = dataStream.readDouble();
Mekanism.metallurgicInfuserUsage = dataStream.readDouble();
Mekanism.purificationChamberUsage = dataStream.readDouble();
Mekanism.energizedSmelterUsage = dataStream.readDouble();
Mekanism.digitalMinerUsage = dataStream.readDouble();
Mekanism.electricPumpUsage = dataStream.readDouble();
Mekanism.rotaryCondensentratorUsage = dataStream.readDouble();
Mekanism.oxidationChamberUsage = dataStream.readDouble();
Mekanism.chemicalInfuserUsage = dataStream.readDouble();
Mekanism.chemicalInjectionChamberUsage = dataStream.readDouble();
Mekanism.precisionSawmillUsage = dataStream.readDouble();
Mekanism.chemicalDissolutionChamberUsage = dataStream.readDouble();
Mekanism.chemicalWasherUsage = dataStream.readDouble();
Mekanism.chemicalCrystallizerUsage = dataStream.readDouble();
Mekanism.seismicVibratorUsage = dataStream.readDouble();
Mekanism.fluidicPlenisherUsage = dataStream.readDouble();
usage.enrichmentChamberUsage = dataStream.readDouble();
usage.osmiumCompressorUsage = dataStream.readDouble();
usage.combinerUsage = dataStream.readDouble();
usage.crusherUsage = dataStream.readDouble();
usage.factoryUsage = dataStream.readDouble();
usage.metallurgicInfuserUsage = dataStream.readDouble();
usage.purificationChamberUsage = dataStream.readDouble();
usage.energizedSmelterUsage = dataStream.readDouble();
usage.digitalMinerUsage = dataStream.readDouble();
usage.electricPumpUsage = dataStream.readDouble();
usage.rotaryCondensentratorUsage = dataStream.readDouble();
usage.oxidationChamberUsage = dataStream.readDouble();
usage.chemicalInfuserUsage = dataStream.readDouble();
usage.chemicalInjectionChamberUsage = dataStream.readDouble();
usage.precisionSawmillUsage = dataStream.readDouble();
usage.chemicalDissolutionChamberUsage = dataStream.readDouble();
usage.chemicalWasherUsage = dataStream.readDouble();
usage.chemicalCrystallizerUsage = dataStream.readDouble();
usage.seismicVibratorUsage = dataStream.readDouble();
usage.fluidicPlenisherUsage = dataStream.readDouble();
try {
for(IModule module : Mekanism.modulesLoaded)

5
src/main/java/mekanism/common/recipe/BinRecipe.java
View file

@ -1,6 +1,6 @@
package mekanism.common.recipe;
import mekanism.common.Mekanism;
import mekanism.common.MekanismItems;
import mekanism.common.inventory.InventoryBin;
import mekanism.common.item.ItemBlockBasic;
import mekanism.common.item.ItemProxy;
@ -9,7 +9,6 @@ import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent;
@ -165,7 +164,7 @@ public class BinRecipe implements IRecipe
if(testRemain != null && testRemain.stackSize > 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);
}

14
src/main/java/mekanism/common/recipe/RecipeHandler.java
View file

@ -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;

3
src/main/java/mekanism/common/tank/TankUpdateProtocol.java
View file

@ -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;
}
/**

7
src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java
View file

@ -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)
{

3
src/main/java/mekanism/common/tile/TileEntityBasicMachine.java
View file

@ -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);
}

2
src/main/java/mekanism/common/tile/TileEntityBin.java
View file

@ -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;

6
src/main/java/mekanism/common/tile/TileEntityChanceMachine.java
View file

@ -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)
{

7
src/main/java/mekanism/common/tile/TileEntityChargepad.java
View file

@ -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));
}
}
}

3
src/main/java/mekanism/common/tile/TileEntityChemicalCrystallizer.java
View file

@ -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;

3
src/main/java/mekanism/common/tile/TileEntityChemicalDissolutionChamber.java
View file

@ -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);

3
src/main/java/mekanism/common/tile/TileEntityChemicalInfuser.java
View file

@ -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;

Some files were not shown because too many files have changed in this diff Show more