diff options
Diffstat (limited to 'src/main')
4 files changed, 17 insertions, 26 deletions
diff --git a/src/main/java/net/glease/ggfab/DevEnvFixer.java b/src/main/java/net/glease/ggfab/DevEnvFixer.java deleted file mode 100644 index e1c294126c..0000000000 --- a/src/main/java/net/glease/ggfab/DevEnvFixer.java +++ /dev/null @@ -1,11 +0,0 @@ -package net.glease.ggfab; - -import gregtech.loaders.materialprocessing.ProcessingModSupport; - -public class DevEnvFixer implements Runnable { - @Override - public void run() { - ProcessingModSupport.aTGregSupport = true; - ProcessingModSupport.aEnableThermalFoundationMats = true; - } -} diff --git a/src/main/java/net/glease/ggfab/GigaGramFab.java b/src/main/java/net/glease/ggfab/GigaGramFab.java index a4bc92a56f..02d28fbbcb 100644 --- a/src/main/java/net/glease/ggfab/GigaGramFab.java +++ b/src/main/java/net/glease/ggfab/GigaGramFab.java @@ -19,7 +19,6 @@ public class GigaGramFab { @Mod.EventHandler public void preInit(FMLPreInitializationEvent event) { if ((Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment")) - new DevEnvFixer().run(); GregTech_API.sAfterGTPreload.add(() -> { GGItemList.AdvAssLine.set(new MTE_AdvAssLine(13532, "ggfab.machine.adv_assline", "Advanced Assembly Line").getStackForm(1)); GGItemList.LinkedInputBus.set(new MTE_LinkedInputBus(13533, "ggfab.machine.linked_input_bus", "Linked Input Bus", 5).getStackForm(1)); diff --git a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java index b31d371550..1fa00f6532 100644 --- a/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java +++ b/src/main/java/net/glease/ggfab/mte/MTE_AdvAssLine.java @@ -229,8 +229,8 @@ public class MTE_AdvAssLine extends GT_MetaTileEntity_ExtendedPowerMultiBlockBas } @Override - public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { - if (aSide == aFacing) { + public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, ForgeDirection side, ForgeDirection facing, int colorIndex, boolean aActive, boolean aRedstone) { + if (side == facing) { if (stuck) { return new ITexture[]{ casingTexturePages[0][16], diff --git a/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java b/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java index a328d9e9c7..6e59475ddd 100644 --- a/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java +++ b/src/main/java/net/glease/ggfab/mte/MTE_LinkedInputBus.java @@ -28,6 +28,7 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import net.minecraft.world.WorldSavedData; import net.minecraftforge.common.util.Constants; +import net.minecraftforge.common.util.ForgeDirection; import java.util.*; @@ -148,7 +149,7 @@ public class MTE_LinkedInputBus extends GT_MetaTileEntity_Hatch_InputBus { } @Override - public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { + public boolean canInsertItem(int aIndex, ItemStack aStack, int ordinalSide) { return isValidSlot(aIndex) && aStack != null && mChannel != null @@ -156,12 +157,12 @@ public class MTE_LinkedInputBus extends GT_MetaTileEntity_Hatch_InputBus { && aIndex > getCircuitSlot() && aIndex < SIZE_INVENTORY + 1 && (mRealInventory.stacks[aIndex - 1] == null || GT_Utility.areStacksEqual(aStack, mRealInventory.stacks[aIndex - 1])) - && allowPutStack(getBaseMetaTileEntity(), aIndex, (byte) aSide, aStack); + && allowPutStack(getBaseMetaTileEntity(), aIndex, ForgeDirection.getOrientation(ordinalSide), aStack); } @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) { - return aSide == getBaseMetaTileEntity().getFrontFacing() + public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { + return side == getBaseMetaTileEntity().getFrontFacing() && aIndex != getCircuitSlot() && (mRecipeMap == null || disableFilter || mRecipeMap.containsInput(aStack)) && (mRealInventory.disableLimited || limitedAllowPutStack(aIndex, aStack)); @@ -311,13 +312,13 @@ public class MTE_LinkedInputBus extends GT_MetaTileEntity_Hatch_InputBus { } @Override - public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) { + public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (!getBaseMetaTileEntity() - .getCoverBehaviorAtSideNew(aSide) + .getCoverBehaviorAtSideNew(side) .isGUIClickable( - aSide, - getBaseMetaTileEntity().getCoverIDAtSide(aSide), - getBaseMetaTileEntity().getComplexCoverDataAtSide(aSide), + side, + getBaseMetaTileEntity().getCoverIDAtSide(side), + getBaseMetaTileEntity().getComplexCoverDataAtSide(side), getBaseMetaTileEntity())) return; if (aPlayer.isSneaking()) { if (this.mRealInventory == null) { @@ -346,10 +347,12 @@ public class MTE_LinkedInputBus extends GT_MetaTileEntity_Hatch_InputBus { } @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX, float aY, float aZ) { - if (!(aPlayer instanceof EntityPlayerMP)) return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ); + public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, ForgeDirection side, float aX, float aY, float aZ) { + if (!(aPlayer instanceof EntityPlayerMP)) return super.onRightclick(aBaseMetaTileEntity, aPlayer, + side, aX, aY, aZ); ItemStack stick = aPlayer.inventory.getCurrentItem(); - if (!ItemList.Tool_DataStick.isStackEqual(stick, true, true)) return super.onRightclick(aBaseMetaTileEntity, aPlayer, aSide, aX, aY, aZ); + if (!ItemList.Tool_DataStick.isStackEqual(stick, true, true)) return super.onRightclick(aBaseMetaTileEntity, aPlayer, + side, aX, aY, aZ); if (!stick.hasTagCompound() || !"linkedinputbus".equals(stick.stackTagCompound.getString("ggfab.type"))) { aPlayer.addChatMessage(new ChatComponentTranslation("ggfab.info.linked_input_bus.no_data")); return true; |