✨ Setting to mirror schematics
This commit is contained in:
@@ -29,6 +29,7 @@ import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.Mirror;
|
||||
import net.minecraft.world.level.block.Rotation;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
@@ -1103,6 +1104,16 @@ public final class Settings {
|
||||
*/
|
||||
public final Setting<Rotation> buildSchematicRotation = new Setting<>(Rotation.NONE);
|
||||
|
||||
/**
|
||||
* Mirrors the schematic before building it.
|
||||
* Possible values are
|
||||
* <ul>
|
||||
* <li> FRONT_BACK - mirror the schematic along its local x axis </li>
|
||||
* <li> LEFT_RIGHT - mirror the schematic along its local z axis </li>
|
||||
* </ul>
|
||||
*/
|
||||
public final Setting<Mirror> buildSchematicMirror = new Setting<>(Mirror.NONE);
|
||||
|
||||
/**
|
||||
* The fallback used by the build command when no extension is specified. This may be useful if schematics of a
|
||||
* particular format are used often, and the user does not wish to have to specify the extension with every usage.
|
||||
|
||||
114
src/api/java/baritone/api/schematic/MirroredSchematic.java
Normal file
114
src/api/java/baritone/api/schematic/MirroredSchematic.java
Normal file
@@ -0,0 +1,114 @@
|
||||
/*
|
||||
* This file is part of Baritone.
|
||||
*
|
||||
* Baritone is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* Baritone is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package baritone.api.schematic;
|
||||
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.minecraft.world.level.block.Mirror;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
public class MirroredSchematic implements ISchematic {
|
||||
|
||||
private final ISchematic schematic;
|
||||
private final Mirror mirror;
|
||||
|
||||
public MirroredSchematic(ISchematic schematic, Mirror mirror) {
|
||||
this.schematic = schematic;
|
||||
this.mirror = mirror;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean inSchematic(int x, int y, int z, BlockState currentState) {
|
||||
return schematic.inSchematic(
|
||||
mirrorX(x, widthX(), mirror),
|
||||
y,
|
||||
mirrorZ(z, lengthZ(), mirror),
|
||||
mirror(currentState, mirror)
|
||||
);
|
||||
}
|
||||
|
||||
@Override
|
||||
public BlockState desiredState(int x, int y, int z, BlockState current, List<BlockState> approxPlaceable) {
|
||||
return mirror(schematic.desiredState(
|
||||
mirrorX(x, widthX(), mirror),
|
||||
y,
|
||||
mirrorZ(z, lengthZ(), mirror),
|
||||
mirror(current, mirror),
|
||||
mirror(approxPlaceable, mirror)
|
||||
), mirror);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void reset() {
|
||||
schematic.reset();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int widthX() {
|
||||
return schematic.widthX();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int heightY() {
|
||||
return schematic.heightY();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int lengthZ() {
|
||||
return schematic.lengthZ();
|
||||
}
|
||||
|
||||
private static int mirrorX(int x, int sizeX, Mirror mirror) {
|
||||
switch (mirror) {
|
||||
case NONE:
|
||||
case LEFT_RIGHT:
|
||||
return x;
|
||||
case FRONT_BACK:
|
||||
return sizeX - x - 1;
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown mirror");
|
||||
}
|
||||
|
||||
private static int mirrorZ(int z, int sizeZ, Mirror mirror) {
|
||||
switch (mirror) {
|
||||
case NONE:
|
||||
case FRONT_BACK:
|
||||
return z;
|
||||
case LEFT_RIGHT:
|
||||
return sizeZ - z - 1;
|
||||
}
|
||||
throw new IllegalArgumentException("Unknown mirror");
|
||||
}
|
||||
|
||||
private static BlockState mirror(BlockState state, Mirror mirror) {
|
||||
if (state == null) {
|
||||
return null;
|
||||
}
|
||||
return state.mirror(mirror);
|
||||
}
|
||||
|
||||
private static List<BlockState> mirror(List<BlockState> states, Mirror mirror) {
|
||||
if (states == null) {
|
||||
return null;
|
||||
}
|
||||
return states.stream()
|
||||
.map(s -> mirror(s, mirror))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
}
|
||||
@@ -27,6 +27,7 @@ import net.minecraft.core.registries.BuiltInRegistries;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Mirror;
|
||||
import net.minecraft.world.level.block.Rotation;
|
||||
|
||||
import java.awt.*;
|
||||
@@ -222,6 +223,7 @@ public class SettingsUtil {
|
||||
FLOAT(Float.class, Float::parseFloat),
|
||||
LONG(Long.class, Long::parseLong),
|
||||
STRING(String.class, String::new),
|
||||
MIRROR(Mirror.class, Mirror::valueOf, Mirror::name),
|
||||
ROTATION(Rotation.class, Rotation::valueOf, Rotation::name),
|
||||
COLOR(
|
||||
Color.class,
|
||||
|
||||
@@ -31,6 +31,7 @@ import baritone.api.schematic.IStaticSchematic;
|
||||
import baritone.api.schematic.MaskSchematic;
|
||||
import baritone.api.schematic.SubstituteSchematic;
|
||||
import baritone.api.schematic.RotatedSchematic;
|
||||
import baritone.api.schematic.MirroredSchematic;
|
||||
import baritone.api.schematic.format.ISchematicFormat;
|
||||
import baritone.api.utils.*;
|
||||
import baritone.api.utils.input.Input;
|
||||
@@ -120,6 +121,9 @@ public final class BuilderProcess extends BaritoneProcessHelper implements IBuil
|
||||
if (!Baritone.settings().buildSubstitutes.value.isEmpty()) {
|
||||
this.schematic = new SubstituteSchematic(this.schematic, Baritone.settings().buildSubstitutes.value);
|
||||
}
|
||||
if (Baritone.settings().buildSchematicMirror.value != net.minecraft.world.level.block.Mirror.NONE) {
|
||||
this.schematic = new MirroredSchematic(this.schematic, Baritone.settings().buildSchematicMirror.value);
|
||||
}
|
||||
if (Baritone.settings().buildSchematicRotation.value != net.minecraft.world.level.block.Rotation.NONE) {
|
||||
this.schematic = new RotatedSchematic(this.schematic, Baritone.settings().buildSchematicRotation.value);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user