diff --git a/common/mekanism/common/CommonProxy.java b/common/mekanism/common/CommonProxy.java index 35026bc62..a28bc77d1 100644 --- a/common/mekanism/common/CommonProxy.java +++ b/common/mekanism/common/CommonProxy.java @@ -106,6 +106,8 @@ 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(TileEntityChemicalInfuser.class, "ChemicalInfuser"); } /** diff --git a/common/mekanism/common/RecipeHandler.java b/common/mekanism/common/RecipeHandler.java index 1db05e69c..e3dc2dd24 100644 --- a/common/mekanism/common/RecipeHandler.java +++ b/common/mekanism/common/RecipeHandler.java @@ -81,11 +81,21 @@ public final class RecipeHandler Recipe.METALLURGIC_INFUSER.put(input, InfusionOutput.getInfusion(input, output)); } + /** + * Add a Chemical Infuser recipe. + * @param input - input ChemicalInput + * @param output - output GasStack + */ public static void addChemicalInfuserRecipe(ChemicalInput input, GasStack output) { Recipe.CHEMICAL_INFUSER.put(input, output); } - + + /** + * Add a Chemical Formulator recipe. + * @param input - input ItemStack + * @param output - output GasStack + */ public static void addChemicalFormulatorRecipe(ItemStack input, GasStack output) { Recipe.CHEMICAL_FORMULATOR.put(input, output); @@ -95,7 +105,6 @@ public final class RecipeHandler * Gets the InfusionOutput of the InfusionInput in the parameters. * @param infusion - input Infusion * @param stackDecrease - whether or not to decrease the input slot's stack size AND the infuse amount - * @param recipes - Map of recipes * @return InfusionOutput */ public static InfusionOutput getMetallurgicInfuserOutput(InfusionInput infusion, boolean stackDecrease) @@ -126,6 +135,11 @@ public final class RecipeHandler return null; } + /** + * Gets the GasStack of the ChemicalInput in the parameters. + * @param input - input ChemicalInput + * @return GasStack + */ public static GasStack getChemicalInfuserOutput(ChemicalInput input) { if(input != null && input.isValid()) @@ -137,6 +151,12 @@ public final class RecipeHandler return null; } + /** + * Gets the InfusionOutput of the ItemStack in the parameters. + * @param itemstack - input ItemStack + * @param stackDecrease - whether or not to decrease the input slot's stack size + * @return GasStack + */ public static GasStack getChemicalFormulatorOutput(ItemStack itemstack, boolean stackDecrease) { if(itemstack != null) diff --git a/resources/assets/mekanism/gui/GuiChemicalInfuser.png b/resources/assets/mekanism/gui/GuiChemicalInfuser.png index 362a6f1d5..0a2fc0627 100644 Binary files a/resources/assets/mekanism/gui/GuiChemicalInfuser.png and b/resources/assets/mekanism/gui/GuiChemicalInfuser.png differ diff --git a/resources/assets/mekanism/lang/en_US.lang b/resources/assets/mekanism/lang/en_US.lang index c5cfe8764..07ac3b631 100644 --- a/resources/assets/mekanism/lang/en_US.lang +++ b/resources/assets/mekanism/lang/en_US.lang @@ -132,10 +132,14 @@ item.tinIngot.name=Tin Ingot //Gasses gas.hydrogen=Hydrogen gas.oxygen=Oxygen +gas.sulfuricGas=Sulfuric Gas +gas.sulfuricAcid=Sulfuric Acid //Fluids fluid.hydrogen=Liquid Hydrogen fluid.oxygen=Liquid Oxygen +fluid.sulfuricGas=Sulfuric Gas +fluid.sulfuricAcid=Sulfuric Acid //Gui text gui.removeSpeedUpgrade=Remove speed upgrade diff --git a/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png b/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png new file mode 100644 index 000000000..dd69fef78 Binary files /dev/null and b/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png differ diff --git a/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta b/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta new file mode 100644 index 000000000..4b721e09a --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/LiquidSulfuricAcid.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +} diff --git a/resources/assets/mekanism/textures/blocks/LiquidSulfuricGas.png b/resources/assets/mekanism/textures/blocks/LiquidSulfuricGas.png new file mode 100644 index 000000000..9417cf7ae Binary files /dev/null and b/resources/assets/mekanism/textures/blocks/LiquidSulfuricGas.png differ diff --git a/resources/assets/mekanism/textures/blocks/LiquidSulfuricGas.png.mcmeta b/resources/assets/mekanism/textures/blocks/LiquidSulfuricGas.png.mcmeta new file mode 100644 index 000000000..4b721e09a --- /dev/null +++ b/resources/assets/mekanism/textures/blocks/LiquidSulfuricGas.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 2 + } +}