diff options
Diffstat (limited to 'src')
3 files changed, 48 insertions, 31 deletions
diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 76ab9c340c..2cd1f781ee 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -38,7 +38,7 @@ public class TecTech { @Instance(Reference.MODID) public static TecTech instance; - public static LogHelper Logger = new LogHelper(Reference.MODID); + public static final LogHelper Logger = new LogHelper(Reference.MODID); private static IngameErrorLog Module_AdminErrorLogs = null; public static MainLoader GTCustomLoader = null; public static TecTechConfig ModConfig; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java index d4d6594061..66607b825b 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_bhg.java @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import static com.github.technus.tectech.Util.StructureBuilder; +import static com.github.technus.tectech.thing.casing.GT_Container_CasingsTT.sBlockCasingsTT; import static gregtech.api.enums.GT_Values.E; /** @@ -29,32 +30,47 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E //per dim disable thingies //region Structure - private static final String[] s = new String[]{ - "F202", "F020", "G0", "C5G5", "D55C55", "F0A0", "E21212", - "D00C00", "C0G0", "B0I0", "A20I02", "A02I20", "D0024200", - "C022C220", "B02G20", "02K20", "A03I30", "21K12" - }; - private static final String[][] S = new String[][]{ - {E, E, E, E, E, E, s[0], s[5], s[0]},//front - {E, E, E, E, s[2], s[0], s[6], "D0033300", s[6], s[0], s[2]}, - {E, E, E, s[2], s[1], s[1], s[7], "C033C330", s[7], s[1], s[1], s[2]}, - {E, E, s[2], s[1], s[4], s[4], s[8], "B03G30", s[8], s[4], s[4], s[1], s[2]}, - {E, s[2], s[1], s[4], s[3], s[3], s[9], s[16], s[9], s[3], s[3], s[4], s[1], s[2]}, - {E, s[0], s[1], s[4], s[3], s[3], s[10], s[16], s[10], s[3], s[3], s[4], s[1], s[0]}, - {s[0], s[6], s[7], s[8], s[9], s[10], s[17], "03K30", s[17], s[10], s[9], s[8], s[7], s[6], s[0]}, - {s[5], s[12], s[13], s[14], s[11], s[11], s[15], "A3K3", s[15], s[11], s[11], s[14], s[13], s[12], s[5]} - }; private static final String[][] shape = new String[][]{ - S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], S[6], S[5], S[4], S[3], S[2], S[1], S[0] + {E,E,E,E,E,E,E,E,E,E,E,E,"M0000000","L00!!!!!00","L0!!!!!!!0","L0!! !!0","L0!! . !!0","L0!! !!0","L0!!!!!!!0","L00!!!!!00","M0000000",E,E,E,E,E,E,E,E,E,E,E,E,}, + {E,E,E,E,E,E,E,E,E,"O0A0","O0A0","O0A0","O0A0","N11111","M1101011","I000010010010000","M1111111","I000010010010000","M1101011","N11111","O0A0","O0A0","O0A0","O0A0",E,E,E,E,E,E,E,E,E,}, + {E,E,E,E,E,E,E,"O0A0","O0A0","O0A0","P1","P1","M1111111","L11E11","L1B222B1","G000B1A23332A1B000","J111A23332A111","G000B1A23332A1B000","L1B222B1","L11E11","M1111111","P1","P1","O0A0","O0A0","O0A0",E,E,E,E,E,E,E,}, + {E,E,E,E,E,E,"O0A0","O0A0","P1","P1",E,E,E,E,E,"F00Q00","H11M11","F00Q00",E,E,E,E,"P4","P1","P1","O0A0","O0A0",E,E,E,E,E,E,}, + {E,E,E,E,E,"O0A0","N00000","P1","P4","P4",E,E,E,E,"F0S0","E00S00","F0144M4410","E00S00","F0S0",E,E,E,E,"P4","P4","P1","N00000","O0A0",E,E,E,E,E,}, + {E,E,E,E,"O0A0","O0A0","P1","M2224222",E,E,E,E,E,"G2Q2","G2Q2","D00A2Q2A00","F14Q41","D00A2Q2A00","G2Q2","G2Q2",E,E,E,E,E,"M2224222","P1","O0A0","O0A0",E,E,E,E,}, + {E,E,E,"O0A0","N00000","P1","P4",E,E,E,E,E,E,E,"D0W0","C00W00","D014S410","C00W00","D0W0",E,E,E,E,E,E,E,"P4","P1","N00000","O0A0",E,E,E,}, + {E,E,"O0A0","O0A0","P1","M2224222",E,E,E,E,E,E,E,"E2U2","E2U2","B00A2U2A00","D14U41","B00A2U2A00","E2U2","E2U2",E,E,E,E,E,E,E,"M2224222","P1","O0A0","O0A0",E,E,}, + {E,E,"O0A0","P1","P4",E,E,E,E,E,E,E,E,E,E,"B0[0","C14W41","B0[0",E,E,E,E,E,E,E,E,E,E,"P4","P1","O0A0",E,E,}, + {E,"O0A0","O0A0","P1","P4",E,E,E,E,E,E,E,E,E,E,"A00[00","C14W41","A00[00",E,E,E,E,E,E,E,E,E,E,"P4","P1","O0A0","O0A0",E,}, + {E,"O0A0","P1",E,E,E,E,E,E,E,E,E,E,E,E,"A0]0","B1[1","A0]0",E,E,E,E,E,E,E,E,E,E,E,E,"P1","O0A0",E,}, + {E,"O0A0","P1",E,E,E,E,E,E,E,E,E,E,E,E,"A0]0","B1[1","A0]0",E,E,E,E,E,E,E,E,E,E,E,E,"P1","O0A0",E,}, + {"O0A0","O0A0","M1111111",E,E,E,E,E,E,E,E,E,E,"B1[1","B1[1","001[100","B1[1","001[100","B1[1","B1[1",E,E,E,E,E,E,E,E,E,E,"M1111111","O0A0","O0A0",}, + {"O0A0","N11111","L11E11",E,E,"G2Q2",E,"E2U2",E,E,E,E,"B1[1","B1[1","A1]1","01]10","A1]1","01]10","A1]1","B1[1","B1[1",E,E,E,E,"E2U2",E,"G2Q2",E,E,"L11E11","N11111","O0A0",}, + {"O0A0","M1101011","L1B222B1",E,"F0S0","G2Q2","D0W0","E2U2",E,E,E,E,"B1[1","A1]1","A1]1","002[200","A12[21","002[200","A1]1","A1]1","B1[1",E,E,E,E,"E2U2","D0W0","G2Q2","F0S0",E,"L1B222B1","M1101011","O0A0",}, + {"L000000000","I000010010010000","G000B1A23332A1B000","F00Q00","E00S00","D00A2Q2A00","C00W00","B00A2U2A00","B0[0","A00[00","A0]0","A0]0","001[100","01]10","002[200","003[300","013[310","003[300","002[200","01]10","001[100","A0]0","A0]0","A00[00","B0[0","B00A2U2A00","C00W00","D00A2Q2A00","E00S00","F00Q00","G000B1A23332A1B000","I000010010010000","L000000000",}, + {"O0A0","M1111111","J111A23332A111","H11M11","F0144M4410","F14Q41","D014S410","D14U41","C14W41","C14W41","B1[1","B1[1","B1[1","A1]1","A12[21","013[310","A13[31","013[310","A12[21","A1]1","B1[1","B1[1","B14Y41","C14W41","C14W41","D14U41","D014S410","F14Q41","F0144M4410","H11M11","J111A23332A111","M1111111","O0A0",}, + {"L000000000","I000010010010000","G000B1A23332A1B000","F00Q00","E00S00","D00A2Q2A00","C00W00","B00A2U2A00","B0[0","A00[00","A0]0","A0]0","001[100","01]10","002[200","003[300","013[310","003[300","002[200","01]10","001[100","A0]0","A0]0","A00[00","B0[0","B00A2U2A00","C00W00","D00A2Q2A00","E00S00","F00Q00","G000B1A23332A1B000","I000010010010000","L000000000",}, + {"O0A0","M1101011","L1B222B1",E,"F0S0","G2Q2","D0W0","E2U2",E,E,E,E,"B1[1","A1]1","A1]1","002[200","A12[21","002[200","A1]1","A1]1","B1[1",E,E,E,E,"E2U2","D0W0","G2Q2","F0S0",E,"L1B222B1","M1101011","O0A0",}, + {"O0A0","N11111","L11E11",E,E,"G2Q2",E,"E2U2",E,E,E,E,"B1[1","B1[1","A1]1","01]10","A1]1","01]10","A1]1","B1[1","B1[1",E,E,E,E,"E2U2",E,"G2Q2",E,E,"L11E11","N11111","O0A0",}, + {"O0A0","O0A0","M1111111",E,E,E,E,E,E,E,E,E,E,"B1[1","B1[1","001[100","B1[1","001[100","B1[1","B1[1",E,E,E,E,E,E,E,E,E,E,"M1111111","O0A0","O0A0",}, + {E,"O0A0","P1",E,E,E,E,E,E,E,E,E,E,E,E,"A0]0","B1[1","A0]0",E,E,E,E,E,E,E,E,E,E,E,E,"P1","O0A0",E,}, + {E,"O0A0","P1",E,E,E,E,E,E,E,E,E,E,E,E,"A0]0","B1[1","A0]0",E,E,E,E,E,E,E,E,E,E,E,E,"P1","O0A0",E,}, + {E,"O0A0","O0A0","P1","P4",E,E,E,E,E,E,E,E,E,E,"A00[00","C14W41","A00[00",E,E,E,E,E,E,E,E,E,E,"P4","P1","O0A0","O0A0",E,}, + {E,E,"O0A0","P1","P4",E,E,E,E,E,E,E,E,E,E,"B0[0","C14W41","B0[0",E,E,E,E,E,E,E,E,E,E,"P4","P1","O0A0",E,E,}, + {E,E,"O0A0","O0A0","P1","M2224222",E,E,E,E,E,E,E,"E2U2","E2U2","B00A2U2A00","D14U41","B00A2U2A00","E2U2","E2U2",E,E,E,E,E,E,E,"M2224222","P1","O0A0","O0A0",E,E,}, + {E,E,E,"O0A0","N00000","P1","P4",E,E,E,E,E,E,E,"D0W0","C00W00","D014S410","C00W00","D0W0",E,E,E,E,E,E,E,"P4","P1","N00000","O0A0",E,E,E,}, + {E,E,E,E,"O0A0","O0A0","P1","M2224222",E,E,E,E,E,"G2Q2","G2Q2","D00A2Q2A00","F14Q41","D00A2Q2A00","G2Q2","G2Q2",E,E,E,E,E,"M2224222","P1","O0A0","O0A0",E,E,E,E,}, + {E,E,E,E,E,"O0A0","N00000","P1","P4","P4",E,E,E,E,"F0S0","E00S00","F0144M4410","E00S00","F0S0",E,E,E,E,"P4","P4","P1","N00000","O0A0",E,E,E,E,E,}, + {E,E,E,E,E,E,"O0A0","O0A0","P1","P1",E,E,E,E,E,"F00Q00","H11M11","F00Q00",E,E,E,E,"P4","P1","P1","O0A0","O0A0",E,E,E,E,E,E,}, + {E,E,E,E,E,E,E,"O0A0","O0A0","O0A0","P1","P1","M1111111","L11E11","L1B222B1","G000B1A23332A1B000","J111A23332A111","G000B1A23332A1B000","L1B222B1","L11E11","M1111111","P1","P1","O0A0","O0A0","O0A0",E,E,E,E,E,E,E,}, + {E,E,E,E,E,E,E,E,E,"O0A0","O0A0","O0A0","O0A0","N11111","M1101011","I000010010010000","M1111111","I000010010010000","M1101011","N11111","O0A0","O0A0","O0A0","O0A0",E,E,E,E,E,E,E,E,E,}, + {E,E,E,E,E,E,E,E,E,E,E,E,"O0A0","O0A0","O0A0","L000000000","O0A0","L000000000","O0A0","O0A0","O0A0",E,E,E,E,E,E,E,E,E,E,E,E,}, }; - private static final Block[] blockType = new Block[]{ - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT, - GT_Container_CasingsTT.sBlockCasingsTT, - QuantumGlassBlock.INSTANCE}; - private static final byte[] blockMeta = new byte[]{3, 4, 5, 6, 7, 0}; + private static final Block[] blockType = new Block[]{sBlockCasingsTT,sBlockCasingsTT,sBlockCasingsTT,sBlockCasingsTT,sBlockCasingsTT}; + private static final byte[] blockMeta = new byte[]{12, 13, 14, 10, 11}; + private static final String[] addingMethods = new String[]{"addClassicToMachineList", "addElementalToMachineList"}; + private static final byte[] casingTextures = new byte[]{textureOffset, textureOffset + 4}; + private static final Block[] blockTypeFallback = new Block[]{sBlockCasingsTT, sBlockCasingsTT}; + private static final byte[] blockMetaFallback = new byte[]{0, 4}; //endregion public GT_MetaTileEntity_EM_bhg(int aID, String aName, String aNameRegional) { @@ -70,8 +86,13 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E } @Override + public boolean EM_checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { + return EM_StructureCheckAdvanced(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 16, 16, 0); + } + + @Override public void construct(int qty) { - StructureBuilder(shape, blockType, blockMeta, 7, 7, 0, this.getBaseMetaTileEntity()); + StructureBuilder(shape, blockType, blockMeta,16, 16, 0, getBaseMetaTileEntity()); } @Override @@ -90,11 +111,6 @@ public class GT_MetaTileEntity_EM_bhg extends GT_MetaTileEntity_MultiblockBase_E } @Override - public boolean EM_checkMachine(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) { - return EM_StructureCheck(shape, blockType, blockMeta, 7, 7, 0); - } - - @Override public String[] getDescription() { return new String[]{ CommonValues.tecMark, diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo index 6590591492..9f2672eda2 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/other todo @@ -6,6 +6,7 @@ reverse expand ore processing by scanning ores XD quark laseration quantum color separator antimatter weaponry +tesla coils... starter manual book? design reader station - singleblock |