diff options
| author | Alkalus <draknyte1@hotmail.com> | 2017-11-11 05:44:30 +1000 |
|---|---|---|
| committer | Alkalus <draknyte1@hotmail.com> | 2017-11-11 05:44:30 +1000 |
| commit | 12c0d5094f1b1d6b534727c6824ff6897bed8370 (patch) | |
| tree | 370cc30d962df7b8fda9479474ebb1e74af309df /src/Java/gtPlusPlus/core/slots | |
| parent | bad0601f3e340e66ce164d124cb7105445158981 (diff) | |
| download | GT5-Unofficial-12c0d5094f1b1d6b534727c6824ff6897bed8370.tar.gz GT5-Unofficial-12c0d5094f1b1d6b534727c6824ff6897bed8370.tar.bz2 GT5-Unofficial-12c0d5094f1b1d6b534727c6824ff6897bed8370.zip | |
+ More modular work.
Diffstat (limited to 'src/Java/gtPlusPlus/core/slots')
| -rw-r--r-- | src/Java/gtPlusPlus/core/slots/SlotDataStick.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/slots/SlotDataStick.java b/src/Java/gtPlusPlus/core/slots/SlotDataStick.java index dd06493865..1f628f4a9c 100644 --- a/src/Java/gtPlusPlus/core/slots/SlotDataStick.java +++ b/src/Java/gtPlusPlus/core/slots/SlotDataStick.java @@ -6,7 +6,10 @@ import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.common.items.GT_MetaGenerated_Item_01; import gregtech.common.items.GT_MetaGenerated_Item_02; import gregtech.common.items.behaviors.Behaviour_DataStick; +import gtPlusPlus.core.item.bauble.ModularBauble; import gtPlusPlus.core.util.Utils; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; +import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechItems; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; @@ -23,8 +26,12 @@ public class SlotDataStick extends Slot{ boolean isValid = false; if (itemstack != null){ - if ((itemstack.getItem() instanceof GT_MetaGenerated_Item_01 && itemstack.getItemDamage() == 32708) || (itemstack == ItemList.Tool_DataStick.get(1))){ - isValid = true; + if ((itemstack.getItem() instanceof GT_MetaGenerated_Item_01 && itemstack.getItemDamage() == 32708) + || (itemstack == ItemList.Tool_DataStick.get(1)) + || (itemstack == GregtechItemList.Old_Tool_DataStick.get(1)) + || (itemstack.getItem() instanceof MetaGeneratedGregtechItems && itemstack.getItemDamage() == 32208) + || (itemstack.getItem() instanceof ModularBauble)){ + isValid = true; } } //Utils.LOG_INFO("Tried inserting "+itemstack.getDisplayName()+" | "+itemstack.getItemDamage()+" | "); |