0xf8/baritone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

a fucking x and z mixup

Browse Source
This commit is contained in:
rycbar0 2022-10-03 17:44:15 +02:00
parent fdfeeb2ffa
commit f53bfa89a9
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/baritone/process/BuilderProcess.java
View File

@ -189,11 +189,9 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
String name = LitematicaHelper.getName(i); String name = LitematicaHelper.getName(i);
try { try {
LitematicaSchematic schematic1 = new LitematicaSchematic(CompressedStreamTools.readCompressed(Files.newInputStream(LitematicaHelper.getSchematicFile(i).toPath())),false); LitematicaSchematic schematic1 = new LitematicaSchematic(CompressedStreamTools.readCompressed(Files.newInputStream(LitematicaHelper.getSchematicFile(i).toPath())),false);
Vec3i correctedOrigin = LitematicaHelper.getCorrectedOrigin(schematic1, i);
try { try {
LitematicaSchematic schematic2 = LitematicaHelper.blackMagicFuckery(schematic1, i); LitematicaSchematic schematic2 = LitematicaHelper.blackMagicFuckery(schematic1, i);
Vec3i correctedOrigin = LitematicaHelper.getCorrectedOrigin(schematic2, i);
//Vec3i correctedOrigin = new Vec3i(0,4,0);
build(name, schematic2, correctedOrigin); build(name, schematic2, correctedOrigin);
} catch (IndexOutOfBoundsException e) { } catch (IndexOutOfBoundsException e) {
logDirect("BlackMagicFuckery summoned a Balrog. This foe is beyond any of you. "); logDirect("BlackMagicFuckery summoned a Balrog. This foe is beyond any of you. ");

3
src/main/java/baritone/utils/schematic/litematica/LitematicaHelper.java
View File

@ -67,6 +67,7 @@ public final class LitematicaHelper {
int mz = schematic.getMinimumCorner().getZ(); int mz = schematic.getMinimumCorner().getZ();
int sx = (schematic.getX() - 1) * -1; int sx = (schematic.getX() - 1) * -1;
int sz = (schematic.getZ() - 1) * -1; int sz = (schematic.getZ() - 1) * -1;
Vec3i correctedOrigin; Vec3i correctedOrigin;
Mirror mirror = LitematicaHelper.getMirror(i); Mirror mirror = LitematicaHelper.getMirror(i);
Rotation rotation = LitematicaHelper.getRotation(i); Rotation rotation = LitematicaHelper.getRotation(i);
@ -93,7 +94,7 @@ public final class LitematicaHelper {
default: default:
switch (rotation) { switch (rotation) {
case CLOCKWISE_90: case CLOCKWISE_90:
correctedOrigin = new Vec3i(x + (sz - mz), y + my, z + mz); correctedOrigin = new Vec3i(x + (sz - mz), y + my, z + mx);
break; break;
case CLOCKWISE_180: case CLOCKWISE_180:
correctedOrigin = new Vec3i(x + (sx - mx), y + my, z + (sz - mz)); correctedOrigin = new Vec3i(x + (sx - mx), y + my, z + (sz - mz));