From 143dc5699ffcb5b341386303223072476a5987ac Mon Sep 17 00:00:00 2001 From: iKEVAREZ Date: Sun, 27 May 2018 15:18:18 +0200 Subject: [PATCH 1/2] fixes Fixed Chemical Washer, Fluid Tank and Turbine bug. Co-Authored-By: dev0on --- .../common/inventory/container/ContainerChemicalWasher.java | 2 +- .../mekanism/common/inventory/container/ContainerFluidTank.java | 2 +- .../generators/common/tile/turbine/TileEntityTurbineValve.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index f715faee0..91f6be0c3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -135,7 +135,7 @@ public class ContainerChemicalWasher extends Container return null; } } - else if(slotID > 31) + else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 6e8652ccb..796f410ee 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -81,7 +81,7 @@ public class ContainerFluidTank extends Container } } else { - if(slotID >= 2 && slotID <= 8) + if(slotID >= 2 && slotID <= 28) { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index c68f1dcf5..faa3630be 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -390,7 +390,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { if(fluid == FluidRegistry.getFluid("steam")) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + return ((!worldObj.isRemote && structure != null) || (!worldObj.isRemote && clientHasStructure)); } return false; From 862d889015e8f43ef428a403c8861e28617f4bad Mon Sep 17 00:00:00 2001 From: DEv0on Date: Sun, 27 May 2018 15:21:24 +0200 Subject: [PATCH 2/2] Dupe + bug fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Naprawiono kopiowanie z Chemical Washerem i Fluid Tankami, a także bug turbiny polegający na wciąganiu każdego fluidu. --- .../common/inventory/container/ContainerChemicalWasher.java | 2 +- .../mekanism/common/inventory/container/ContainerFluidTank.java | 2 +- .../generators/common/tile/turbine/TileEntityTurbineValve.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java index f715faee0..91f6be0c3 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerChemicalWasher.java @@ -135,7 +135,7 @@ public class ContainerChemicalWasher extends Container return null; } } - else if(slotID > 31) + else if(slotID > 30) { if(!mergeItemStack(slotStack, 4, 30, false)) { diff --git a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java index 6e8652ccb..796f410ee 100644 --- a/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java +++ b/src/main/java/mekanism/common/inventory/container/ContainerFluidTank.java @@ -81,7 +81,7 @@ public class ContainerFluidTank extends Container } } else { - if(slotID >= 2 && slotID <= 8) + if(slotID >= 2 && slotID <= 28) { if(!mergeItemStack(slotStack, 29, inventorySlots.size(), false)) { diff --git a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java index c68f1dcf5..faa3630be 100644 --- a/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java +++ b/src/main/java/mekanism/generators/common/tile/turbine/TileEntityTurbineValve.java @@ -390,7 +390,7 @@ public class TileEntityTurbineValve extends TileEntityTurbineCasing implements I { if(fluid == FluidRegistry.getFluid("steam")) { - return ((!worldObj.isRemote && structure != null) || (worldObj.isRemote && clientHasStructure)); + return ((!worldObj.isRemote && structure != null) || (!worldObj.isRemote && clientHasStructure)); } return false;