mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-06-21 08:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto-mode

Browse Source
This commit is contained in:
Zoe Gidiere
2025-12-13 11:32:29 -07:00
parent be964da4fa
commit fc779e1120
1 changed files with 55 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/addons/command-locate/src/main/java/com/dfsek/terra/addons/commands/locate/LocateCommandAddon.java
+47 -34
View File
@@ -21,14 +21,10 @@ import com.dfsek.terra.api.event.events.platform.CommandRegistrationEvent;
import com.dfsek.terra.api.event.functional.FunctionalEventHandler; import com.dfsek.terra.api.event.functional.FunctionalEventHandler;
import com.dfsek.terra.api.inject.annotations.Inject; import com.dfsek.terra.api.inject.annotations.Inject;
import com.dfsek.terra.api.registry.Registry; import com.dfsek.terra.api.registry.Registry;
import com.dfsek.terra.api.structure.Structure;
import com.dfsek.terra.api.util.generic.either.Either; import com.dfsek.terra.api.util.generic.either.Either;
import com.dfsek.terra.api.util.reflection.TypeKey; import com.dfsek.terra.api.util.reflection.TypeKey;
import com.dfsek.terra.api.world.World; import com.dfsek.terra.api.world.World;
import com.dfsek.terra.api.world.biome.Biome; import com.dfsek.terra.api.world.biome.Biome;
import com.dfsek.terra.api.world.info.WorldProperties;
import org.jetbrains.annotations.NotNull;
public class LocateCommandAddon implements AddonInitializer { public class LocateCommandAddon implements AddonInitializer {
@@ -62,58 +58,75 @@ public class LocateCommandAddon implements AddonInitializer {
.optional("step", IntegerParser.integerParser(1), DefaultValue.constant(16)) .optional("step", IntegerParser.integerParser(1), DefaultValue.constant(16))
// Flag: Toggle 3D search (e.g., --3d or -3) // Flag: Toggle 3D search (e.g., --3d or -3)
.flag(manager.flagBuilder("3d").withAliases("3").build()) .flag(manager.flagBuilder("3d").withAliases("3").build())
// Flag: Auto resolution mode (e.g., --auto or -a)
.flag(manager.flagBuilder("auto").withAliases("a").build())
.handler(context -> { .handler(context -> {
//Gather Context & Arguments // 1. Gather Context & Arguments
Biome targetBiome = context.get("biome"); Biome targetBiome = context.get("biome");
Entity sender = context.sender().getEntity().orElseThrow( Entity sender = context.sender().getEntity().orElseThrow(
() -> new Error("Only entities can run this command.")); () -> new Error("Only entities can run this command."));
World world = sender.world(); World world = sender.world();
// Fetch properties needed for the locator
int radius = context.get("radius"); int radius = context.get("radius");
int step = context.get("step");
boolean search3D = context.flags().hasFlag("3d"); boolean search3D = context.flags().hasFlag("3d");
boolean autoMode = context.flags().hasFlag("auto");
//Notify player that search has started (as it might take a moment) // 2. Determine Initial Step
context.sender().sendMessage("Searching for " + targetBiome.getID() + " within " + radius + " blocks..."); // If Auto: Start at radius / 2 (very coarse check).
// If Manual: Use provided step.
int currentStep = autoMode ? Integer.highestOneBit(radius - 1) : context.get("step");
//Execute Search // Notify player
Optional<Either<Vector3Int, Vector2Int>> result = BiomeLocator.search( String modeMsg = autoMode ? " (Auto Mode)" : " (Step: " + currentStep + ")";
context.sender().sendMessage(
"Searching for " + targetBiome.getID() + " within " + radius + " blocks" + modeMsg + "...");
Optional<Either<Vector3Int, Vector2Int>> result;
// 3. Execute Search Loop
while(true) {
result = BiomeLocator.search(
world.getBiomeProvider(), world.getBiomeProvider(),
world, world,
sender.position().getFloorX(), sender.position().getFloorX(),
sender.position().getFloorZ(), sender.position().getFloorZ(),
radius, radius,
step, currentStep,
found -> found.equals(targetBiome), // Predicate: Match exact biome instance found -> found.equals(targetBiome), // Match specific biome instance
search3D search3D
); );
//Handle Result // Exit Conditions:
// 1. Found a result
if(result.isPresent()) {
break;
}
// 2. Not in auto mode (only run once)
if(!autoMode) {
break;
}
// 3. We just ran a search at step 1 and failed (lowest resolution)
if(currentStep == 1) {
break;
}
// Reduce step for next iteration (Adaptive Search)
currentStep /= 2;
context.sender().sendMessage("No result found, refining search (Step: " + currentStep + ")...");
}
// 4. Handle Result
if(result.isPresent()) { if(result.isPresent()) {
Either<Vector3Int, Vector2Int> location = result.get(); Either<Vector3Int, Vector2Int> location = result.get();
String coords; String coords;
if(location.hasLeft()) { if(location.hasLeft()) { // 3D Result
// 3D Result Vector3Int vec = location.getLeft().get();
Optional<Vector3Int> vec = location.getLeft(); coords = String.format("%d, %d, %d", vec.getX(), vec.getY(), vec.getZ());
if (vec.isPresent()) { } else { // 2D Result
Vector3Int vecUnwrapped = vec.get(); Vector2Int vec = location.getRight().get();
coords = String.format("%d, %d, %d", vecUnwrapped.getX(), vecUnwrapped.getY(), vecUnwrapped.getZ()); coords = String.format("%d, ~, %d", vec.getX(), vec.getZ());
}
else {
context.sender().sendMessage("Could not find " + targetBiome.getID() + " within " + radius + " blocks.");
return;
}
} else {
// 2D Result
Optional<Vector2Int> vec = location.getRight();
if (vec.isPresent()) {
Vector2Int vecUnwrapped = vec.get();
coords = String.format("%d, %d", vecUnwrapped.getX(), vecUnwrapped.getZ());
} else {
context.sender().sendMessage("Could not find " + targetBiome.getID() + " within " + radius + " blocks.");
return;
}
} }
context.sender().sendMessage("Found " + targetBiome.getID() + " at [" + coords + "]"); context.sender().sendMessage("Found " + targetBiome.getID() + " at [" + coords + "]");