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

Remove the rest of the Theoretical Elementizer references

Browse source
This commit is contained in:
Aidan C. Brady 2013-11-01 11:36:29 -04:00
parent 91a8839203
commit 9b4bd09958
5 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/mekanism/common/CommonProxy.java
View file

@ -160,7 +160,6 @@ public class CommonProxy
Mekanism.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 50).getDouble(50); Mekanism.osmiumCompressorUsage = Mekanism.configuration.get("usage", "OsmiumCompressorUsage", 50).getDouble(50);
Mekanism.combinerUsage = Mekanism.configuration.get("usage", "CombinerUsage", 50).getDouble(50); Mekanism.combinerUsage = Mekanism.configuration.get("usage", "CombinerUsage", 50).getDouble(50);
Mekanism.crusherUsage = Mekanism.configuration.get("usage", "CrusherUsage", 50).getDouble(50); Mekanism.crusherUsage = Mekanism.configuration.get("usage", "CrusherUsage", 50).getDouble(50);
Mekanism.theoreticalElementizerUsage = Mekanism.configuration.get("usage", "TheoreticalElementizerUsage", 80).getDouble(80);
Mekanism.factoryUsage = Mekanism.configuration.get("usage", "FactoryUsage", 50).getDouble(50); Mekanism.factoryUsage = Mekanism.configuration.get("usage", "FactoryUsage", 50).getDouble(50);
Mekanism.metallurgicInfuserUsage = Mekanism.configuration.get("usage", "MetallurgicInfuserUsage", 50).getDouble(50); Mekanism.metallurgicInfuserUsage = Mekanism.configuration.get("usage", "MetallurgicInfuserUsage", 50).getDouble(50);
Mekanism.purificationChamberUsage = Mekanism.configuration.get("usage", "PurificationChamberUsage", 50).getDouble(50); Mekanism.purificationChamberUsage = Mekanism.configuration.get("usage", "PurificationChamberUsage", 50).getDouble(50);

1
common/mekanism/common/Mekanism.java
View file

@ -235,7 +235,6 @@ public class Mekanism
public static double osmiumCompressorUsage; public static double osmiumCompressorUsage;
public static double combinerUsage; public static double combinerUsage;
public static double crusherUsage; public static double crusherUsage;
public static double theoreticalElementizerUsage;
public static double factoryUsage; public static double factoryUsage;
public static double metallurgicInfuserUsage; public static double metallurgicInfuserUsage;
public static double purificationChamberUsage; public static double purificationChamberUsage;

2
common/mekanism/common/block/BlockMachine.java
View file

@ -73,7 +73,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* 1: Osmium Compressor * 1: Osmium Compressor
* 2: Combiner * 2: Combiner
* 3: Crusher * 3: Crusher
* 4: Theoretical Elementizer * 4: OPEN
* 5: Basic Factory * 5: Basic Factory
* 6: Advanced Factory * 6: Advanced Factory
* 7: Elite Factory * 7: Elite Factory

16
common/mekanism/common/inventory/container/ContainerAdvancedElectricMachine.java
View file

@ -79,22 +79,6 @@ public class ContainerAdvancedElectricMachine extends Container
return null; return null;
} }
} }
else if(tileEntity.getInvName().equals("Theoretical Elementizer") && slotStack.isItemEqual(new ItemStack(Mekanism.EnrichedAlloy)))
{
if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)
{
if (!mergeItemStack(slotStack, 0, 1, false))
{
return null;
}
}
else {
if(!mergeItemStack(slotStack, 5, inventorySlots.size(), true))
{
return null;
}
}
}
else if(ChargeUtils.canBeDischarged(slotStack)) else if(ChargeUtils.canBeDischarged(slotStack))
{ {
if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3) if(slotID != 0 && slotID != 1 && slotID != 2 && slotID != 3)

2
common/mekanism/common/item/ItemBlockMachine.java
View file

@ -53,7 +53,7 @@ import cpw.mods.fml.relauncher.SideOnly;
* 1: Osmium Compressor * 1: Osmium Compressor
* 2: Combiner * 2: Combiner
* 3: Crusher * 3: Crusher
* 4: Theoretical Elementizer * 4: OPEN
* 5: Basic Factory * 5: Basic Factory
* 6: Advanced Factory * 6: Advanced Factory
* 7: Elite Factory * 7: Elite Factory