From a4e8158448fc19273001068fae31741377594822 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Tue, 10 Dec 2013 18:51:16 -0500 Subject: [PATCH] Add GUIs for T3 ore processing machinery --- common/mekanism/client/ClientPlayerTracker.java | 3 ++- common/mekanism/common/Mekanism.java | 3 +++ .../tileentity/TileEntityChemicalInfuser.java | 9 +++++++++ .../mekanism/gui/GuiChemicalFormulator.png | Bin 0 -> 4186 bytes .../assets/mekanism/gui/GuiChemicalInfuser.png | Bin 0 -> 4307 bytes 5 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 common/mekanism/common/tileentity/TileEntityChemicalInfuser.java create mode 100644 resources/assets/mekanism/gui/GuiChemicalFormulator.png create mode 100644 resources/assets/mekanism/gui/GuiChemicalInfuser.png diff --git a/common/mekanism/client/ClientPlayerTracker.java b/common/mekanism/client/ClientPlayerTracker.java index 75863eb04..24e3aa963 100644 --- a/common/mekanism/client/ClientPlayerTracker.java +++ b/common/mekanism/client/ClientPlayerTracker.java @@ -27,9 +27,10 @@ public class ClientPlayerTracker implements IPlayerTracker } ClientTickHandler.tickingSet.clear(); + Mekanism.proxy.unloadSoundHandler(); + Mekanism.jetpackOn.clear(); Mekanism.gasmaskOn.clear(); - Mekanism.proxy.unloadSoundHandler(); } } diff --git a/common/mekanism/common/Mekanism.java b/common/mekanism/common/Mekanism.java index f0facbb33..8195b23b7 100644 --- a/common/mekanism/common/Mekanism.java +++ b/common/mekanism/common/Mekanism.java @@ -525,6 +525,7 @@ public class Mekanism //Combiner recipes RecipeHandler.addCombinerRecipe(new ItemStack(Item.redstone, 16), new ItemStack(Block.oreRedstone)); RecipeHandler.addCombinerRecipe(new ItemStack(Item.dyePowder, 16, 4), new ItemStack(Block.oreLapis)); + RecipeHandler.addCombinerRecipe(new ItemStack(Item.flint), new ItemStack(Block.gravel)); //Osmium Compressor Recipes RecipeHandler.addOsmiumCompressorRecipe(new ItemStack(Item.glowstone), new ItemStack(Ingot, 1, 3)); @@ -539,9 +540,11 @@ public class Mekanism RecipeHandler.addCrusherRecipe(new ItemStack(Block.stoneBrick, 1, 2), new ItemStack(Block.stone)); 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)); //Purification Chamber Recipes RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.obsidian), new ItemStack(Clump, 2, 6)); + RecipeHandler.addPurificationChamberRecipe(new ItemStack(Block.cobblestone), new ItemStack(Block.gravel)); //Metallurgic Infuser Recipes RecipeHandler.addMetallurgicInfuserRecipe(InfusionInput.getInfusion(InfuseRegistry.get("CARBON"), 10, new ItemStack(Item.ingotIron)), new ItemStack(EnrichedIron)); diff --git a/common/mekanism/common/tileentity/TileEntityChemicalInfuser.java b/common/mekanism/common/tileentity/TileEntityChemicalInfuser.java new file mode 100644 index 000000000..622fc4189 --- /dev/null +++ b/common/mekanism/common/tileentity/TileEntityChemicalInfuser.java @@ -0,0 +1,9 @@ +package mekanism.common.tileentity; + +public class TileEntityChemicalInfuser extends TileEntityElectricBlock +{ + public TileEntityChemicalInfuser() + { + super("ChemicalInfuser", 0 /*TODO*/); + } +} diff --git a/resources/assets/mekanism/gui/GuiChemicalFormulator.png b/resources/assets/mekanism/gui/GuiChemicalFormulator.png new file mode 100644 index 0000000000000000000000000000000000000000..4d94ee187d81a55243d3228fc9e890b72e6ed394 GIT binary patch literal 4186 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 UclY|R{tN&^Jrmuci}nxy3vtB=xc~qF literal 0 HcmV?d00001 diff --git a/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/resources/assets/mekanism/gui/GuiChemicalInfuser.png new file mode 100644 index 0000000000000000000000000000000000000000..f6e1bc9f88886c7452dd511075155b62a4b296ff GIT binary patch literal 4307 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 literal 0 HcmV?d00001