diff options
| author | Martin Robertz <dream-master@gmx.net> | 2021-02-25 15:25:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 15:25:58 +0100 |
| commit | bfc3fbcf29de80435c05b90e1653e14a6fddff25 (patch) | |
| tree | 09231f6f7b340dccaac252682ebeb71a48f37099 /src/main/java/gregtech/api/metatileentity | |
| parent | 99ef1802df8436007a89ccd0f72287aceeaf8d85 (diff) | |
| parent | 54f372380925459fd7d03581919a531655228856 (diff) | |
| download | GT5-Unofficial-bfc3fbcf29de80435c05b90e1653e14a6fddff25.tar.gz GT5-Unofficial-bfc3fbcf29de80435c05b90e1653e14a6fddff25.tar.bz2 GT5-Unofficial-bfc3fbcf29de80435c05b90e1653e14a6fddff25.zip | |
Merge pull request #444 from repo-alt/experimental
Reshuffle new constructor args to avoid conflict with GT++ ASM
Diffstat (limited to 'src/main/java/gregtech/api/metatileentity')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java index 6930bfda79..9c227b8da7 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBus.java @@ -24,7 +24,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch { super(aID, aName, aNameRegional, aTier, getSlots(aTier), aDescription); } - public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier, int inventorySize, String[] aDescription) { + public GT_MetaTileEntity_Hatch_OutputBus(int aID, String aName, String aNameRegional, int aTier, String[] aDescription, int inventorySize) { super(aID, aName, aNameRegional, aTier, inventorySize, aDescription); } @@ -36,7 +36,7 @@ public class GT_MetaTileEntity_Hatch_OutputBus extends GT_MetaTileEntity_Hatch { super(aName, aTier, aTier < 1 ? 1 : aTier == 1 ? 4 : aTier == 2 ? 9 : 16, aDescription, aTextures); } - public GT_MetaTileEntity_Hatch_OutputBus(String aName, int aTier, int inventorySize, String[] aDescription, ITexture[][][] aTextures) { + public GT_MetaTileEntity_Hatch_OutputBus(String aName, int aTier, String[] aDescription, int inventorySize, ITexture[][][] aTextures) { super(aName, aTier, inventorySize, aDescription, aTextures); } |