diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 4f8b69203..d5c7868a3 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -583,7 +583,7 @@ public class Mekanism //Plastic stuff CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 1), new Object[] { - "PP", "PP", "PP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) + "PP", "PP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) })); CraftingManager.getInstance().getRecipeList().add(new MekanismRecipe(new ItemStack(MekanismItems.Polyethene, 1, 2), new Object[] { "PPP", "P P", "PPP", Character.valueOf('P'), new ItemStack(MekanismItems.Polyethene, 1, 0) @@ -683,6 +683,7 @@ public class Mekanism RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Blocks.clay), new ItemStack(Items.clay_ball, 4)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismBlocks.SaltBlock), new ItemStack(MekanismItems.Salt, 4)); RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(Items.diamond), new ItemStack(MekanismItems.CompressedDiamond)); + RecipeHandler.addEnrichmentChamberRecipe(new ItemStack(MekanismItems.Polyethene, 3, 0), new ItemStack(MekanismItems.Polyethene, 1, 2)); for(int i = 0; i < EnumColor.DYES.length; i++) { @@ -810,6 +811,12 @@ public class Mekanism 1000, 60 ); + RecipeHandler.addPRCRecipe( + new ItemStack(MekanismItems.Substrate), new FluidStack(FluidRegistry.WATER, 200), new GasStack(GasRegistry.getGas("ethene"), 100), + new ItemStack(MekanismItems.Substrate, 8), new GasStack(GasRegistry.getGas("oxygen"), 10), + 200, + 400 + ); //Solar Neutron Activator Recipes RecipeHandler.addSolarNeutronRecipe(new GasStack(GasRegistry.getGas("lithium"), 1), new GasStack(GasRegistry.getGas("tritium"), 1)); diff --git a/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java b/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java index 20978c832..a1f82bafb 100644 --- a/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java +++ b/src/main/java/mekanism/common/recipe/machines/PressurizedRecipe.java @@ -28,6 +28,7 @@ public class PressurizedRecipe extends MachineRecipe, operatingTicks = dataStream.readInt(); clientActive = dataStream.readBoolean(); + ticksRequired = dataStream.readInt(); controlType = RedstoneControl.values()[dataStream.readInt()]; for(int i = 0; i < 6; i++) @@ -192,6 +193,7 @@ public abstract class TileEntityBasicMachine, data.add(operatingTicks); data.add(isActive); + data.add(ticksRequired); data.add(controlType.ordinal()); data.add(sideConfig); diff --git a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java index bd300fde5..8aa8e33dc 100644 --- a/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityElectricMachine.java @@ -190,10 +190,12 @@ public abstract class TileEntityElectricMachine= energyPerTick) { + boolean update = BASE_TICKS_REQUIRED != recipe.ticks; + BASE_TICKS_REQUIRED = recipe.ticks; + + if(update) + { + recalculateUpgradables(Upgrade.SPEED); + } + setActive(true); if((operatingTicks+1) < ticksRequired) @@ -155,10 +164,12 @@ public class TileEntityPRC extends TileEntityBasicMachine