Re-enable indev machines for now, change Chemical Formulator to Oxidation Chamber, introduce sulphur dust.
This commit is contained in:
Ben Spiers
parent
14b9d7b22d
commit
48b3e48ed3
|
|
@ -98,11 +98,11 @@ public final class RecipeHelper
|
|||
* @param input - input ItemStack
|
||||
* @param output - output GasStack
|
||||
*/
|
||||
public static void addChemicalFormulatorRecipe(ItemStack input, GasStack output)
|
||||
public static void addOxidationChamberRecipe(ItemStack input, GasStack output)
|
||||
{
|
||||
try {
|
||||
Class recipeClass = Class.forName("mekanism.common.RecipeHandler");
|
||||
Method m = recipeClass.getMethod("addChemicalFormulatorRecipe", ItemStack.class, GasStack.class);
|
||||
Method m = recipeClass.getMethod("addOxidationChamberRecipe", ItemStack.class, GasStack.class);
|
||||
m.invoke(null, input, output);
|
||||
} catch(Exception e) {
|
||||
System.err.println("[Mekanism] Error while adding recipe: " + e.getMessage());
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ package mekanism.client;
|
|||
import java.io.File;
|
||||
import java.util.HashMap;
|
||||
|
||||
import mekanism.client.gui.GuiChemicalFormulator;
|
||||
import mekanism.client.gui.GuiOxidationChamber;
|
||||
import mekanism.client.gui.GuiChemicalInfuser;
|
||||
import mekanism.client.gui.GuiChemicalInjectionChamber;
|
||||
import mekanism.client.gui.GuiCombiner;
|
||||
|
|
@ -74,39 +74,8 @@ import mekanism.common.Mekanism;
|
|||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.inventory.InventoryElectricChest;
|
||||
import mekanism.common.item.ItemPortableTeleporter;
|
||||
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
|
||||
import mekanism.common.tileentity.TileEntityAdvancedFactory;
|
||||
import mekanism.common.tileentity.TileEntityBin;
|
||||
import mekanism.common.tileentity.TileEntityChargepad;
|
||||
import mekanism.common.tileentity.TileEntityChemicalFormulator;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInfuser;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInjectionChamber;
|
||||
import mekanism.common.tileentity.TileEntityCombiner;
|
||||
import mekanism.common.tileentity.TileEntityCrusher;
|
||||
import mekanism.common.tileentity.TileEntityDigitalMiner;
|
||||
import mekanism.common.tileentity.TileEntityDiversionTransporter;
|
||||
import mekanism.common.tileentity.TileEntityDynamicTank;
|
||||
import mekanism.common.tileentity.TileEntityDynamicValve;
|
||||
import mekanism.common.tileentity.TileEntityElectricChest;
|
||||
import mekanism.common.tileentity.TileEntityElectricMachine;
|
||||
import mekanism.common.tileentity.TileEntityElectricPump;
|
||||
import mekanism.common.tileentity.TileEntityEliteFactory;
|
||||
import mekanism.common.tileentity.TileEntityEnergizedSmelter;
|
||||
import mekanism.common.tileentity.TileEntityEnergyCube;
|
||||
import mekanism.common.tileentity.TileEntityEnrichmentChamber;
|
||||
import mekanism.common.tileentity.TileEntityFactory;
|
||||
import mekanism.common.tileentity.TileEntityGasTank;
|
||||
import mekanism.common.tileentity.TileEntityLogisticalSorter;
|
||||
import mekanism.common.tileentity.TileEntityLogisticalTransporter;
|
||||
import mekanism.common.tileentity.TileEntityMechanicalPipe;
|
||||
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
|
||||
import mekanism.common.tileentity.TileEntityObsidianTNT;
|
||||
import mekanism.common.tileentity.TileEntityOsmiumCompressor;
|
||||
import mekanism.common.tileentity.TileEntityPressurizedTube;
|
||||
import mekanism.common.tileentity.TileEntityPurificationChamber;
|
||||
import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tileentity.TileEntityTeleporter;
|
||||
import mekanism.common.tileentity.TileEntityUniversalCable;
|
||||
import mekanism.common.tileentity.*;
|
||||
import mekanism.common.tileentity.TileEntityOxidationChamber;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
|
|
@ -270,6 +239,8 @@ public class ClientProxy extends CommonProxy
|
|||
ClientRegistry.registerTileEntity(TileEntityDigitalMiner.class, "DigitalMiner", new RenderDigitalMiner());
|
||||
ClientRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator", new RenderRotaryCondensentrator());
|
||||
ClientRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter", new RenderTeleporter());
|
||||
GameRegistry.registerTileEntity(TileEntityOxidationChamber.class, "OxidationChamber");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser");
|
||||
ClientRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber", new RenderConfigurableMachine());
|
||||
}
|
||||
|
||||
|
|
@ -388,7 +359,7 @@ public class ClientProxy extends CommonProxy
|
|||
case 25:
|
||||
return new GuiRobitRepair(player.inventory, world, x);
|
||||
case 29:
|
||||
return new GuiChemicalFormulator(player.inventory, (TileEntityChemicalFormulator) tileEntity);
|
||||
return new GuiOxidationChamber(player.inventory, (TileEntityOxidationChamber) tileEntity);
|
||||
case 30:
|
||||
return new GuiChemicalInfuser(player.inventory, (TileEntityChemicalInfuser) tileEntity);
|
||||
case 31:
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@ package mekanism.client.gui;
|
|||
|
||||
import mekanism.api.gas.GasStack;
|
||||
import mekanism.client.render.MekanismRenderer;
|
||||
import mekanism.common.inventory.container.ContainerChemicalFormulator;
|
||||
import mekanism.common.tileentity.TileEntityChemicalFormulator;
|
||||
import mekanism.common.inventory.container.ContainerOxidationChamber;
|
||||
import mekanism.common.tileentity.TileEntityOxidationChamber;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
|
@ -15,16 +15,16 @@ import cpw.mods.fml.relauncher.Side;
|
|||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public class GuiChemicalFormulator extends GuiMekanism
|
||||
public class GuiOxidationChamber extends GuiMekanism
|
||||
{
|
||||
public TileEntityChemicalFormulator tileEntity;
|
||||
public TileEntityOxidationChamber tileEntity;
|
||||
|
||||
public GuiChemicalFormulator(InventoryPlayer inventory, TileEntityChemicalFormulator tentity)
|
||||
public GuiOxidationChamber(InventoryPlayer inventory, TileEntityOxidationChamber tentity)
|
||||
{
|
||||
super(tentity, new ContainerChemicalFormulator(inventory, tentity));
|
||||
super(tentity, new ContainerOxidationChamber(inventory, tentity));
|
||||
tileEntity = tentity;
|
||||
|
||||
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalFormulator.png")));
|
||||
guiElements.add(new GuiRedstoneControl(this, tileEntity, MekanismUtils.getResource(ResourceType.GUI, "GuiOxidationChamber.png")));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -54,7 +54,7 @@ public class GuiChemicalFormulator extends GuiMekanism
|
|||
{
|
||||
super.drawGuiContainerBackgroundLayer(partialTick, mouseX, mouseY);
|
||||
|
||||
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalFormulator.png"));
|
||||
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiOxidationChamber.png"));
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
int guiWidth = (width - xSize) / 2;
|
||||
int guiHeight = (height - ySize) / 2;
|
||||
|
|
@ -122,7 +122,7 @@ public class GuiChemicalFormulator extends GuiMekanism
|
|||
}
|
||||
}
|
||||
|
||||
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiChemicalFormulator.png"));
|
||||
mc.renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.GUI, "GuiOxidationChamber.png"));
|
||||
drawTexturedModalRect(guiWidth + xPos, guiHeight + yPos, 176, 40, 16, 59);
|
||||
}
|
||||
}
|
||||
|
|
@ -2,61 +2,10 @@ package mekanism.common;
|
|||
|
||||
import java.io.File;
|
||||
|
||||
import mekanism.common.inventory.container.ContainerAdvancedElectricMachine;
|
||||
import mekanism.common.inventory.container.ContainerChemicalFormulator;
|
||||
import mekanism.common.inventory.container.ContainerChemicalInfuser;
|
||||
import mekanism.common.inventory.container.ContainerDictionary;
|
||||
import mekanism.common.inventory.container.ContainerDigitalMiner;
|
||||
import mekanism.common.inventory.container.ContainerDynamicTank;
|
||||
import mekanism.common.inventory.container.ContainerElectricMachine;
|
||||
import mekanism.common.inventory.container.ContainerElectricPump;
|
||||
import mekanism.common.inventory.container.ContainerEnergyCube;
|
||||
import mekanism.common.inventory.container.ContainerFactory;
|
||||
import mekanism.common.inventory.container.ContainerFilter;
|
||||
import mekanism.common.inventory.container.ContainerGasTank;
|
||||
import mekanism.common.inventory.container.ContainerMetallurgicInfuser;
|
||||
import mekanism.common.inventory.container.ContainerNull;
|
||||
import mekanism.common.inventory.container.ContainerRobitCrafting;
|
||||
import mekanism.common.inventory.container.ContainerRobitInventory;
|
||||
import mekanism.common.inventory.container.ContainerRobitMain;
|
||||
import mekanism.common.inventory.container.ContainerRobitRepair;
|
||||
import mekanism.common.inventory.container.ContainerRobitSmelting;
|
||||
import mekanism.common.inventory.container.ContainerRotaryCondensentrator;
|
||||
import mekanism.common.inventory.container.ContainerTeleporter;
|
||||
import mekanism.common.tileentity.TileEntityAdvancedElectricMachine;
|
||||
import mekanism.common.tileentity.TileEntityAdvancedFactory;
|
||||
import mekanism.common.tileentity.TileEntityBin;
|
||||
import mekanism.common.tileentity.TileEntityChargepad;
|
||||
import mekanism.common.tileentity.TileEntityChemicalFormulator;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInfuser;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInjectionChamber;
|
||||
import mekanism.common.tileentity.TileEntityCombiner;
|
||||
import mekanism.common.tileentity.TileEntityContainerBlock;
|
||||
import mekanism.common.tileentity.TileEntityCrusher;
|
||||
import mekanism.common.tileentity.TileEntityDigitalMiner;
|
||||
import mekanism.common.tileentity.TileEntityDiversionTransporter;
|
||||
import mekanism.common.tileentity.TileEntityDynamicTank;
|
||||
import mekanism.common.tileentity.TileEntityDynamicValve;
|
||||
import mekanism.common.tileentity.TileEntityElectricChest;
|
||||
import mekanism.common.tileentity.TileEntityElectricMachine;
|
||||
import mekanism.common.tileentity.TileEntityElectricPump;
|
||||
import mekanism.common.tileentity.TileEntityEliteFactory;
|
||||
import mekanism.common.tileentity.TileEntityEnergizedSmelter;
|
||||
import mekanism.common.tileentity.TileEntityEnergyCube;
|
||||
import mekanism.common.tileentity.TileEntityEnrichmentChamber;
|
||||
import mekanism.common.tileentity.TileEntityFactory;
|
||||
import mekanism.common.tileentity.TileEntityGasTank;
|
||||
import mekanism.common.tileentity.TileEntityLogisticalSorter;
|
||||
import mekanism.common.tileentity.TileEntityLogisticalTransporter;
|
||||
import mekanism.common.tileentity.TileEntityMechanicalPipe;
|
||||
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
|
||||
import mekanism.common.tileentity.TileEntityObsidianTNT;
|
||||
import mekanism.common.tileentity.TileEntityOsmiumCompressor;
|
||||
import mekanism.common.tileentity.TileEntityPressurizedTube;
|
||||
import mekanism.common.tileentity.TileEntityPurificationChamber;
|
||||
import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tileentity.TileEntityTeleporter;
|
||||
import mekanism.common.tileentity.TileEntityUniversalCable;
|
||||
import mekanism.common.inventory.container.*;
|
||||
import mekanism.common.inventory.container.ContainerOxidationChamber;
|
||||
import mekanism.common.tileentity.*;
|
||||
import mekanism.common.tileentity.TileEntityOxidationChamber;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.inventory.Container;
|
||||
|
|
@ -107,7 +56,7 @@ public class CommonProxy
|
|||
GameRegistry.registerTileEntity(TileEntityObsidianTNT.class, "ObsidianTNT");
|
||||
GameRegistry.registerTileEntity(TileEntityRotaryCondensentrator.class, "RotaryCondensentrator");
|
||||
GameRegistry.registerTileEntity(TileEntityTeleporter.class, "MekanismTeleporter");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalFormulator.class, "ChemicalFormulator");
|
||||
GameRegistry.registerTileEntity(TileEntityOxidationChamber.class, "OxidationChamber");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalInfuser.class, "ChemicalInfuser");
|
||||
GameRegistry.registerTileEntity(TileEntityChemicalInjectionChamber.class, "ChemicalInjectionChamber");
|
||||
}
|
||||
|
|
@ -206,7 +155,7 @@ public class CommonProxy
|
|||
Mekanism.energizedSmelterUsage = Mekanism.configuration.get("usage", "EnergizedSmelterUsage", 50D).getDouble(50D);
|
||||
Mekanism.digitalMinerUsage = Mekanism.configuration.get("usage", "DigitalMinerUsage", 100D).getDouble(100D);
|
||||
Mekanism.rotaryCondensentratorUsage = Mekanism.configuration.get("usage", "RotaryCondensentratorUsage", 50D).getDouble(50D);
|
||||
Mekanism.chemicalFormulatorUsage = Mekanism.configuration.get("usage", "ChemicalFormulatorUsage", 100D).getDouble(100D);
|
||||
Mekanism.oxidationChamberUsage = Mekanism.configuration.get("usage", "OxidationChamberUsage", 100D).getDouble(100D);
|
||||
Mekanism.chemicalInfuserUsage = Mekanism.configuration.get("usage", "ChemicalInfuserUsage", 100D).getDouble(100D);
|
||||
Mekanism.chemicalInjectionChamberUsage = Mekanism.configuration.get("usage", "ChemicalInjectionChamberUsage", 200D).getDouble(200D);
|
||||
Mekanism.configuration.save();
|
||||
|
|
@ -341,7 +290,7 @@ public class CommonProxy
|
|||
case 28:
|
||||
return new ContainerFilter(player.inventory, (TileEntityContainerBlock)tileEntity);
|
||||
case 29:
|
||||
return new ContainerChemicalFormulator(player.inventory, (TileEntityChemicalFormulator)tileEntity);
|
||||
return new ContainerOxidationChamber(player.inventory, (TileEntityOxidationChamber)tileEntity);
|
||||
case 30:
|
||||
return new ContainerChemicalInfuser(player.inventory, (TileEntityChemicalInfuser)tileEntity);
|
||||
case 31:
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ public class Mekanism
|
|||
public static double energizedSmelterUsage;
|
||||
public static double digitalMinerUsage;
|
||||
public static double rotaryCondensentratorUsage;
|
||||
public static double chemicalFormulatorUsage;
|
||||
public static double oxidationChamberUsage;
|
||||
public static double chemicalInfuserUsage;
|
||||
public static double chemicalInjectionChamberUsage;
|
||||
|
||||
|
|
@ -593,7 +593,8 @@ public class Mekanism
|
|||
RecipeHandler.addCrusherRecipe(new ItemStack(Block.stoneBrick, 1, 0), new ItemStack(Block.stoneBrick, 1, 2));
|
||||
RecipeHandler.addCrusherRecipe(new ItemStack(Block.stoneBrick, 1, 3), new ItemStack(Block.stoneBrick, 1, 0));
|
||||
RecipeHandler.addCrusherRecipe(new ItemStack(Item.flint, 4), new ItemStack(Item.gunpowder));
|
||||
|
||||
RecipeHandler.addCrusherRecipe(new ItemStack(Item.gunpowder, 2), new ItemStack(Dust, 1, 10));
|
||||
|
||||
//Purification Chamber Recipes
|
||||
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(Clump, 2, 6));
|
||||
RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.gravel), new ItemStack(Item.flint));
|
||||
|
|
@ -613,7 +614,7 @@ public class Mekanism
|
|||
}
|
||||
|
||||
//Chemical Formulator Recipes
|
||||
RecipeHandler.addChemicalFormulatorRecipe(new ItemStack(Item.gunpowder), new GasStack(GasRegistry.getGas("sulfuricGas"), 100));
|
||||
RecipeHandler.addOxidationChamberRecipe(new ItemStack(Mekanism.Dust, 1, 10), new GasStack(GasRegistry.getGas("sulfuricGas"), 100));
|
||||
|
||||
//Chemical Infuser Recipes
|
||||
RecipeHandler.addChemicalInfuserRecipe(new ChemicalInput(new GasStack(GasRegistry.getGas("hydrogen"), 1), new GasStack(GasRegistry.getGas("sulfuricGas"), 1)), new GasStack(GasRegistry.getGas("sulfuricAcid"), 1));
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ public final class RecipeHandler
|
|||
* @param input - input ItemStack
|
||||
* @param output - output GasStack
|
||||
*/
|
||||
public static void addChemicalFormulatorRecipe(ItemStack input, GasStack output)
|
||||
public static void addOxidationChamberRecipe(ItemStack input, GasStack output)
|
||||
{
|
||||
Recipe.CHEMICAL_FORMULATOR.put(input, output);
|
||||
}
|
||||
|
|
@ -185,7 +185,7 @@ public final class RecipeHandler
|
|||
* @param stackDecrease - whether or not to decrease the input slot's stack size
|
||||
* @return output GasStack
|
||||
*/
|
||||
public static GasStack getChemicalFormulatorOutput(ItemStack itemstack, boolean stackDecrease)
|
||||
public static GasStack getOxidationChamberOutput(ItemStack itemstack, boolean stackDecrease)
|
||||
{
|
||||
if(itemstack != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,30 +26,8 @@ import mekanism.common.network.PacketElectricChest;
|
|||
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
|
||||
import mekanism.common.network.PacketLogisticalSorterGui;
|
||||
import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket;
|
||||
import mekanism.common.network.PacketSimpleGui;
|
||||
import mekanism.common.tileentity.TileEntityAdvancedFactory;
|
||||
import mekanism.common.tileentity.TileEntityBasicBlock;
|
||||
import mekanism.common.tileentity.TileEntityChargepad;
|
||||
import mekanism.common.tileentity.TileEntityChemicalFormulator;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInfuser;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInjectionChamber;
|
||||
import mekanism.common.tileentity.TileEntityCombiner;
|
||||
import mekanism.common.tileentity.TileEntityContainerBlock;
|
||||
import mekanism.common.tileentity.TileEntityCrusher;
|
||||
import mekanism.common.tileentity.TileEntityDigitalMiner;
|
||||
import mekanism.common.tileentity.TileEntityElectricBlock;
|
||||
import mekanism.common.tileentity.TileEntityElectricChest;
|
||||
import mekanism.common.tileentity.TileEntityElectricPump;
|
||||
import mekanism.common.tileentity.TileEntityEliteFactory;
|
||||
import mekanism.common.tileentity.TileEntityEnergizedSmelter;
|
||||
import mekanism.common.tileentity.TileEntityEnrichmentChamber;
|
||||
import mekanism.common.tileentity.TileEntityFactory;
|
||||
import mekanism.common.tileentity.TileEntityLogisticalSorter;
|
||||
import mekanism.common.tileentity.TileEntityMetallurgicInfuser;
|
||||
import mekanism.common.tileentity.TileEntityOsmiumCompressor;
|
||||
import mekanism.common.tileentity.TileEntityPurificationChamber;
|
||||
import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tileentity.TileEntityTeleporter;
|
||||
import mekanism.common.tileentity.*;
|
||||
import mekanism.common.tileentity.TileEntityOxidationChamber;
|
||||
import mekanism.common.transporter.TransporterFilter;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.TransporterUtils;
|
||||
|
|
@ -154,6 +132,12 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
}
|
||||
else if(blockID == Mekanism.machineBlock2ID)
|
||||
{
|
||||
icons[1][0] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOff");
|
||||
icons[1][1] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOn");
|
||||
icons[1][2] = register.registerIcon("mekanism:SteelCasing");
|
||||
icons[2][0] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOff");
|
||||
icons[2][1] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOn");
|
||||
icons[2][2] = register.registerIcon("mekanism:SteelCasing");
|
||||
icons[3][0] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOff");
|
||||
icons[3][1] = register.registerIcon("mekanism:ChemicalInjectionChamberFrontOn");
|
||||
icons[3][2] = register.registerIcon("mekanism:SteelCasing");
|
||||
|
|
@ -412,16 +396,36 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
}
|
||||
else if(blockID == Mekanism.machineBlock2ID)
|
||||
{
|
||||
if(meta == 3)
|
||||
{
|
||||
if(side == 3)
|
||||
{
|
||||
return icons[3][0];
|
||||
}
|
||||
else {
|
||||
return icons[3][2];
|
||||
}
|
||||
}
|
||||
if(meta == 1)
|
||||
{
|
||||
if(side == 3)
|
||||
{
|
||||
return icons[1][0];
|
||||
}
|
||||
else {
|
||||
return icons[1][2];
|
||||
}
|
||||
}
|
||||
else if(meta == 2)
|
||||
{
|
||||
if(side == 3)
|
||||
{
|
||||
return icons[2][0];
|
||||
}
|
||||
else {
|
||||
return icons[2][2];
|
||||
}
|
||||
}
|
||||
else if(meta == 3)
|
||||
{
|
||||
if(side == 3)
|
||||
{
|
||||
return icons[3][0];
|
||||
}
|
||||
else {
|
||||
return icons[3][2];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
@ -545,14 +549,14 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
}
|
||||
else if(blockID == Mekanism.machineBlock2ID)
|
||||
{
|
||||
if(metadata == 3)
|
||||
if(metadata == 1 || metadata == 2 || metadata == 3)
|
||||
{
|
||||
if(side == tileEntity.facing)
|
||||
{
|
||||
return MekanismUtils.isActive(world, x, y, z) ? icons[3][1] : icons[3][0];
|
||||
return MekanismUtils.isActive(world, x, y, z) ? icons[metadata][1] : icons[metadata][0];
|
||||
}
|
||||
else {
|
||||
return icons[3][2];
|
||||
return icons[metadata][2];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -572,9 +576,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
{
|
||||
for(MachineType type : MachineType.values())
|
||||
{
|
||||
if(type == MachineType.CHEMICAL_FORMULATOR || type == MachineType.CHEMICAL_INFUSER /*TODO*/)
|
||||
if(type == MachineType.OXIDATION_CHAMBER || type == MachineType.CHEMICAL_INFUSER /*TODO*/)
|
||||
{
|
||||
continue;
|
||||
//continue;
|
||||
}
|
||||
|
||||
if(type.typeId == blockID)
|
||||
|
|
@ -963,9 +967,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
}
|
||||
}
|
||||
|
||||
if(tileEntity instanceof TileEntityChemicalFormulator)
|
||||
if(tileEntity instanceof TileEntityOxidationChamber)
|
||||
{
|
||||
TileEntityChemicalFormulator formulator = (TileEntityChemicalFormulator)tileEntity;
|
||||
TileEntityOxidationChamber formulator = (TileEntityOxidationChamber)tileEntity;
|
||||
|
||||
if(formulator.gasTank.getGas() != null)
|
||||
{
|
||||
|
|
@ -977,17 +981,17 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
{
|
||||
TileEntityChemicalInfuser infuser = (TileEntityChemicalInfuser)tileEntity;
|
||||
|
||||
if(infuser.leftTank != null)
|
||||
if(infuser.leftTank.getGas() != null)
|
||||
{
|
||||
itemStack.stackTagCompound.setCompoundTag("leftTank", infuser.leftTank.getGas().write(new NBTTagCompound()));
|
||||
}
|
||||
|
||||
if(infuser.rightTank != null)
|
||||
if(infuser.rightTank.getGas() != null)
|
||||
{
|
||||
itemStack.stackTagCompound.setCompoundTag("rightTank", infuser.rightTank.getGas().write(new NBTTagCompound()));
|
||||
}
|
||||
|
||||
if(infuser.centerTank != null)
|
||||
if(infuser.centerTank.getGas() != null)
|
||||
{
|
||||
itemStack.stackTagCompound.setCompoundTag("leftTank", infuser.centerTank.getGas().write(new NBTTagCompound()));
|
||||
}
|
||||
|
|
@ -1085,8 +1089,8 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds
|
|||
CHARGEPAD(Mekanism.machineBlockID, 14, "Chargepad", -1, 10000, TileEntityChargepad.class, true),
|
||||
LOGISTICAL_SORTER(Mekanism.machineBlockID, 15, "LogisticalSorter", -1, 0, TileEntityLogisticalSorter.class, true),
|
||||
ROTARY_CONDENSENTRATOR(Mekanism.machineBlock2ID, 0, "RotaryCondensentrator", 7, 20000, TileEntityRotaryCondensentrator.class, true),
|
||||
CHEMICAL_FORMULATOR(Mekanism.machineBlock2ID, 1, "ChemicalFormulator", 29, 20000, TileEntityChemicalFormulator.class, true),
|
||||
CHEMICAL_INFUSER(Mekanism.machineBlock2ID, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, true),
|
||||
OXIDATION_CHAMBER(Mekanism.machineBlock2ID, 1, "OxidationChamber", 29, 20000, TileEntityOxidationChamber.class, false),
|
||||
CHEMICAL_INFUSER(Mekanism.machineBlock2ID, 2, "ChemicalInfuser", 30, 20000, TileEntityChemicalInfuser.class, false),
|
||||
CHEMICAL_INJECTION_CHAMBER(Mekanism.machineBlock2ID, 3, "ChemicalInjectionChamber", 31, Mekanism.chemicalInjectionChamberUsage*400, TileEntityChemicalInjectionChamber.class, false);
|
||||
|
||||
public int typeId;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import mekanism.api.gas.IGasItem;
|
|||
import mekanism.common.RecipeHandler;
|
||||
import mekanism.common.inventory.slot.SlotEnergy.SlotDischarge;
|
||||
import mekanism.common.inventory.slot.SlotStorageTank;
|
||||
import mekanism.common.tileentity.TileEntityChemicalFormulator;
|
||||
import mekanism.common.tileentity.TileEntityOxidationChamber;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
|
|
@ -12,11 +12,11 @@ import net.minecraft.inventory.Container;
|
|||
import net.minecraft.inventory.Slot;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
public class ContainerChemicalFormulator extends Container
|
||||
public class ContainerOxidationChamber extends Container
|
||||
{
|
||||
private TileEntityChemicalFormulator tileEntity;
|
||||
private TileEntityOxidationChamber tileEntity;
|
||||
|
||||
public ContainerChemicalFormulator(InventoryPlayer inventory, TileEntityChemicalFormulator tentity)
|
||||
public ContainerOxidationChamber(InventoryPlayer inventory, TileEntityOxidationChamber tentity)
|
||||
{
|
||||
tileEntity = tentity;
|
||||
addSlotToContainer(new Slot(tentity, 0, 26, 36));
|
||||
|
|
@ -68,7 +68,7 @@ public class ContainerChemicalFormulator extends Container
|
|||
ItemStack slotStack = currentSlot.getStack();
|
||||
stack = slotStack.copy();
|
||||
|
||||
if(RecipeHandler.getChemicalFormulatorOutput(slotStack, false) != null)
|
||||
if(RecipeHandler.getOxidationChamberOutput(slotStack, false) != null)
|
||||
{
|
||||
if(!mergeItemStack(slotStack, 0, 1, true))
|
||||
{
|
||||
|
|
@ -28,14 +28,8 @@ import mekanism.common.inventory.InventoryElectricChest;
|
|||
import mekanism.common.miner.MinerFilter;
|
||||
import mekanism.common.network.PacketElectricChest;
|
||||
import mekanism.common.network.PacketElectricChest.ElectricChestPacketType;
|
||||
import mekanism.common.tileentity.TileEntityChemicalFormulator;
|
||||
import mekanism.common.tileentity.TileEntityChemicalInfuser;
|
||||
import mekanism.common.tileentity.TileEntityDigitalMiner;
|
||||
import mekanism.common.tileentity.TileEntityElectricBlock;
|
||||
import mekanism.common.tileentity.TileEntityElectricChest;
|
||||
import mekanism.common.tileentity.TileEntityFactory;
|
||||
import mekanism.common.tileentity.TileEntityLogisticalSorter;
|
||||
import mekanism.common.tileentity.TileEntityRotaryCondensentrator;
|
||||
import mekanism.common.tileentity.*;
|
||||
import mekanism.common.tileentity.TileEntityOxidationChamber;
|
||||
import mekanism.common.transporter.TransporterFilter;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.TransporterUtils;
|
||||
|
|
@ -310,11 +304,11 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
|||
}
|
||||
}
|
||||
|
||||
if(tileEntity instanceof TileEntityChemicalFormulator)
|
||||
if(tileEntity instanceof TileEntityOxidationChamber)
|
||||
{
|
||||
if(stack.stackTagCompound != null)
|
||||
{
|
||||
((TileEntityChemicalFormulator)tileEntity).gasTank.setGas(GasStack.readFromNBT(stack.stackTagCompound.getCompoundTag("gasTank")));
|
||||
((TileEntityOxidationChamber)tileEntity).gasTank.setGas(GasStack.readFromNBT(stack.stackTagCompound.getCompoundTag("gasTank")));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -510,7 +504,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec
|
|||
MachineType type = MachineType.get((ItemStack)data[0]);
|
||||
|
||||
if(type != MachineType.TELEPORTER && type != MachineType.ELECTRIC_PUMP && type != MachineType.ELECTRIC_CHEST && type != MachineType.CHARGEPAD && type != MachineType.LOGISTICAL_SORTER &&
|
||||
type != MachineType.ROTARY_CONDENSENTRATOR && type != MachineType.CHEMICAL_FORMULATOR && type != MachineType.CHEMICAL_INFUSER)
|
||||
type != MachineType.ROTARY_CONDENSENTRATOR && type != MachineType.OXIDATION_CHAMBER && type != MachineType.CHEMICAL_INFUSER)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ public class ItemDust extends ItemMekanism
|
|||
public static String[] en_USNames = {"Iron", "Gold", "Osmium",
|
||||
"Obsidian", "Diamond", "Steel",
|
||||
"Copper", "Tin", "Silver",
|
||||
"Lead"};
|
||||
"Lead", "Sulfur"};
|
||||
|
||||
public ItemDust(int id)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class PacketConfigSync implements IMekanismPacket
|
|||
Mekanism.energizedSmelterUsage = dataStream.readDouble();
|
||||
Mekanism.digitalMinerUsage = dataStream.readDouble();
|
||||
Mekanism.rotaryCondensentratorUsage = dataStream.readDouble();
|
||||
Mekanism.chemicalFormulatorUsage = dataStream.readDouble();
|
||||
Mekanism.oxidationChamberUsage = dataStream.readDouble();
|
||||
Mekanism.chemicalInfuserUsage = dataStream.readDouble();
|
||||
Mekanism.chemicalInjectionChamberUsage = dataStream.readDouble();
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ public class PacketConfigSync implements IMekanismPacket
|
|||
dataStream.writeDouble(Mekanism.energizedSmelterUsage);
|
||||
dataStream.writeDouble(Mekanism.digitalMinerUsage);
|
||||
dataStream.writeDouble(Mekanism.rotaryCondensentratorUsage);
|
||||
dataStream.writeDouble(Mekanism.chemicalFormulatorUsage);
|
||||
dataStream.writeDouble(Mekanism.oxidationChamberUsage);
|
||||
dataStream.writeDouble(Mekanism.chemicalInfuserUsage);
|
||||
dataStream.writeDouble(Mekanism.chemicalInjectionChamberUsage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package mekanism.common.tileentity;
|
|||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import mekanism.api.ChemicalInput;
|
||||
import mekanism.api.Coord4D;
|
||||
import mekanism.api.gas.Gas;
|
||||
import mekanism.api.gas.GasRegistry;
|
||||
|
|
@ -12,12 +11,8 @@ import mekanism.api.gas.GasTransmission;
|
|||
import mekanism.api.gas.IGasHandler;
|
||||
import mekanism.api.gas.IGasItem;
|
||||
import mekanism.api.gas.ITubeConnection;
|
||||
import mekanism.common.IActiveState;
|
||||
import mekanism.common.IRedstoneControl;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.*;
|
||||
import mekanism.common.PacketHandler.Transmission;
|
||||
import mekanism.common.RecipeHandler;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.network.PacketTileEntity;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
|
|
@ -229,7 +224,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement
|
|||
data.add(isActive);
|
||||
data.add(controlType.ordinal());
|
||||
|
||||
if(leftTank != null)
|
||||
if(leftTank.getGas() != null)
|
||||
{
|
||||
data.add(true);
|
||||
data.add(leftTank.getGas().getGas().getID());
|
||||
|
|
@ -239,7 +234,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement
|
|||
data.add(false);
|
||||
}
|
||||
|
||||
if(rightTank != null)
|
||||
if(rightTank.getGas() != null)
|
||||
{
|
||||
data.add(true);
|
||||
data.add(rightTank.getGas().getGas().getID());
|
||||
|
|
@ -249,7 +244,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement
|
|||
data.add(false);
|
||||
}
|
||||
|
||||
if(centerTank != null)
|
||||
if(centerTank.getGas() != null)
|
||||
{
|
||||
data.add(true);
|
||||
data.add(centerTank.getGas().getGas().getID());
|
||||
|
|
@ -415,11 +410,7 @@ public class TileEntityChemicalInfuser extends TileEntityElectricBlock implement
|
|||
@Override
|
||||
public boolean isItemValidForSlot(int slotID, ItemStack itemstack)
|
||||
{
|
||||
if(slotID == 0 || slotID == 1)
|
||||
{
|
||||
return RecipeHandler.getChemicalFormulatorOutput(itemstack, false) != null;
|
||||
}
|
||||
else if(slotID == 3)
|
||||
if(slotID == 3)
|
||||
{
|
||||
return ChargeUtils.canBeDischarged(itemstack);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,8 @@ import mekanism.api.gas.GasTransmission;
|
|||
import mekanism.api.gas.IGasHandler;
|
||||
import mekanism.api.gas.IGasItem;
|
||||
import mekanism.api.gas.ITubeConnection;
|
||||
import mekanism.common.IActiveState;
|
||||
import mekanism.common.IRedstoneControl;
|
||||
import mekanism.common.Mekanism;
|
||||
import mekanism.common.PacketHandler;
|
||||
import mekanism.common.*;
|
||||
import mekanism.common.PacketHandler.Transmission;
|
||||
import mekanism.common.RecipeHandler;
|
||||
import mekanism.common.block.BlockMachine.MachineType;
|
||||
import mekanism.common.network.PacketTileEntity;
|
||||
import mekanism.common.util.ChargeUtils;
|
||||
|
|
@ -28,7 +24,7 @@ import net.minecraftforge.common.ForgeDirection;
|
|||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
||||
public class TileEntityChemicalFormulator extends TileEntityElectricBlock implements IActiveState, ITubeConnection, IRedstoneControl
|
||||
public class TileEntityOxidationChamber extends TileEntityElectricBlock implements IActiveState, ITubeConnection, IRedstoneControl
|
||||
{
|
||||
public GasTank gasTank = new GasTank(MAX_GAS);
|
||||
|
||||
|
|
@ -52,9 +48,9 @@ public class TileEntityChemicalFormulator extends TileEntityElectricBlock implem
|
|||
|
||||
public RedstoneControl controlType = RedstoneControl.DISABLED;
|
||||
|
||||
public TileEntityChemicalFormulator()
|
||||
public TileEntityOxidationChamber()
|
||||
{
|
||||
super("ChemicalFormulator", MachineType.CHEMICAL_FORMULATOR.baseEnergy);
|
||||
super("OxidationChamber", MachineType.OXIDATION_CHAMBER.baseEnergy);
|
||||
inventory = new ItemStack[3];
|
||||
}
|
||||
|
||||
|
|
@ -104,7 +100,7 @@ public class TileEntityChemicalFormulator extends TileEntityElectricBlock implem
|
|||
operatingTicks++;
|
||||
}
|
||||
else {
|
||||
GasStack stack = RecipeHandler.getChemicalFormulatorOutput(inventory[0], true);
|
||||
GasStack stack = RecipeHandler.getOxidationChamberOutput(inventory[0], true);
|
||||
|
||||
gasTank.receive(stack, true);
|
||||
operatingTicks = 0;
|
||||
|
|
@ -151,7 +147,7 @@ public class TileEntityChemicalFormulator extends TileEntityElectricBlock implem
|
|||
{
|
||||
if(slotID == 0)
|
||||
{
|
||||
return RecipeHandler.getChemicalFormulatorOutput(itemstack, false) != null;
|
||||
return RecipeHandler.getOxidationChamberOutput(itemstack, false) != null;
|
||||
}
|
||||
else if(slotID == 1)
|
||||
{
|
||||
|
|
@ -203,7 +199,7 @@ public class TileEntityChemicalFormulator extends TileEntityElectricBlock implem
|
|||
return false;
|
||||
}
|
||||
|
||||
GasStack stack = RecipeHandler.getChemicalFormulatorOutput(inventory[0], false);
|
||||
GasStack stack = RecipeHandler.getOxidationChamberOutput(inventory[0], false);
|
||||
|
||||
if(stack == null || (gasTank.getGas() != null && (gasTank.getGas().getGas() != stack.getGas() || gasTank.getNeeded() < stack.amount)))
|
||||
{
|
||||
|
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 4 KiB |
Loading…
Reference in a new issue