Skip to content

Commit fe73226

Browse files
NxerNxer
authored
Merge pull request #1213 from lonei-G/Macerator-structure
fix Mega Macerator structure issue
2 parents 831a61b + 20e2244 commit fe73226

File tree

1 file changed

+43
-8
lines changed

1 file changed

+43
-8
lines changed

‎src/main/java/com/Nxer/TwistSpaceTechnology/common/machine/TST_MegaMacerator.java‎

Lines changed: 43 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
8080
// end region
8181

8282
// region Processing Logic
83-
private int mBlockTier = 0;
83+
protected int mBlockTier = 0;
8484
public int mRecipeTier = 1;
8585
public int glassTier;
8686

@@ -135,7 +135,9 @@ public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack a
135135
repairMachine();
136136
mBlockTier = -1;
137137
glassTier = -1;
138-
if (!checkPiece(STRUCTURE_PIECE_MAIN, horizontalOffSet, verticalOffSet, depthOffSet)) return false;
138+
if (!checkPiece(STRUCTURE_PIECE_MAIN, horizontalOffSet, verticalOffSet, depthOffSet)) {
139+
return checkPiece(STRUCTURE_PIECE_OLD, horizontalOffSet, verticalOffSet, depthOffSet);
140+
}
139141
return true;
140142
}
141143

@@ -157,11 +159,12 @@ public static Integer getTierOfBlock(Block block, int meta) {
157159

158160
// region Structure
159161

160-
private final int horizontalOffSet = 8;
161-
private final int verticalOffSet = 25;
162-
private final int depthOffSet = 1;
163-
private static final String STRUCTURE_PIECE_MAIN = "mainMegaMacerator";
164-
private static IStructureDefinition<TST_MegaMacerator> STRUCTURE_DEFINITION = null;
162+
protected final int horizontalOffSet = 8;
163+
protected final int verticalOffSet = 25;
164+
protected final int depthOffSet = 1;
165+
protected static final String STRUCTURE_PIECE_MAIN = "mainMegaMacerator";
166+
protected static final String STRUCTURE_PIECE_OLD = "oldMegaMacerator";
167+
protected static IStructureDefinition<TST_MegaMacerator> STRUCTURE_DEFINITION = null;
165168

166169
@Override
167170
public void construct(ItemStack stackSize, boolean hintsOnly) {
@@ -189,6 +192,7 @@ public IStructureDefinition<TST_MegaMacerator> getStructureDefinition() {
189192
if (STRUCTURE_DEFINITION == null) {
190193
STRUCTURE_DEFINITION = StructureDefinition.<TST_MegaMacerator>builder()
191194
.addShape(STRUCTURE_PIECE_MAIN, transpose(shape))
195+
.addShape(STRUCTURE_PIECE_OLD, transpose(shapeOld))
192196
.addElement('A', chainAllGlasses(-1, (te, t) -> te.glassTier = t, te -> te.glassTier))
193197
.addElement(
194198
'B',
@@ -246,7 +250,38 @@ public IStructureDefinition<TST_MegaMacerator> getStructureDefinition() {
246250
* H -> ofSpecialTileAdder(gregtech.api.metatileentity.BaseMetaPipeEntity, ...);
247251
* I -> ofSpecialTileAdder(gregtech.api.metatileentity.BaseMetaPipeEntity, ...);
248252
*/
249-
private final String[][] shape = new String[][]{
253+
protected static final String[][] shape = new String[][]{
254+
{" "," "," "," "," "," FFFFF "," FFFFFFF "," FFFFFFF "," FFFFFFF "," FFFFFFF "," FFFFFFF "," FFFFF "," "," "," "," "," "},
255+
{" "," "," FFFFF "," FFFFFFFFF "," FFFFFFFFFFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFFFFFFFFFF "," FFFFFFFFF "," FFFFF "," "," "},
256+
{" FFFFF "," FFFFFFFFF "," FFFCCCCCFFF "," FFCC CCFF "," FFC CFF "," FFC CFF ","FFC CFF","FFC CFF","FFC CFF","FFC CFF","FFC CFF"," FFC CFF "," FFC CFF "," FFCC CCFF "," FFFCCCCCFFF "," FFFFFFFFF "," FFFFF "},
257+
{" "," DbbbD "," IbbbbbbbI "," bbb bbb "," Ib bI "," bb bb "," bb EEE bb "," bb ECCCE bb "," bb ECCCE bb "," bb ECCCE bb "," bb EEE bb "," bb bb "," Ib bI "," bbb bbb "," IbbbbbbbI "," DbbbD "," "},
258+
{" DDDDD "," DDDDDDDDD "," DDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDDDD ","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDCDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD"," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDD "," DDDDDDDDD "," DDDDD "},
259+
{" "," FFFFF "," FF FF "," F F "," F F "," F F "," F F "," F F "," F C F "," F F "," F F "," F F "," F F "," F F "," FF FF "," FFFFF "," "},
260+
{" "," FAAAF "," FH HF "," D D "," F F "," H G H "," F GG G F "," A G G A "," A C A "," A G G A "," F G GG F "," H G H "," F F "," D D "," FH HF "," FAAAF "," "},
261+
{" "," FAAAF "," FH HF "," D G D "," F G F "," H GG GG H "," F GGGGG GG F "," A GGGG A "," A GCG A "," A GGGG A "," F GG GGGGG F "," H GG GG H "," F G F "," D G D "," FH HF "," FAAAF "," "},
262+
{" "," FAAAF "," FH GHF "," D G D "," F GG F "," H GGG GGG H "," FGGGGGG GGG F "," A GGGGGG A "," A GCG A "," A GGGGGG A "," F GGG GGGGGGF "," H GGG GGG H "," F GG F "," D G D "," FHG HF "," FAAAF "," "},
263+
{" "," FAAAF "," FH HF "," D G D "," F G F "," H GG GG H "," F GGGGG GG F "," A GGGG A "," A GCG A "," A GGGG A "," F GG GGGGG F "," H GG GG H "," F G F "," D G D "," FH HF "," FAAAF "," "},
264+
{" "," FAAAF "," FH HF "," D D "," F F "," H G H "," F GG G F "," A G G A "," A C A "," A G G A "," F G GG F "," H G H "," F F "," D D "," FH HF "," FAAAF "," "},
265+
{" "," FAAAF "," FH HF "," D D "," F F "," H H "," F F "," A A "," A C A "," A A "," F F "," H H "," F F "," D D "," FH HF "," FAAAF "," "},
266+
{" "," FAAAF "," FH HF "," D D "," F F "," H G H "," F GG G F "," A G G A "," A C A "," A G G A "," F G GG F "," H G H "," F F "," D D "," FH HF "," FAAAF "," "},
267+
{" "," FAAAF "," FH HF "," D G D "," F G F "," H GG GG H "," F GGGGG GG F "," A GGGG A "," A GCG A "," A GGGG A "," F GG GGGGG F "," H GG GG H "," F G F "," D G D "," FH HF "," FAAAF "," "},
268+
{" "," FAAAF "," FH GHF "," D G D "," F GG F "," H GGG GGG H "," FGGGGGG GGG F "," A GGGGGG A "," A GCG A "," A GGGGGG A "," F GGG GGGGGGF "," H GGG GGG H "," F GG F "," D G D "," FHG HF "," FAAAF "," "},
269+
{" "," FAAAF "," FH HF "," D G D "," F G F "," H GG GG H "," F GGGGG GG F "," A GGGG A "," A GCG A "," A GGGG A "," F GG GGGGG F "," H GG GG H "," F G F "," D G D "," FH HF "," FAAAF "," "},
270+
{" "," FAAAF "," FH HF "," D D "," F F "," H G H "," F GG G F "," A G G A "," A C A "," A G G A "," F G GG F "," H G H "," F F "," D D "," FH HF "," FAAAF "," "},
271+
{" "," FAAAF "," FH HF "," D D "," F F "," H C C H "," F F "," A A "," A C A "," A A "," F F "," H C C H "," F F "," D D "," FH HF "," FAAAF "," "},
272+
{" "," FAAAF "," FH HF "," DGGG GGGD "," FGGGGG GGGGGF "," HGGCGG GGCGGH "," F GGGGG GGGGG F "," A GGG GGG A "," A C A "," A GGG GGG A "," F GGGGG GGGGG F "," HGGCGG GGCGGH "," FGGGGG GGGGGF "," DGGG GGGD "," FH HF "," FAAAF "," "},
273+
{" "," FAAAF "," FH HF "," D D "," F F "," H C C H "," F GGG F "," A GGGGG A "," A GGCGG A "," A GGGGG A "," F GGG F "," H C C H "," F F "," D D "," FH HF "," FAAAF "," "},
274+
{" "," FAAAF "," FH HF "," DGGG GGGD "," FGGGGG GGGGGF "," HGGCGG GGCGGH "," F GGGGG GGGGG F "," A GGG GGG A "," A C A "," A GGG GGG A "," F GGGGG GGGGG F "," HGGCGG GGCGGH "," FGGGGG GGGGGF "," DGGG GGGD "," FH HF "," FAAAF "," "},
275+
{" "," FAAAF "," FH HF "," D D "," F F "," H C C H "," F GGG F "," A GGGGG A "," A GGCGG A "," A GGGGG A "," F GGG F "," H C C H "," F F "," D D "," FH HF "," FAAAF "," "},
276+
{" "," FFFFF "," FF FF "," DGGG GGGD "," FGGGGG GGGGGF "," FGGCGG GGCGGF "," F GGGGG GGGGG F "," F GGG GGG F "," F C F "," F GGG GGG F "," F GGGGG GGGGG F "," FGGCGG GGCGGF "," FGGGGG GGGGGF "," DGGG GGGD "," FF FF "," FFFFF "," "},
277+
{" DDDDD "," DDDDDDDDD "," DDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDDDDDD "," DDDDCDDDDDCDDDD ","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDCDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD"," DDDDCDDDDDCDDDD "," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDD "," DDDDDDDDD "," DDDDD "},
278+
{" "," DBBBD "," HBBBBBBBH "," BBBEEEEEBBB "," HBEEEEEEEEEBH "," BBECEEEEECEBB "," DBEEEEEEEEEEEBD "," BBEEEECCCEEEEBB "," BEEEECCCEEEEB "," BBEEEECCCEEEEBB "," DBEEEEEEEEEEEBD "," BBECEEEEECEBB "," HBEEEEEEEEEBH "," BBBEEEEEBBB "," HBBBBBBBH "," DB BD "," "},
279+
{" "," DB~BD "," HBBBBBBBH "," BBB BBB "," HBFFF FFFBH "," BBFCFFFFFCFBB "," DB FFFEEEFFF BD "," BB FEEEEEF BB "," B FEECEEF B "," BB FEEEEEF BB "," DB FFFEEEFFF BD "," BBFCFFFFFCFBB "," HBFFF FFFBH "," BBB BBB "," HBBBBBBBH "," DB BD "," "},
280+
{" "," DBBBD "," HBBBBBBBH "," BBB BBB "," HBFFF FFFBH "," BBFCFFFFFCFBB "," DB FFFCCCFFF BD "," BB FCCCCCF BB "," B FCCCCCF B "," BB FCCCCCF BB "," DB FFFCCCFFF BD "," BBFCFFFFFCFBB "," HBFFF FFFBH "," BBB BBB "," HBBBBBBBH "," DB BD "," "},
281+
{" DDDDD "," DDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDDDD ","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD","DDDDDDDDDDDDDDDDD"," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDDDDDD "," DDDDDDDDD "," DDDDD "}
282+
};
283+
284+
protected static final String[][] shapeOld = new String[][]{
250285
{" "," "," "," "," "," FFFFF "," FFFFFFF "," FFFFFFF "," FFFFFFF "," FFFFFFF "," FFFFFFF "," FFFFF "," "," "," "," "," "},
251286
{" "," "," FFFFF "," FFFFFFFFF "," FFFFFFFFFFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFF FFF "," FFFFFFFFFFF "," FFFFFFFFF "," FFFFF "," "," "},
252287
{" FFFFF "," FFFFFFFFF "," FFFCCCCCFFF "," FFCC CCFF "," FFC CFF "," FFC CFF ","FFC CFF","FFC CFF","FFC CFF","FFC CFF","FFC CFF"," FFC CFF "," FFC CFF "," FFCC CCFF "," FFFCCCCCFFF "," FFFFFFFFF "," FFFFF "},

0 commit comments

Comments
 (0)