From da99a448e1e32d1b01d9304401d4fb986c0ad6d2 Mon Sep 17 00:00:00 2001 From: loki5512344 Date: Sat, 31 Oct 2026 17:48:43 +0100 Subject: [PATCH] Add placement strategies S3-S8, strategy settings GUI and themes - Strategies: precise, fly_hover, ground_walk, baritone_walk, hold_rmb, burst (pending set + AIMD); engine batches via PlaceStrategy.batchSize/tickBatch - GUI: strategy cycle, per-strategy option sliders, switchable themes (ThemePref) - Move ColumnTarget to interaction.place.target; layer baseline is now empty - Show blocks/s in status, action bar and GUI - Tests for batching, precise support, fly hover, ground walk, burst, hold rmb --- README.md | 37 +++--- config/architecture/baseline.txt | 6 +- .../java/dev/loki/satura/SaturaClient.java | 4 +- .../satura/feature/builder/BuildSettings.java | 19 ++- .../feature/builder/BuilderFeature.java | 33 +++++- .../feature/builder/engine/BuildEngine.java | 65 +++++++---- .../satura/feature/builder/plan/Planner.java | 32 ++++- .../java/dev/loki/satura/gui/BuilderUi.java | 7 +- .../java/dev/loki/satura/gui/ThemePref.java | 26 +++++ .../loki/satura/gui/screen/BuilderScreen.java | 83 +++++++++---- .../satura/interaction/movement/WalkPort.java | 10 ++ .../interaction/place/PlaceContext.java | 7 ++ .../interaction/place/PlaceStrategy.java | 20 +++- .../place/client/MinecraftPlaceContext.java | 23 ++++ .../place/option/CommonOptions.java | 9 +- .../interaction/place/strategy/BandStack.java | 2 +- .../place/strategy/ColumnDrop.java | 2 +- .../place/strategy/ColumnPlacing.java | 24 ++-- .../place/strategy/FlightControl.java | 6 +- .../place/strategy/ground/BaritoneWalk.java | 82 +++++++++++++ .../place/strategy/ground/GroundMove.java | 34 ++++++ .../place/strategy/ground/GroundWalk.java | 96 +++++++++++++++ .../strategy/manual/BurstController.java | 87 ++++++++++++++ .../place/strategy/manual/BurstPlace.java | 95 +++++++++++++++ .../place/strategy/manual/HoldRmb.java | 54 +++++++++ .../place/strategy/precise/FlyHover.java | 102 ++++++++++++++++ .../strategy/precise/PrecisePlacement.java | 85 ++++++++++++++ .../strategy/precise/PreciseSupport.java | 64 ++++++++++ .../place/support/BlockPlacer.java | 10 +- .../place/support/SupportFinder.java | 6 +- .../place/support/SupportSearch.java | 13 +++ .../place/target}/ColumnTarget.java | 2 +- .../dev/loki/satura/render/RenderDebug.java | 10 +- .../java/dev/loki/satura/render/Theme.java | 71 +++++++++-- .../render/world/SelectionRenderer.java | 6 +- .../resources/assets/satura/lang/en_us.json | 2 + .../resources/assets/satura/lang/ru_ru.json | 2 + .../builder/engine/BuildEngineTest.java | 11 ++ .../feature/builder/engine/EngineHarness.java | 8 +- .../feature/builder/plan/PlannerTest.java | 20 +++- .../satura/interaction/place/FakeContext.java | 13 +++ .../place/strategy/StrategyTest.java | 2 +- .../place/strategy/ground/GroundWalkTest.java | 110 ++++++++++++++++++ .../place/strategy/manual/BurstPlaceTest.java | 70 +++++++++++ .../place/strategy/manual/HoldRmbTest.java | 48 ++++++++ .../place/strategy/precise/FlyHoverTest.java | 54 +++++++++ .../strategy/precise/PreciseSupportTest.java | 50 ++++++++ 47 files changed, 1507 insertions(+), 115 deletions(-) create mode 100644 src/main/java/dev/loki/satura/gui/ThemePref.java create mode 100644 src/main/java/dev/loki/satura/interaction/movement/WalkPort.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/ground/BaritoneWalk.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/ground/GroundMove.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/ground/GroundWalk.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/manual/BurstController.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/manual/BurstPlace.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/manual/HoldRmb.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/precise/FlyHover.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/precise/PrecisePlacement.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/strategy/precise/PreciseSupport.java create mode 100644 src/main/java/dev/loki/satura/interaction/place/support/SupportSearch.java rename src/main/java/dev/loki/satura/{feature/builder/plan => interaction/place/target}/ColumnTarget.java (84%) create mode 100644 src/test/java/dev/loki/satura/interaction/place/strategy/ground/GroundWalkTest.java create mode 100644 src/test/java/dev/loki/satura/interaction/place/strategy/manual/BurstPlaceTest.java create mode 100644 src/test/java/dev/loki/satura/interaction/place/strategy/manual/HoldRmbTest.java create mode 100644 src/test/java/dev/loki/satura/interaction/place/strategy/precise/FlyHoverTest.java create mode 100644 src/test/java/dev/loki/satura/interaction/place/strategy/precise/PreciseSupportTest.java diff --git a/README.md b/README.md index fb78043..a639c0e 100644 --- a/README.md +++ b/README.md @@ -44,23 +44,34 @@ Gradle запускается на JVM 25: если дефолтная JVM др | `.build block ` | блок (`stone`, `minecraft:glass` или `hand` — блок из руки) | | `.build shape box\|checker\|walls` | форма застройки области | | `.build layers 1..3` | слоёв за один проход колонны | -| `.build strategy ` | стратегия постановки (`band_stack`, `column_drop`) | -| `.build set <ключ> <знач>` | параметр стратегии (`delayMs`, `reach`, `hover`, `flySpeed`, `bandLayers`) | +| `.build strategy ` | стратегия постановки (см. таблицу ниже) | +| `.build set <ключ> <знач>` | параметр стратегии (`delayMs`, `reach`, `hover`, `flySpeed`, `bandLayers`, `burst`) | ### GUI (Right Shift) -Pos1/Pos2 — зафиксировать текущую позицию ног; Старт/Пауза/Продолжить/Стоп; -форма; слои; задержка установки; ID блока (Enter — применить). Внизу — живой -статус: этап, прогресс, блоков/с, дыры. Во время стройки тот же статус раз в -секунду дублируется над хотбаром. +Pos1/Pos2 — зафиксировать текущую позицию ног; Старт/Пауза/Продолжить/Стоп; форма; +стратегия (циклическая кнопка — панель параметров выбранной стратегии перестраивается +автоматически); слайдеры параметров стратегии; тема (оранжевый/белый/мятный/песочный +акцент, выбор сохраняется в `config/satura/render.json`); ID блока (Enter — применить). +Внизу — живой статус: этап, прогресс, блоков/с, дыры. Во время стройки тот же статус +раз в секунду дублируется над хотбаром. ### Стратегии постановки -- **BandStack** (дефолт) — за один визит колонны ставится 1–3 слоя снизу вверх. -- **ColumnDrop** — по одному слою за визит. -Обе летают над слоем и ставят в колонну под собой. Для серверов с жёстким -анти-читом используй меньший `delayMs` и без полёта (наземные стратегии — план -Фазы 9, S5/S6). +| id | Что делает | Референс | +|---|---|---| +| `band_stack` (дефолт) | полёт над слоем, 1–3 слоя за визит колонны, клик под собой | yatwinkle | +| `column_drop` | то же, но по одному слою за визит | yatwinkle | +| `precise` | хавер над колонной + точный выбор опоры (UP → бока → DOWN), LOS-проверка, до 12 ретраев на ячейку | pveclient | +| `fly_hover` | полёт к точке стояния (клик + нормаль × 2.4), скорость `min(0.34k, max(0.08k, dist·0.35k))` | pveclient FLY | +| `ground_walk` | ходьба фейк-клавишами + пиллар-прыжки с постановкой под себя — для серверов без полёта | AutoBuild | +| `baritone_walk` | Baritone только ходит (`GoalXZ`, `allowBreak/Place=false`), ставим по подходе (precise) | AutoBuild | +| `hold_rmb` | ставит только пока зажата ПКМ (ручной контроль) | yatwinkle HOLD_RMB | +| `burst` | несколько кликов за тик (1–8), pending-сет с TTL 3 тика, AIMD сам снижает burst/растит задержку при отказах | свой | + +Для серверов с анти-читом: `band_stack`/`column_drop`/`burst` шлют клики без доворота +камеры и летят через `setVelocity` — их могут флагать; безопасный дефолт — `precise` +или `ground_walk` (меньший `delayMs`, наземное перемещение). Настройки хранятся в `config/satura/default.json` и применяются при старте. @@ -75,9 +86,9 @@ gui → feature (только через фасад BuilderFeature) - `core` — событие/команды/конфиг, ничего не знает о фичах; - `feature/builder` — селекция, план (формы), скан (ColumnCache), движок, Baritone-мост; -- `interaction` — «руки»: постановка блоков (стратегии), инвентарь, движение; +- `interaction` — «руки»: постановка блоков (8 стратегий), инвентарь, движение; - `gui` — экран и виджеты, общается с фичей только через фасад; -- `render` — GUI-рендер (rect/blur/outline/MSDF-текст) и рамка выделения в мире. +- `render` — GUI-рендер (rect/blur/outline/MSDF-текст), палитры `Theme` и рамка выделения в мире. Правила кода: максимум 250 строк на `.java`-файл, максимум 4 файла на пакет, магические числа — в константы, гейт сборки — `./gradlew check` (Checkstyle + diff --git a/config/architecture/baseline.txt b/config/architecture/baseline.txt index 0a97360..f6c9a03 100644 --- a/config/architecture/baseline.txt +++ b/config/architecture/baseline.txt @@ -1,7 +1,3 @@ # Известные нарушения слоёв (долг). Новые нарушения валят check; этот список только уменьшается. # Формат: путь-к-файлу -> пакет, который импортируется -interaction/place/PlaceStrategy.java -> feature -interaction/place/option/CommonOptions.java -> feature -interaction/place/strategy/BandStack.java -> feature -interaction/place/strategy/ColumnDrop.java -> feature -interaction/place/strategy/ColumnPlacing.java -> feature +# (список пуст: стратегии больше не импортируют feature — ColumnTarget переехал в interaction.place) diff --git a/src/main/java/dev/loki/satura/SaturaClient.java b/src/main/java/dev/loki/satura/SaturaClient.java index 8c92212..68616e7 100644 --- a/src/main/java/dev/loki/satura/SaturaClient.java +++ b/src/main/java/dev/loki/satura/SaturaClient.java @@ -7,6 +7,7 @@ import dev.loki.satura.core.config.ConfigStore; import dev.loki.satura.core.event.EventBus; import dev.loki.satura.feature.builder.BuilderFeature; import dev.loki.satura.gui.BuilderUi; +import dev.loki.satura.gui.ThemePref; import dev.loki.satura.render.RenderDebug; import dev.loki.satura.render.Renderer; import dev.loki.satura.render.world.Marks; @@ -39,9 +40,10 @@ public final class SaturaClient implements ClientModInitializer { CoreServices.install(new CoreServices(events, commands, config)); ClientTickEvents.END_CLIENT_TICK.register(client -> builder.tick()); RenderDebug.installIfEnabled(Renderer.shared()); + ThemePref.load(config); new SelectionRenderer(() -> new Marks(builder.selection().pos1(), builder.selection().pos2()), SELECTION_SEE_THROUGH).register(); - new BuilderUi(builder, new ActionBarOut()).register(); + new BuilderUi(builder, new ActionBarOut(), config).register(); LOG.info("[satura] client init"); } } diff --git a/src/main/java/dev/loki/satura/feature/builder/BuildSettings.java b/src/main/java/dev/loki/satura/feature/builder/BuildSettings.java index a42e62a..c9ef7ea 100644 --- a/src/main/java/dev/loki/satura/feature/builder/BuildSettings.java +++ b/src/main/java/dev/loki/satura/feature/builder/BuildSettings.java @@ -1,7 +1,6 @@ package dev.loki.satura.feature.builder; import dev.loki.satura.core.config.Profile; -import dev.loki.satura.feature.builder.plan.Planner; import dev.loki.satura.feature.builder.plan.shape.BoxShape; import dev.loki.satura.feature.builder.plan.shape.CheckerShape; import dev.loki.satura.feature.builder.plan.shape.Shape; @@ -9,6 +8,7 @@ import dev.loki.satura.feature.builder.plan.shape.WallsShape; import dev.loki.satura.interaction.place.PlaceStrategy; import dev.loki.satura.interaction.place.option.CommonOptions; import dev.loki.satura.interaction.place.option.Option; +import dev.loki.satura.interaction.place.option.OptionType; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; @@ -23,6 +23,11 @@ public final class BuildSettings { public record Range(double min, double max, double step, double value) { } + /** GUI-facing slider description: no interaction types leak into the gui layer. */ + public record Slider(String key, String label, boolean integer, + double min, double max, double step, double value) { + } + static final String KEY_BLOCK = "block"; static final String KEY_SHAPE = "shape"; static final String KEY_LAYERS = "layers"; @@ -100,7 +105,7 @@ public final class BuildSettings { } public void setLayers(final int value) { - require(value >= Planner.MIN_BAND_LAYERS && value <= Planner.MAX_BAND_LAYERS, "слои: 1-3"); + require(value >= CommonOptions.MIN_LAYERS && value <= CommonOptions.MAX_LAYERS, "слои: 1-3"); layers = value; strategies.values().stream().filter(s -> s.options().contains(CommonOptions.BAND_LAYERS)) .forEach(s -> s.values().set(CommonOptions.BAND_LAYERS.key(), value)); @@ -116,6 +121,14 @@ public final class BuildSettings { .map(o -> new Range(o.min(), o.max(), o.step(), strategy().values().get(o))); } + /** All sliders of the current strategy, in declaration order (the GUI draws them generically). */ + public List optionSliders() { + return strategy().options().stream() + .map(o -> new Slider(o.key(), o.label(), o.type() == OptionType.INT, + o.min(), o.max(), o.step(), strategy().values().get(o))) + .toList(); + } + public void setOption(final String key, final String value) { final double number; try { @@ -151,7 +164,7 @@ public final class BuildSettings { private static int parseLayers(final String raw) { final int v = Integer.parseInt(raw); - return Math.max(Planner.MIN_BAND_LAYERS, Math.min(Planner.MAX_BAND_LAYERS, v)); + return Math.max(CommonOptions.MIN_LAYERS, Math.min(CommonOptions.MAX_LAYERS, v)); } private static void require(final boolean ok, final String message) { diff --git a/src/main/java/dev/loki/satura/feature/builder/BuilderFeature.java b/src/main/java/dev/loki/satura/feature/builder/BuilderFeature.java index b9a53bb..773e1a6 100644 --- a/src/main/java/dev/loki/satura/feature/builder/BuilderFeature.java +++ b/src/main/java/dev/loki/satura/feature/builder/BuilderFeature.java @@ -14,9 +14,21 @@ import dev.loki.satura.feature.builder.selection.Area; import dev.loki.satura.feature.builder.selection.PosCommand; import dev.loki.satura.feature.builder.selection.SelCommand; import dev.loki.satura.feature.builder.selection.Selection; +import dev.loki.satura.interaction.movement.MovementController; +import dev.loki.satura.interaction.movement.WalkPort; +import dev.loki.satura.interaction.movement.io.MinecraftKeyInput; +import dev.loki.satura.interaction.movement.io.MinecraftPlayerPose; import dev.loki.satura.interaction.place.PlaceStrategy; import dev.loki.satura.interaction.place.strategy.BandStack; import dev.loki.satura.interaction.place.strategy.ColumnDrop; +import dev.loki.satura.interaction.place.strategy.ground.BaritoneWalk; +import dev.loki.satura.interaction.place.strategy.ground.GroundMove; +import dev.loki.satura.interaction.place.strategy.ground.GroundWalk; +import dev.loki.satura.interaction.place.strategy.manual.BurstPlace; +import dev.loki.satura.interaction.place.strategy.manual.HoldRmb; +import dev.loki.satura.interaction.place.strategy.precise.FlyHover; +import dev.loki.satura.interaction.place.strategy.precise.PrecisePlacement; +import dev.loki.satura.interaction.place.strategy.precise.PreciseSupport; import dev.loki.satura.interaction.place.support.BlockPlacer; import dev.loki.satura.interaction.place.support.Cooldown; import dev.loki.satura.interaction.place.support.SupportFinder; @@ -62,7 +74,26 @@ public final class BuilderFeature implements BuildControl { final ConfigStore store, final Walker walker) { final MinecraftClient client = MinecraftClient.getInstance(); final BlockPlacer placer = new BlockPlacer(new SupportFinder(), new Cooldown()); - final List strategies = List.of(new BandStack(placer), new ColumnDrop(placer)); + final PreciseSupport precise = new PreciseSupport(); + final BlockPlacer precisePlacer = new BlockPlacer(precise, new Cooldown()); + final GroundMove ground = new GroundMove(new MovementController( + new MinecraftKeyInput(client), new MinecraftPlayerPose(client))); + final WalkPort port = new WalkPort() { + @Override + public boolean walkTo(final double x, final double z) { + return walker.walkTo(x, z); + } + + @Override + public void cancel() { + walker.cancel(); + } + }; + final List strategies = List.of( + new BandStack(placer), new ColumnDrop(placer), + new PrecisePlacement(precisePlacer), new FlyHover(precise, precisePlacer), + new GroundWalk(ground, placer), new BaritoneWalk(port, precisePlacer), + new HoldRmb(placer), new BurstPlace(precise)); return new BuilderFeature(commands, () -> client.player == null ? null : client.player.getBlockPos(), new EngineAssembler(client, events, walker, new ChatOut(), new ActionBarOut()), new BuildSettings(store.loadOrEmpty(Profile.DEFAULT_NAME), strategies), store::saveQuietly); diff --git a/src/main/java/dev/loki/satura/feature/builder/engine/BuildEngine.java b/src/main/java/dev/loki/satura/feature/builder/engine/BuildEngine.java index 24205ef..c393cf4 100644 --- a/src/main/java/dev/loki/satura/feature/builder/engine/BuildEngine.java +++ b/src/main/java/dev/loki/satura/feature/builder/engine/BuildEngine.java @@ -3,9 +3,10 @@ package dev.loki.satura.feature.builder.engine; import dev.loki.satura.core.event.Listener; import dev.loki.satura.core.event.world.BlockChangeEvent; import dev.loki.satura.feature.builder.engine.host.EngineDeps; -import dev.loki.satura.feature.builder.plan.ColumnTarget; +import dev.loki.satura.interaction.place.target.ColumnTarget; import dev.loki.satura.interaction.inventory.HotbarRefill; import dev.loki.satura.interaction.place.PlaceResult; +import java.util.List; import java.util.Optional; /** @@ -31,6 +32,7 @@ public final class BuildEngine { } public void start() { + deps.strategy().reset(); deps.events().subscribe(blockListener); world = deps.game().worldToken(); deps.cache().fullRescan(); @@ -98,7 +100,44 @@ public final class BuildEngine { session.pause(NO_BLOCKS, false); deps.chat().accept("Пауза: " + NO_BLOCKS + ". Положи блоки и .build resume"); } else if (stock == HotbarRefill.State.READY) { - deps.planner().next().ifPresentOrElse(this::place, this::finishOrRepair); + place(); + } + } + + /** Asks the planner for a batch (the strategy declares its size) and applies every result. */ + private void place() { + final int size = Math.max(1, deps.strategy().batchSize()); + final List targets = deps.planner().nextBatch(size); + if (targets.isEmpty()) { + finishOrRepair(); + return; + } + final List results = size == 1 + ? List.of(deps.strategy().tick(deps.ctx(), targets.get(0))) + : deps.strategy().tickBatch(deps.ctx(), targets); + for (int i = 0; i < Math.min(targets.size(), results.size()); i++) { + apply(targets.get(i), results.get(i)); + } + } + + private void apply(final ColumnTarget target, final PlaceResult result) { + final var tracker = deps.tracker(); + tracker.observe(target.column(), deps.cache().done()); + session.at(target.column()); + switch (result) { + case PLACED -> session.onPlaced(); + case FAILED -> { + session.onFailed(); + if (tracker.failure()) { + tracker.skip(target.column()); + } + } + case WAIT -> { + if (tracker.stall()) { + tracker.skip(target.column()); + } + } + default -> throw new IllegalStateException("unknown result: " + result); } } @@ -110,27 +149,6 @@ public final class BuildEngine { } } - private void place(final ColumnTarget target) { - final var tracker = deps.tracker(); - tracker.observe(target.column(), deps.cache().done()); - session.at(target.column()); - final PlaceResult result = deps.strategy().tick(deps.ctx(), target); - final boolean giveUp = switch (result) { - case PLACED -> { - session.onPlaced(); - yield false; - } - case FAILED -> { - session.onFailed(); - yield tracker.failure(); - } - case WAIT -> tracker.stall(); - }; - if (giveUp) { - tracker.skip(target.column()); - } - } - private void finishOrRepair() { if (deps.tracker().startRepair(deps.planner())) { deps.chat().accept("Ремонтный проход " + deps.tracker().passes() + ", дыр: " @@ -145,6 +163,7 @@ public final class BuildEngine { } private void halt() { + deps.strategy().reset(); deps.walker().cancel(); if (deps.game().blockReason().isEmpty()) { deps.ctx().setVelocity(0, 0, 0); diff --git a/src/main/java/dev/loki/satura/feature/builder/plan/Planner.java b/src/main/java/dev/loki/satura/feature/builder/plan/Planner.java index 4b6c5ba..180d88c 100644 --- a/src/main/java/dev/loki/satura/feature/builder/plan/Planner.java +++ b/src/main/java/dev/loki/satura/feature/builder/plan/Planner.java @@ -2,6 +2,8 @@ package dev.loki.satura.feature.builder.plan; import dev.loki.satura.feature.builder.plan.shape.Shape; import dev.loki.satura.feature.builder.selection.Area; +import dev.loki.satura.interaction.place.target.ColumnTarget; +import dev.loki.satura.interaction.place.option.CommonOptions; import java.util.ArrayList; import java.util.List; import java.util.Optional; @@ -11,9 +13,6 @@ import net.minecraft.util.math.BlockPos; /** Slices the area into Y windows and returns the next unfinished column in snake order. */ public final class Planner { - public static final int MIN_BAND_LAYERS = 1; - public static final int MAX_BAND_LAYERS = 3; - private final Area area; private final Shape shape; private final int bandLayers; @@ -25,7 +24,7 @@ public final class Planner { final Predicate done) { this.area = area; this.shape = shape; - this.bandLayers = Math.max(MIN_BAND_LAYERS, Math.min(MAX_BAND_LAYERS, bandLayers)); + this.bandLayers = Math.max(CommonOptions.MIN_LAYERS, Math.min(CommonOptions.MAX_LAYERS, bandLayers)); this.done = done; this.columns = area.columns(); this.bandFloor = area.min().getY(); @@ -57,6 +56,31 @@ public final class Planner { bandFloor = area.min().getY(); } + /** + * Up to {@code max} unfinished columns of the current window, in snake order. + * The window moves up only when every column of it is complete. + */ + public List nextBatch(final int max) { + final List out = new ArrayList<>(); + if (max <= 0) { + return out; + } + final int top = area.max().getY(); + while (bandFloor <= top && out.isEmpty()) { + final int bandEnd = Math.min(bandFloor + bandLayers - 1, top); + for (final BlockPos column : columns) { + final List pending = pending(column, bandFloor, bandEnd); + if (!pending.isEmpty() && out.size() < max) { + out.add(new ColumnTarget(column, pending)); + } + } + if (out.isEmpty()) { + bandFloor = bandEnd + 1; + } + } + return out; + } + private List pending(final BlockPos column, final int fromY, final int toY) { final List cells = new ArrayList<>(); for (int y = fromY; y <= toY; y++) { diff --git a/src/main/java/dev/loki/satura/gui/BuilderUi.java b/src/main/java/dev/loki/satura/gui/BuilderUi.java index f1978ef..892b0f9 100644 --- a/src/main/java/dev/loki/satura/gui/BuilderUi.java +++ b/src/main/java/dev/loki/satura/gui/BuilderUi.java @@ -1,5 +1,6 @@ package dev.loki.satura.gui; +import dev.loki.satura.core.config.ConfigStore; import dev.loki.satura.feature.builder.BuilderFeature; import dev.loki.satura.gui.screen.BuilderScreen; import java.util.function.Consumer; @@ -23,12 +24,14 @@ public final class BuilderUi { private final BuilderFeature builder; private final Consumer bar; + private final ConfigStore store; private final KeyBinding openMenu; private final KeyBinding toggleBuild; - public BuilderUi(final BuilderFeature builder, final Consumer bar) { + public BuilderUi(final BuilderFeature builder, final Consumer bar, final ConfigStore store) { this.builder = builder; this.bar = bar; + this.store = store; this.openMenu = KeyBindingHelper.registerKeyBinding( new KeyBinding(KEY_MENU, GLFW.GLFW_KEY_RIGHT_SHIFT, CATEGORY)); this.toggleBuild = KeyBindingHelper.registerKeyBinding( @@ -43,7 +46,7 @@ public final class BuilderUi { private void tick(final MinecraftClient client) { while (openMenu.wasPressed()) { if (client.currentScreen == null) { - client.setScreen(new BuilderScreen(builder, openMenu)); + client.setScreen(new BuilderScreen(builder, openMenu, store)); } } while (toggleBuild.wasPressed()) { diff --git a/src/main/java/dev/loki/satura/gui/ThemePref.java b/src/main/java/dev/loki/satura/gui/ThemePref.java new file mode 100644 index 0000000..e579b88 --- /dev/null +++ b/src/main/java/dev/loki/satura/gui/ThemePref.java @@ -0,0 +1,26 @@ +package dev.loki.satura.gui; + +import dev.loki.satura.core.config.ConfigStore; +import dev.loki.satura.render.Theme; + +/** Accent palette preference: loaded at start, saved on switch (profile "render"). */ +public final class ThemePref { + + private static final String PROFILE = "render"; + private static final String KEY = "theme"; + + private ThemePref() { + } + + /** Reads the saved palette; call once at client start. */ + public static void load(final ConfigStore store) { + Theme.set(Theme.byId(store.loadOrEmpty(PROFILE).get(KEY, Theme.ORANGE.id()))); + } + + /** Switches the palette and persists the choice. */ + public static String apply(final ConfigStore store, final String id) { + Theme.set(Theme.byId(id)); + store.saveQuietly(store.loadOrEmpty(PROFILE).with(KEY, Theme.get().id())); + return "Тема: " + Theme.get().id(); + } +} diff --git a/src/main/java/dev/loki/satura/gui/screen/BuilderScreen.java b/src/main/java/dev/loki/satura/gui/screen/BuilderScreen.java index d9701da..610d5a4 100644 --- a/src/main/java/dev/loki/satura/gui/screen/BuilderScreen.java +++ b/src/main/java/dev/loki/satura/gui/screen/BuilderScreen.java @@ -1,13 +1,16 @@ package dev.loki.satura.gui.screen; +import dev.loki.satura.core.config.ConfigStore; import dev.loki.satura.feature.builder.BuildSettings; import dev.loki.satura.feature.builder.BuilderFeature; import dev.loki.satura.feature.builder.engine.Stage; -import dev.loki.satura.feature.builder.plan.Planner; +import dev.loki.satura.gui.ThemePref; import dev.loki.satura.gui.widget.CycleButton; import dev.loki.satura.gui.widget.NumberSlider; import dev.loki.satura.render.Renderer; import dev.loki.satura.render.Theme; +import java.util.List; +import java.util.Locale; import java.util.Optional; import java.util.function.Supplier; import net.minecraft.client.gui.DrawContext; @@ -19,16 +22,18 @@ import net.minecraft.client.option.KeyBinding; import net.minecraft.text.Text; import net.minecraft.util.math.BlockPos; -/** Builder screen: selection, start/pause/stop, shape, layers, delay, block, status line. */ +/** + * Builder screen: selection, start/pause/stop, shape, strategy (with its own option sliders), + * block id, theme, status line. Strategy change rebuilds the option area. + */ @SuppressWarnings("PMD.AvoidCatchingGenericException") public final class BuilderScreen extends Screen { - private static final int FIXED_ROWS = 5; + private static final int FIXED_ROWS = 6; private static final int NOTICE_TICKS = 100; private static final int MAX_BLOCK_LEN = 64; private static final int POS1 = 1; private static final int POS2 = 2; - private static final String OPT_DELAY = "delayMs"; private static final String LANG_POS1 = "satura.gui.pos1"; private static final String LANG_POS2 = "satura.gui.pos2"; private static final String LANG_PAUSE = "satura.gui.pause"; @@ -36,6 +41,7 @@ public final class BuilderScreen extends Screen { private final BuilderFeature builder; private final KeyBinding openMenu; + private final ConfigStore store; private Panel panel; private ButtonWidget pos1Button; private ButtonWidget pos2Button; @@ -43,17 +49,19 @@ public final class BuilderScreen extends Screen { private TextFieldWidget blockField; private Text notice = Text.empty(); private int noticeTicks; + private boolean reinitQueued; - public BuilderScreen(final BuilderFeature builder, final KeyBinding openMenu) { + public BuilderScreen(final BuilderFeature builder, final KeyBinding openMenu, final ConfigStore store) { super(Text.translatable("satura.title")); this.builder = builder; this.openMenu = openMenu; + this.store = store; } @Override protected void init() { - final Optional delay = builder.settings().optionRange(OPT_DELAY); - panel = new Panel(width, height, FIXED_ROWS + (delay.isPresent() ? 1 : 0)); + final List options = visibleOptions(); + panel = new Panel(width, height, FIXED_ROWS + options.size()); final int inner = panel.inner(); final int left = panel.left(); final int half = (inner - Panel.GAP) / 2; @@ -72,20 +80,17 @@ public final class BuilderScreen extends Screen { addDrawableChild(new CycleButton(left, y, inner, Panel.WIDGET_H, "satura.gui.shape", builder.shapeIds(), builder.settings().shapeId(), id -> run(() -> builder.setShape(id)))); y += Panel.WIDGET_H + Panel.GAP; - addDrawableChild(new NumberSlider(left, y, inner, Panel.WIDGET_H, - new NumberSlider.Spec(Planner.MIN_BAND_LAYERS, Planner.MAX_BAND_LAYERS, 1, - builder.settings().layers()), - v -> Text.translatable("satura.gui.layers", formatInt(v)), - v -> run(() -> builder.setLayers((int) Math.round(v))))); + addDrawableChild(new CycleButton(left, y, inner, Panel.WIDGET_H, "satura.gui.strategy", + builder.strategyIds(), builder.settings().strategy().id(), this::changeStrategy)); y += Panel.WIDGET_H + Panel.GAP; - if (delay.isPresent()) { - final BuildSettings.Range r = delay.get(); - addDrawableChild(new NumberSlider(left, y, inner, Panel.WIDGET_H, - new NumberSlider.Spec(r.min(), r.max(), r.step(), r.value()), - v -> Text.translatable("satura.gui.delay", formatInt(v)), - v -> run(() -> builder.setOption(OPT_DELAY, formatInt(v))))); + for (final BuildSettings.Slider option : options) { + addDrawableChild(optionSlider(left, y, inner, option)); y += Panel.WIDGET_H + Panel.GAP; } + addDrawableChild(new CycleButton(left, y, inner, Panel.WIDGET_H, "satura.gui.theme", + Theme.all().stream().map(Theme::id).toList(), Theme.get().id(), + id -> run(() -> setTheme(id)))); + y += Panel.WIDGET_H + Panel.GAP; blockField = new TextFieldWidget(textRenderer, left, y, inner, Panel.WIDGET_H, Text.translatable("satura.gui.block")); blockField.setMaxLength(MAX_BLOCK_LEN); @@ -95,6 +100,11 @@ public final class BuilderScreen extends Screen { @Override public void tick() { + if (reinitQueued) { + reinitQueued = false; + clearAndInit(); + return; + } if (noticeTicks > 0) { noticeTicks--; } @@ -111,7 +121,7 @@ public final class BuilderScreen extends Screen { panel.top() + Panel.PAD, Theme.TEXT); final String status = trim(builder.status()); context.drawTextWithShadow(textRenderer, trim(notice.getString()), - panel.left(), panel.statusY(), Theme.ACCENT_HOVER); + panel.left(), panel.statusY(), Theme.get().accentHover()); context.drawTextWithShadow(textRenderer, status, panel.left(), panel.statusY() + Panel.LINE_H, Theme.TEXT_MUTED); } @@ -147,6 +157,35 @@ public final class BuilderScreen extends Screen { return false; } + /** Strategy options; truncated when the screen is too short (GUI scale 4). */ + private List visibleOptions() { + final List options = builder.settings().optionSliders(); + final int usable = height - Panel.PAD * 2 - Panel.TITLE_H - Panel.GAP * 2 + - Panel.STATUS_ROWS * Panel.LINE_H; + final int maxRows = usable / (Panel.WIDGET_H + Panel.GAP) - FIXED_ROWS; + if (maxRows >= options.size()) { + return options; + } + return maxRows <= 0 ? List.of() : options.subList(0, maxRows); + } + + private NumberSlider optionSlider(final int left, final int y, final int inner, + final BuildSettings.Slider option) { + return new NumberSlider(left, y, inner, Panel.WIDGET_H, + new NumberSlider.Spec(option.min(), option.max(), option.step(), option.value()), + v -> Text.literal(option.label() + ": " + format(option, v)), + v -> run(() -> builder.setOption(option.key(), format(option, v)))); + } + + private void changeStrategy(final String id) { + run(() -> builder.setStrategy(id)); + reinitQueued = true; + } + + private String setTheme(final String id) { + return ThemePref.apply(store, id); + } + private void run(final Supplier action) { try { showNotice(action.get()); @@ -185,8 +224,10 @@ public final class BuilderScreen extends Screen { return Text.translatable(key, pos.map(BlockPos::toShortString).orElse("-")); } - private static String formatInt(final double value) { - return String.valueOf(Math.round(value)); + private String format(final BuildSettings.Slider option, final double value) { + return option.integer() + ? String.valueOf(Math.round(value)) + : String.format(Locale.ROOT, "%.1f", value); } private String trim(final String text) { diff --git a/src/main/java/dev/loki/satura/interaction/movement/WalkPort.java b/src/main/java/dev/loki/satura/interaction/movement/WalkPort.java new file mode 100644 index 0000000..fddf745 --- /dev/null +++ b/src/main/java/dev/loki/satura/interaction/movement/WalkPort.java @@ -0,0 +1,10 @@ +package dev.loki.satura.interaction.movement; + +/** Long-distance walking port for strategies; Baritone sits behind it in production. */ +public interface WalkPort { + + /** Start walking to (x, z); false if the walker is unavailable. */ + boolean walkTo(double x, double z); + + void cancel(); +} diff --git a/src/main/java/dev/loki/satura/interaction/place/PlaceContext.java b/src/main/java/dev/loki/satura/interaction/place/PlaceContext.java index f9e2bb8..c8a6a19 100644 --- a/src/main/java/dev/loki/satura/interaction/place/PlaceContext.java +++ b/src/main/java/dev/loki/satura/interaction/place/PlaceContext.java @@ -2,6 +2,7 @@ package dev.loki.satura.interaction.place; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; /** Everything a strategy touches in the game. A narrow interface so the logic can be tested with a fake. */ @@ -16,6 +17,12 @@ public interface PlaceContext { /** Whether the block is usable as a support. */ boolean isSolid(BlockPos pos); + /** Whether the block face is visible from the eyes (line of sight). */ + boolean visible(BlockPos support, Direction face); + + /** Whether the use key (right mouse button) is currently held. */ + boolean useKeyDown(); + /** Right-click on a block; true if the client accepted the action. */ boolean interact(BlockHitResult hit); diff --git a/src/main/java/dev/loki/satura/interaction/place/PlaceStrategy.java b/src/main/java/dev/loki/satura/interaction/place/PlaceStrategy.java index 74475f5..dd0626c 100644 --- a/src/main/java/dev/loki/satura/interaction/place/PlaceStrategy.java +++ b/src/main/java/dev/loki/satura/interaction/place/PlaceStrategy.java @@ -1,8 +1,8 @@ package dev.loki.satura.interaction.place; -import dev.loki.satura.feature.builder.plan.ColumnTarget; import dev.loki.satura.interaction.place.option.Option; import dev.loki.satura.interaction.place.option.OptionValues; +import dev.loki.satura.interaction.place.target.ColumnTarget; import java.util.List; /** A way to place blocks into a column. The engine calls {@link #tick} every tick until the column is complete. */ @@ -20,5 +20,23 @@ public interface PlaceStrategy { /** Current parameter values (live: the GUI may change them). */ OptionValues values(); + /** Columns the strategy wants per tick ({@code 1} = one placement attempt per tick). */ + default int batchSize() { + return 1; + } + + /** Release keys, cancel walking, drop transient state; called on start/stop/pause. */ + default void reset() { + // stateless by default + } + PlaceResult tick(PlaceContext ctx, ColumnTarget target); + + /** + * Place into several columns in one tick (burst). The returned list must match the input + * order and size. Default: sequential single-target ticks. + */ + default List tickBatch(final PlaceContext ctx, final List targets) { + return targets.stream().map(t -> tick(ctx, t)).toList(); + } } diff --git a/src/main/java/dev/loki/satura/interaction/place/client/MinecraftPlaceContext.java b/src/main/java/dev/loki/satura/interaction/place/client/MinecraftPlaceContext.java index 961441a..01d88d6 100644 --- a/src/main/java/dev/loki/satura/interaction/place/client/MinecraftPlaceContext.java +++ b/src/main/java/dev/loki/satura/interaction/place/client/MinecraftPlaceContext.java @@ -6,12 +6,15 @@ import net.minecraft.client.network.ClientPlayerEntity; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; +import net.minecraft.world.RaycastContext; /** The real player and world behind {@link PlaceContext}. The client is passed to the constructor. */ public final class MinecraftPlaceContext implements PlaceContext { private static final float PITCH_DOWN = 90.0F; + private static final double HALF = 0.5; private final MinecraftClient client; @@ -35,6 +38,20 @@ public final class MinecraftPlaceContext implements PlaceContext { return !state.isAir() && state.isSolidBlock(client.world, pos); } + @Override + public boolean visible(final BlockPos support, final Direction face) { + final ClientPlayerEntity player = client.player; + final RaycastContext ray = new RaycastContext(player.getEyePos(), faceCenter(support, face), + RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.NONE, player); + final BlockHitResult hit = client.world.raycast(ray); + return hit != null && hit.getBlockPos().equals(support); + } + + @Override + public boolean useKeyDown() { + return client.options.useKey.isPressed(); + } + @Override public boolean interact(final BlockHitResult hit) { return client.interactionManager.interactBlock(client.player, Hand.MAIN_HAND, hit).isAccepted(); @@ -67,4 +84,10 @@ public final class MinecraftPlaceContext implements PlaceContext { public long nowMs() { return System.currentTimeMillis(); } + + private static Vec3d faceCenter(final BlockPos support, final Direction face) { + return new Vec3d(support.getX() + HALF + face.getOffsetX() * HALF, + support.getY() + HALF + face.getOffsetY() * HALF, + support.getZ() + HALF + face.getOffsetZ() * HALF); + } } diff --git a/src/main/java/dev/loki/satura/interaction/place/option/CommonOptions.java b/src/main/java/dev/loki/satura/interaction/place/option/CommonOptions.java index 01fbdb1..8a4074f 100644 --- a/src/main/java/dev/loki/satura/interaction/place/option/CommonOptions.java +++ b/src/main/java/dev/loki/satura/interaction/place/option/CommonOptions.java @@ -1,11 +1,13 @@ package dev.loki.satura.interaction.place.option; -import dev.loki.satura.feature.builder.plan.Planner; - /** Parameters shared by several strategies (values follow yatwinkle BaseBuilder). */ @SuppressWarnings("PMD.DataClass") public final class CommonOptions { + /** Band window bounds, shared by the planner and the BAND_LAYERS option. */ + public static final int MIN_LAYERS = 1; + public static final int MAX_LAYERS = 3; + public static final Option DELAY_MS = new Option("delayMs", "Задержка установки (мс)", OptionType.INT, 0, 300, 5, 0); public static final Option REACH = @@ -15,8 +17,7 @@ public final class CommonOptions { public static final Option FLY_SPEED = new Option("flySpeed", "Скорость полёта", OptionType.DOUBLE, 0.05, 1.0, 0.05, 0.25); public static final Option BAND_LAYERS = - new Option("bandLayers", "Слоёв за проход", OptionType.INT, - Planner.MIN_BAND_LAYERS, Planner.MAX_BAND_LAYERS, 1, 2); + new Option("bandLayers", "Слоёв за проход", OptionType.INT, MIN_LAYERS, MAX_LAYERS, 1, 2); private CommonOptions() { } diff --git a/src/main/java/dev/loki/satura/interaction/place/strategy/BandStack.java b/src/main/java/dev/loki/satura/interaction/place/strategy/BandStack.java index 2d2fc6d..cd38f51 100644 --- a/src/main/java/dev/loki/satura/interaction/place/strategy/BandStack.java +++ b/src/main/java/dev/loki/satura/interaction/place/strategy/BandStack.java @@ -1,6 +1,6 @@ package dev.loki.satura.interaction.place.strategy; -import dev.loki.satura.feature.builder.plan.ColumnTarget; +import dev.loki.satura.interaction.place.target.ColumnTarget; import dev.loki.satura.interaction.place.PlaceContext; import dev.loki.satura.interaction.place.PlaceResult; import dev.loki.satura.interaction.place.PlaceStrategy; diff --git a/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnDrop.java b/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnDrop.java index 4b4ee6e..7d18af7 100644 --- a/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnDrop.java +++ b/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnDrop.java @@ -1,6 +1,6 @@ package dev.loki.satura.interaction.place.strategy; -import dev.loki.satura.feature.builder.plan.ColumnTarget; +import dev.loki.satura.interaction.place.target.ColumnTarget; import dev.loki.satura.interaction.place.PlaceContext; import dev.loki.satura.interaction.place.PlaceResult; import dev.loki.satura.interaction.place.PlaceStrategy; diff --git a/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnPlacing.java b/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnPlacing.java index d15415b..1099d8d 100644 --- a/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnPlacing.java +++ b/src/main/java/dev/loki/satura/interaction/place/strategy/ColumnPlacing.java @@ -1,6 +1,6 @@ package dev.loki.satura.interaction.place.strategy; -import dev.loki.satura.feature.builder.plan.ColumnTarget; +import dev.loki.satura.interaction.place.target.ColumnTarget; import dev.loki.satura.interaction.place.PlaceContext; import dev.loki.satura.interaction.place.PlaceResult; import dev.loki.satura.interaction.place.option.CommonOptions; @@ -9,36 +9,46 @@ import dev.loki.satura.interaction.place.support.BlockPlacer; import java.util.ArrayList; import java.util.List; import java.util.function.IntSupplier; +import java.util.function.Predicate; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; /** Core of the yatwinkle style: hover above the column, look down, place band layers bottom to top. */ -final class ColumnPlacing { +public final class ColumnPlacing { /** Margin: eyes 1.62 + ~0.08 (yatwinkle {@code layerY + reach - 1.7}). */ - static final double EYE_MARGIN = 1.7; + public static final double EYE_MARGIN = 1.7; /** For this many ticks we do not repeat a click on the same cell until the server replies. */ static final int PENDING_TTL_TICKS = 2; private static final double FEET_EPS = 0.1; - private static final double CENTER = 0.5; + /** Horizontal center of a block column. */ + public static final double CENTER = 0.5; private final OptionValues values; private final IntSupplier layers; private final BlockPlacer placer; + private final Predicate gate; private int ticks; private BlockPos lastPos; private int lastTick; ColumnPlacing(final OptionValues values, final IntSupplier layers, final BlockPlacer placer) { + this(values, layers, placer, ctx -> true); + } + + /** Gated variant: the click part runs only while the gate accepts the context (S7 HoldRmb). */ + public ColumnPlacing(final OptionValues values, final IntSupplier layers, final BlockPlacer placer, + final Predicate gate) { this.values = values; this.layers = layers; this.placer = placer; + this.gate = gate; } - PlaceResult tick(final PlaceContext ctx, final ColumnTarget target) { + public PlaceResult tick(final PlaceContext ctx, final ColumnTarget target) { ticks++; final List band = band(target.cells(), layers.getAsInt()); - if (band.isEmpty()) { + if (band.isEmpty() || !gate.test(ctx)) { return PlaceResult.WAIT; } final BlockPos column = target.column(); @@ -83,7 +93,7 @@ final class ColumnPlacing { return band; } - static boolean overColumn(final Vec3d feet, final BlockPos column) { + public static boolean overColumn(final Vec3d feet, final BlockPos column) { return (int) Math.floor(feet.x) == column.getX() && (int) Math.floor(feet.z) == column.getZ(); } } diff --git a/src/main/java/dev/loki/satura/interaction/place/strategy/FlightControl.java b/src/main/java/dev/loki/satura/interaction/place/strategy/FlightControl.java index 7cc2536..dc8ba89 100644 --- a/src/main/java/dev/loki/satura/interaction/place/strategy/FlightControl.java +++ b/src/main/java/dev/loki/satura/interaction/place/strategy/FlightControl.java @@ -4,14 +4,14 @@ import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.Vec3d; /** setVelocity flight speed as in yatwinkle BaseBuilder.flyTo: straight vector to the point, no key physics. */ -final class FlightControl { +public final class FlightControl { private static final double ARRIVE_EPS = 0.05; private FlightControl() { } - static Vec3d velocity(final Vec3d feet, final Vec3d goal, final double speed) { + public static Vec3d velocity(final Vec3d feet, final Vec3d goal, final double speed) { final double dx = goal.x - feet.x; final double dz = goal.z - feet.z; final double dist = Math.hypot(dx, dz); @@ -27,7 +27,7 @@ final class FlightControl { } /** Flight height: min(bandTop+hover, layerY+reach-1.7), but not below the layer top (no standing in a block). */ - static double height(final int layerY, final int bandTop, final double hover, + public static double height(final int layerY, final int bandTop, final double hover, final double reach, final double eyeMargin) { final double capped = Math.min(bandTop + hover, layerY + reach - eyeMargin); return Math.max(capped, bandTop + 1.0); diff --git a/src/main/java/dev/loki/satura/interaction/place/strategy/ground/BaritoneWalk.java b/src/main/java/dev/loki/satura/interaction/place/strategy/ground/BaritoneWalk.java new file mode 100644 index 0000000..c4372ef --- /dev/null +++ b/src/main/java/dev/loki/satura/interaction/place/strategy/ground/BaritoneWalk.java @@ -0,0 +1,82 @@ +package dev.loki.satura.interaction.place.strategy.ground; + +import dev.loki.satura.interaction.movement.WalkPort; +import dev.loki.satura.interaction.place.target.ColumnTarget; +import dev.loki.satura.interaction.place.PlaceContext; +import dev.loki.satura.interaction.place.PlaceResult; +import dev.loki.satura.interaction.place.PlaceStrategy; +import dev.loki.satura.interaction.place.option.CommonOptions; +import dev.loki.satura.interaction.place.option.Option; +import dev.loki.satura.interaction.place.option.OptionValues; +import dev.loki.satura.interaction.place.support.BlockPlacer; +import java.util.List; +import net.minecraft.util.math.Vec3d; + +/** + * S6 BaritoneWalk: Baritone (through the {@link WalkPort}) only walks to the column, + * the placement itself is precise (LOS) once in reach. Aithereal settings are applied + * by the bridge: allowBreak/allowPlace = false. + */ +public final class BaritoneWalk implements PlaceStrategy { + + private static final List