From 06b044c718d681d18642ef3006fef4881ccfb69c Mon Sep 17 00:00:00 2001 From: YoungOnion <39562198+YoungOnionMC@users.noreply.github.com> Date: Mon, 30 Dec 2024 16:51:42 -0700 Subject: [PATCH] fix cleanroom structure using the wrong indexing causing aioobe --- .../multiblock/electric/CleanroomMachine.java | 16 ++++++++-------- .../primitive/CharcoalPileIgniterMachine.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java index 9f2075f6e2..2201c4da2d 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/CleanroomMachine.java @@ -333,24 +333,24 @@ public BlockPattern getPattern() { for (int i = 0; i < lDist + rDist + 1; i++) { for (int j = 0; j < fDist + bDist + 1; j++) { if (i == 0 || i == lDist + rDist || j == 0 || j == fDist + bDist) { // all edges - floorLayer[i].append('A'); // floor edge + floorLayer[j].append('A'); // floor edge for (int k = 0; k < hDist - 1; k++) { - wallLayers.get(k)[i].append('W'); // walls + wallLayers.get(k)[j].append('W'); // walls } - ceilingLayer[i].append('D'); // ceiling edge + ceilingLayer[j].append('D'); // ceiling edge } else { // not edges if (i == lDist && j == fDist) { // very center - floorLayer[i].append('K'); + floorLayer[j].append('K'); } else { - floorLayer[i].append('E'); // floor valid blocks + floorLayer[j].append('E'); // floor valid blocks } for (int k = 0; k < hDist - 1; k++) { - wallLayers.get(k)[i].append(' '); + wallLayers.get(k)[j].append(' '); } if (i == lDist && j == fDist) { // very center - ceilingLayer[i].append('C'); // controller + ceilingLayer[j].append('C'); // controller } else { - ceilingLayer[i].append('F'); // filter + ceilingLayer[j].append('F'); // filter } } } diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java index fa8cf3f971..5c92180c74 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/primitive/CharcoalPileIgniterMachine.java @@ -178,25 +178,25 @@ public BlockPattern getPattern() { floorLayer[i].append('A'); // floor edge for (int k = 0; k < hDist - 1; k++) { if ((i == 0 || i == lDist + rDist) && (j == 0 || j == fDist + bDist)) { - wallLayers.get(k)[i].append('A'); + wallLayers.get(k)[j].append('A'); } else { - wallLayers.get(k)[i].append('W'); // walls + wallLayers.get(k)[j].append('W'); // walls } } - ceilingLayer[i].append('A'); // ceiling edge + ceilingLayer[j].append('A'); // ceiling edge } else { // not edges if (i == lDist && j == fDist) { // very center - floorLayer[i].append('B'); + floorLayer[j].append('B'); } else { - floorLayer[i].append('B'); // floor valid blocks + floorLayer[j].append('B'); // floor valid blocks } for (int k = 0; k < hDist - 1; k++) { - wallLayers.get(k)[i].append('L'); // log or air + wallLayers.get(k)[j].append('L'); // log or air } if (i == lDist && j == fDist) { // very center - ceilingLayer[i].append('S'); // controller + ceilingLayer[j].append('S'); // controller } else { - ceilingLayer[i].append('W'); // grass top + ceilingLayer[j].append('W'); // grass top } } }