Some changes to portal frame locator code

This commit is contained in:
Frank 2022-06-08 17:37:23 +02:00
parent 1356a91e77
commit 2eed66008a
4 changed files with 73 additions and 23 deletions

View file

@ -3,10 +3,15 @@ package org.betterx.betterend.commands;
import net.minecraft.commands.CommandBuildContext;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.Commands;
import net.minecraft.core.BlockPos;
import net.minecraft.core.BlockPos.MutableBlockPos;
import net.minecraft.core.Holder;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.Vec3;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@ -14,9 +19,13 @@ import com.mojang.brigadier.Command;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.CommandContext;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import org.betterx.bclib.api.v2.poi.BCLPoiType;
import org.betterx.bclib.util.BlocksHelper;
import org.betterx.betterend.registry.EndPoiTypes;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
public class CommandRegistry {
public static void register() {
@ -26,14 +35,14 @@ public class CommandRegistry {
private static void register(CommandDispatcher<CommandSourceStack> dispatcher,
CommandBuildContext commandBuildContext,
Commands.CommandSelection commandSelection) {
// dispatcher.register(
// Commands.literal("be")
// .requires(source -> source.hasPermission(Commands.LEVEL_OWNERS))
// .then(Commands.literal("locate_portal")
// .requires(source -> source.hasPermission(Commands.LEVEL_OWNERS))
// .executes(ctx -> find_poi(ctx))
// )
// );
dispatcher.register(
Commands.literal("be")
.requires(source -> source.hasPermission(Commands.LEVEL_OWNERS))
.then(Commands.literal("locate_portal")
.requires(source -> source.hasPermission(Commands.LEVEL_OWNERS))
.executes(ctx -> find_poi(ctx, EndPoiTypes.ETERNAL_PORTAL_INACTIVE))
)
);
}
private static final Map<Holder<Biome>, BlockState> biomeMap = new HashMap<>();
@ -64,8 +73,21 @@ public class CommandRegistry {
};
private static int find_poi(CommandContext<CommandSourceStack> ctx) throws CommandSyntaxException {
private static int find_poi(CommandContext<CommandSourceStack> ctx, BCLPoiType poi) throws CommandSyntaxException {
final CommandSourceStack source = ctx.getSource();
final ServerPlayer player = source.getPlayerOrException();
Vec3 pos = source.getPosition();
final ServerLevel level = source.getLevel();
MutableBlockPos mPos = new BlockPos(pos).mutable();
System.out.println("Searching POI: " + poi.key);
Optional<BlockPos> found = poi.findPoiAround(level, mPos, false, level.getWorldBorder());
System.out.println("Found at: " + found.orElse(null));
if (found.isPresent()) {
BlocksHelper.setWithoutUpdate(level, found.get(), Blocks.YELLOW_CONCRETE);
BlocksHelper.setWithoutUpdate(level, mPos, Blocks.LIGHT_BLUE_CONCRETE);
} else {
BlocksHelper.setWithoutUpdate(level, mPos, Blocks.RED_CONCRETE);
}
return Command.SINGLE_SUCCESS;
}
}