RepoMirrors
/
baritone
mirror of https://github.com/cabaletta/baritone
1
0
Fork 1
Code Issues Releases Wiki Activity

litematica support for buildonlyselection, mostly rycbars

This commit is contained in:
Entropy5 2023-01-17 06:33:01 +01:00
parent 6bbdba7a21
commit 26cceede15
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,19 +166,23 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
return false; return false;
} }
if (Baritone.settings().mapArtMode.value) { parsed = applyMapArtAndSelection(origin, parsed);
parsed = new MapArtSchematic((IStaticSchematic) parsed);
}
if (Baritone.settings().buildOnlySelection.value) {
parsed = new SelectionSchematic(parsed, origin, baritone.getSelectionManager().getSelections());
}
build(name, parsed, origin); build(name, parsed, origin);
return true; return true;
} }
private ISchematic applyMapArtAndSelection(Vec3i origin, ISchematic schematic) {
if (Baritone.settings().mapArtMode.value) {
schematic = new MapArtSchematic((IStaticSchematic) schematic);
}
if (Baritone.settings().buildOnlySelection.value) {
schematic = new SelectionSchematic(schematic, origin, baritone.getSelectionManager().getSelections());
}
return schematic;
}
@Override @Override
public void buildOpenSchematic() { public void buildOpenSchematic() {
if (SchematicaHelper.isSchematicaPresent()) { if (SchematicaHelper.isSchematicaPresent()) {
@ -217,7 +221,8 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
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); Vec3i correctedOrigin = LitematicaHelper.getCorrectedOrigin(schematic1, i);
LitematicaSchematic schematic2 = LitematicaHelper.blackMagicFuckery(schematic1, i); ISchematic schematic2 = LitematicaHelper.blackMagicFuckery(schematic1, i);
schematic2 = applyMapArtAndSelection(origin, schematic2);
build(name, schematic2, correctedOrigin); build(name, schematic2, correctedOrigin);
} catch (IOException e) { } catch (IOException e) {
logDirect("Schematic File could not be loaded."); logDirect("Schematic File could not be loaded.");