aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/api/gui
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-22 21:20:31 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2021-12-22 21:20:31 +0000
commit9405e54dfdac8c3fd1c82970f7a9f348a02afcfb (patch)
tree7a8441d5360a940aafba9c516535777da77d88ec /src/main/java/gtPlusPlus/xmod/gregtech/api/gui
parent279e29333ea4b06bb6be052fc3ffde792aaa4b0e (diff)
downloadGT5-Unofficial-9405e54dfdac8c3fd1c82970f7a9f348a02afcfb.tar.gz
GT5-Unofficial-9405e54dfdac8c3fd1c82970f7a9f348a02afcfb.tar.bz2
GT5-Unofficial-9405e54dfdac8c3fd1c82970f7a9f348a02afcfb.zip
Finished work on XL turbines.
Cleaned up scanner output for all multiblocks. Update Sifter tooltip to reflect 4 output bus requirement.
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/gui')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java
index e6203823b6..606880d6e9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/gui/hatches/CONTAINER_1by1_Turbine.java
@@ -3,6 +3,7 @@ package gtPlusPlus.xmod.gregtech.api.gui.hatches;
import gregtech.api.gui.GT_Container_1by1;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.items.GT_MetaGenerated_Tool;
+import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.IInventory;
@@ -36,12 +37,7 @@ public class CONTAINER_1by1_Turbine extends GT_Container_1by1 {
}
@Override
public boolean isItemValid(final ItemStack itemstack) {
- if (itemstack.getItem() instanceof GT_MetaGenerated_Tool) {
- if (itemstack.getItemDamage() >= 170 && itemstack.getItemDamage() <= 176) {
- return true;
- }
- }
- return false;
+ return GregtechMetaTileEntity_LargerTurbineBase.isValidTurbine(itemstack);
}
@Override
public int getSlotStackLimit() {
@@ -52,9 +48,10 @@ public class CONTAINER_1by1_Turbine extends GT_Container_1by1 {
return false;
}
@Override
- public void putStack(ItemStack p_75215_1_) {
- // TODO Auto-generated method stub
- super.putStack(p_75215_1_);
+ public void putStack(ItemStack aStack) {
+ if (isItemValid(aStack)) {
+ this.inventory.setInventorySlotContents(0, aStack);
+ }
}
}
}