Mineattack/Minions
4
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Mojang Mappings

Browse Source
This commit is contained in:
skippyall
2026-04-29 08:51:37 +02:00
parent cc9fedd63b
commit f5202a4264
140 changed files with 1646 additions and 1675 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minions Verbesserungsvorschläge.txt
+10
View File
@@ -0,0 +1,10 @@
Module ohne Instruction nicht bei Instruction Auswahl vorschlagen ✓
Mob Spawning durch Instruction an/aus
Referenz kopieren als Item, das beim linken verschwindet ✓
zurück-Button (Jain)
Instructions stoppen / einfrieren bei Entfernung des Moduls ✓
Verbindung mit Minion anzeigen ✓
Schlagen auf Entities fixen ✓
Signaländerung bei Trigger nach Tod des Minions mit Minion synchronisieren ✓
Menüführung für Argumente verbessern (Nö)
direkt Wert zeigen ✓
build.gradle
+2 -2
View File
@@ -1,5 +1,5 @@
plugins { plugins {
id 'net.fabricmc.fabric-loom-remap' version '1.14-SNAPSHOT' id 'net.fabricmc.fabric-loom-remap' version '1.16-SNAPSHOT'
id 'maven-publish' id 'maven-publish'
} }
@@ -50,7 +50,7 @@ repositories {
dependencies { dependencies {
// To change the versions see the gradle.properties file // To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}" minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// Fabric API. This is technically optional, but you probably want it anyway. // Fabric API. This is technically optional, but you probably want it anyway.
src/client/java/io/github/skippyall/minions/client/MinionsClient.java
+2 -2
View File
@@ -5,12 +5,12 @@ import io.github.skippyall.minions.polymer.VersionSync;
import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.registration.MinionBlocks;
import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
import net.minecraft.client.render.BlockRenderLayer; import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
public class MinionsClient implements ClientModInitializer { public class MinionsClient implements ClientModInitializer {
@Override @Override
public void onInitializeClient() { public void onInitializeClient() {
BlockRenderLayerMap.putBlock(MinionBlocks.MINION_TRIGGER_BLOCK, BlockRenderLayer.TRANSLUCENT); BlockRenderLayerMap.putBlock(MinionBlocks.MINION_TRIGGER_BLOCK, ChunkSectionLayer.TRANSLUCENT);
PolymerClientNetworking.registerCommonHandler(VersionSync.VersionSyncPayload.class, (client, handler, payload) -> {}); PolymerClientNetworking.registerCommonHandler(VersionSync.VersionSyncPayload.class, (client, handler, payload) -> {});
} }
src/main/java/io/github/skippyall/minions/Minions.java
+3 -3
View File
@@ -11,7 +11,7 @@ import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback; import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents; import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
import net.fabricmc.fabric.api.resource.ResourceManagerHelper; import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
import net.minecraft.resource.ResourceType; import net.minecraft.server.packs.PackType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -31,7 +31,7 @@ public class Minions implements ModInitializer {
ServerLifecycleEvents.SERVER_STARTED.register(server -> { ServerLifecycleEvents.SERVER_STARTED.register(server -> {
MinionPersistentState.get(server).getMinionData().forEach((uuid, data) -> { MinionPersistentState.get(server).getMinionData().forEach((uuid, data) -> {
if(data.isSpawned()) { if(data.isSpawned()) {
MinionFakePlayer.spawnMinion(data, server.getOverworld(), null, null, true); MinionFakePlayer.spawnMinion(data, server.overworld(), null, null, true);
} }
}); });
}); });
@@ -40,6 +40,6 @@ public class Minions implements ModInitializer {
PolymerResourcePackUtils.addModAssets(Minions.MOD_ID); PolymerResourcePackUtils.addModAssets(Minions.MOD_ID);
ResourceManagerHelper.get(ResourceType.SERVER_DATA).registerReloadListener(new DocsManager()); ResourceManagerHelper.get(PackType.SERVER_DATA).registerReloadListener(new DocsManager());
} }
} }
src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java
+12 -12
View File
@@ -1,24 +1,24 @@
package io.github.skippyall.minions.block.input; package io.github.skippyall.minions.block.input;
import io.github.skippyall.minions.clipboard.ClipboardItem; import io.github.skippyall.minions.clipboard.ClipboardItem;
import net.minecraft.block.Block; import net.minecraft.core.BlockPos;
import net.minecraft.block.BlockState; import net.minecraft.world.InteractionResult;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.entity.player.Player;
import net.minecraft.util.ActionResult; import net.minecraft.world.level.Level;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.level.block.Block;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.World; import net.minecraft.world.phys.BlockHitResult;
public class AnalogInputBlock extends Block { public class AnalogInputBlock extends Block {
public AnalogInputBlock(Settings settings) { public AnalogInputBlock(Properties settings) {
super(settings); super(settings);
} }
@Override @Override
protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
if(!world.isClient) { if(!world.isClientSide) {
player.getInventory().offer(ClipboardItem.createBlockPosReference(world, pos), true); player.getInventory().placeItemBackInInventory(ClipboardItem.createBlockPosReference(world, pos), true);
} }
return ActionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
} }
src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlock.java
+29 -29
View File
@@ -5,59 +5,59 @@ import io.github.skippyall.minions.clipboard.InstructionClipboard;
import io.github.skippyall.minions.minion.MinionPersistentState; import io.github.skippyall.minions.minion.MinionPersistentState;
import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.registration.MinionBlocks;
import io.github.skippyall.minions.registration.MinionComponentTypes; import io.github.skippyall.minions.registration.MinionComponentTypes;
import net.minecraft.block.Block; import net.minecraft.core.BlockPos;
import net.minecraft.block.BlockEntityProvider; import net.minecraft.network.chat.Component;
import net.minecraft.block.BlockState; import net.minecraft.server.level.ServerLevel;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.sounds.SoundEvents;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.sounds.SoundSource;
import net.minecraft.item.ItemStack; import net.minecraft.world.InteractionHand;
import net.minecraft.server.world.ServerWorld; import net.minecraft.world.InteractionResult;
import net.minecraft.sound.SoundCategory; import net.minecraft.world.entity.player.Player;
import net.minecraft.sound.SoundEvents; import net.minecraft.world.item.ItemStack;
import net.minecraft.text.Text; import net.minecraft.world.level.Level;
import net.minecraft.util.ActionResult; import net.minecraft.world.level.block.Block;
import net.minecraft.util.Hand; import net.minecraft.world.level.block.EntityBlock;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.World; import net.minecraft.world.phys.BlockHitResult;
public abstract class InstructionBoundBlock extends Block implements BlockEntityProvider { public abstract class InstructionBoundBlock extends Block implements EntityBlock {
public InstructionBoundBlock(Settings settings) { public InstructionBoundBlock(Properties settings) {
super(settings); super(settings);
} }
protected abstract BlockEntityType<? extends InstructionBoundBlockEntity<?>> getBlockEntityType(); protected abstract BlockEntityType<? extends InstructionBoundBlockEntity<?>> getBlockEntityType();
@Override @Override
protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { protected InteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
if(stack.get(MinionComponentTypes.REFERENCE) instanceof InstructionClipboard instruction) { if(stack.get(MinionComponentTypes.REFERENCE) instanceof InstructionClipboard instruction) {
world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> { world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> {
be.setInstruction(instruction.selectedMinion(), instruction.selectedInstruction()); be.setInstruction(instruction.selectedMinion(), instruction.selectedInstruction());
player.playSoundToPlayer(SoundEvents.BLOCK_NOTE_BLOCK_CHIME.value(), SoundCategory.BLOCKS, 1, 1); player.playNotifySound(SoundEvents.NOTE_BLOCK_CHIME.value(), SoundSource.BLOCKS, 1, 1);
stack.decrement(1); stack.shrink(1);
}); });
return ActionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
return super.onUseWithItem(stack, state, world, pos, player, hand, hit); return super.useItemOn(stack, state, world, pos, player, hand, hit);
} }
@Override @Override
protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) { protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
if(world.isClient()) { if(world.isClientSide()) {
return ActionResult.CONSUME; return InteractionResult.CONSUME;
} }
world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> { world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> {
String name = MinionPersistentState.get(world.getServer()).getMinionData(be.getMinionUuid()).name(); String name = MinionPersistentState.get(world.getServer()).getMinionData(be.getMinionUuid()).name();
player.sendMessage(Text.translatable("minions.reference.instruction.tooltip", name, be.getInstructionName()), true); player.displayClientMessage(Component.translatable("minions.reference.instruction.tooltip", name, be.getInstructionName()), true);
}); });
return ActionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
@Override @Override
protected void onStateReplaced(BlockState state, ServerWorld world, BlockPos pos, boolean moved) { protected void affectNeighborsAfterRemoval(BlockState state, ServerLevel world, BlockPos pos, boolean moved) {
super.onStateReplaced(state, world, pos, moved); super.affectNeighborsAfterRemoval(state, world, pos, moved);
world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).ifPresent(MinionTriggerBlockEntity::removeListener); world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).ifPresent(MinionTriggerBlockEntity::removeListener);
} }
} }
src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java
+10 -11
View File
@@ -4,14 +4,13 @@ import io.github.skippyall.minions.listener.BlockEntityMinionListener;
import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import net.minecraft.block.BlockState;
import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.math.BlockPos;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockState;
public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionListener<?>> extends BlockEntity { public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionListener<?>> extends BlockEntity {
protected UUID minionUuid; protected UUID minionUuid;
@@ -26,14 +25,14 @@ public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionLis
protected abstract Class<L> getListenerClass(); protected abstract Class<L> getListenerClass();
public void removeListener() { public void removeListener() {
if(world instanceof ServerWorld serverWorld) { if(level instanceof ServerLevel serverWorld) {
L listener = getListener(); L listener = getListener();
listener.remove(serverWorld.getServer()); listener.remove(serverWorld.getServer());
} }
} }
public void addListener() { public void addListener() {
if(world instanceof ServerWorld serverWorld) { if(level instanceof ServerLevel serverWorld) {
L listener = createListener(); L listener = createListener();
listener.add(serverWorld.getServer()); listener.add(serverWorld.getServer());
} }
@@ -44,11 +43,11 @@ public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionLis
this.minionUuid = minionUuid; this.minionUuid = minionUuid;
this.instructionName = instructionName; this.instructionName = instructionName;
addListener(); addListener();
markDirty(); setChanged();
} }
public Optional<MinionFakePlayer> getMinion() { public Optional<MinionFakePlayer> getMinion() {
if(minionUuid != null && world != null && world.getPlayerByUuid(minionUuid) instanceof MinionFakePlayer minion) { if(minionUuid != null && level != null && level.getPlayerByUUID(minionUuid) instanceof MinionFakePlayer minion) {
return Optional.of(minion); return Optional.of(minion);
} }
return Optional.empty(); return Optional.empty();
@@ -71,6 +70,6 @@ public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionLis
} }
public L getListener() { public L getListener() {
return BlockEntityMinionListener.getListener(world, pos, minionUuid, getListenerClass()); return BlockEntityMinionListener.getListener(level, worldPosition, minionUuid, getListenerClass());
} }
} }
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java
+49 -49
View File
@@ -12,91 +12,91 @@ import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlock; import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlock;
import io.github.skippyall.minions.polymer.VersionSync; import io.github.skippyall.minions.polymer.VersionSync;
import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.registration.MinionBlocks;
import net.minecraft.block.AbstractRedstoneGateBlock; import net.minecraft.core.BlockPos;
import net.minecraft.block.Block; import net.minecraft.core.Direction;
import net.minecraft.block.BlockState; import net.minecraft.core.component.DataComponents;
import net.minecraft.block.ShapeContext; import net.minecraft.resources.ResourceLocation;
import net.minecraft.block.SideShapeType; import net.minecraft.server.level.ServerLevel;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.component.DataComponentTypes; import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.item.ItemDisplayContext; import net.minecraft.world.item.ItemStack;
import net.minecraft.item.ItemStack; import net.minecraft.world.item.Items;
import net.minecraft.item.Items; import net.minecraft.world.level.BlockGetter;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.world.level.Level;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.level.LevelReader;
import net.minecraft.server.world.ServerWorld; import net.minecraft.world.level.block.Block;
import net.minecraft.state.StateManager; import net.minecraft.world.level.block.DiodeBlock;
import net.minecraft.state.property.BooleanProperty; import net.minecraft.world.level.block.SupportType;
import net.minecraft.util.Identifier; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.util.math.Direction; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.BlockView; import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.World; import net.minecraft.world.level.redstone.Orientation;
import net.minecraft.world.WorldView; import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.block.WireOrientation; import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext; import xyz.nucleoid.packettweaker.PacketContext;
public class MinionTriggerBlock extends InstructionBoundBlock implements PolymerBlock, PolymerKeepModel, PolymerClientDecoded, BlockWithElementHolder { public class MinionTriggerBlock extends InstructionBoundBlock implements PolymerBlock, PolymerKeepModel, PolymerClientDecoded, BlockWithElementHolder {
public static final MapCodec<MinionTriggerBlock> CODEC = createCodec(MinionTriggerBlock::new); public static final MapCodec<MinionTriggerBlock> CODEC = simpleCodec(MinionTriggerBlock::new);
public static final BooleanProperty POWERED = BooleanProperty.of("powered"); public static final BooleanProperty POWERED = BooleanProperty.create("powered");
public static final VoxelShape SHAPE = Block.createColumnShape(16.0, 0.0, 2.0); public static final VoxelShape SHAPE = Block.column(16.0, 0.0, 2.0);
public MinionTriggerBlock(Settings settings) { public MinionTriggerBlock(Properties settings) {
super(settings); super(settings);
setDefaultState(getDefaultState().with(POWERED, false)); registerDefaultState(defaultBlockState().setValue(POWERED, false));
} }
@Override @Override
protected VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { protected VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
return SHAPE; return SHAPE;
} }
@Override @Override
protected boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { protected boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) {
BlockPos blockPos = pos.down(); BlockPos blockPos = pos.below();
return this.canPlaceAbove(world, blockPos, world.getBlockState(blockPos)); return this.canPlaceAbove(world, blockPos, world.getBlockState(blockPos));
} }
protected boolean canPlaceAbove(WorldView world, BlockPos pos, BlockState state) { protected boolean canPlaceAbove(LevelReader world, BlockPos pos, BlockState state) {
return state.isSideSolid(world, pos, Direction.UP, SideShapeType.RIGID); return state.isFaceSturdy(world, pos, Direction.UP, SupportType.RIGID);
} }
@Override @Override
protected void appendProperties(StateManager.Builder<Block, BlockState> builder) { protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
builder.add(POWERED); builder.add(POWERED);
} }
@Override @Override
protected void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, @Nullable WireOrientation wireOrientation, boolean notify) { protected void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, @Nullable Orientation wireOrientation, boolean notify) {
if(!canPlaceAt(state, world, pos)) { if(!canSurvive(state, world, pos)) {
dropStacks(state, world, pos); dropResources(state, world, pos);
world.removeBlock(pos, false); world.removeBlock(pos, false);
return; return;
} }
boolean newPower = world.isReceivingRedstonePower(pos); boolean newPower = world.hasNeighborSignal(pos);
if(state.get(POWERED) != newPower) { if(state.getValue(POWERED) != newPower) {
world.setBlockState(pos, state.with(POWERED, newPower)); world.setBlockAndUpdate(pos, state.setValue(POWERED, newPower));
world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).ifPresent(MinionTriggerBlockEntity::updatePower); world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).ifPresent(MinionTriggerBlockEntity::updatePower);
} }
} }
@Override @Override
protected boolean hasComparatorOutput(BlockState state) { protected boolean hasAnalogOutputSignal(BlockState state) {
return true; return true;
} }
@Override @Override
protected int getComparatorOutput(BlockState state, World world, BlockPos pos) { protected int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
return world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).map(MinionTriggerBlockEntity::getComparatorOutput).orElse(0); return world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).map(MinionTriggerBlockEntity::getComparatorOutput).orElse(0);
} }
@Override @Override
public @Nullable BlockEntity createBlockEntity(BlockPos pos, BlockState state) { public @Nullable BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
return new MinionTriggerBlockEntity(pos, state); return new MinionTriggerBlockEntity(pos, state);
} }
@@ -107,19 +107,19 @@ public class MinionTriggerBlock extends InstructionBoundBlock implements Polymer
@Override @Override
public BlockState getPolymerBlockState(BlockState state, PacketContext context) { public BlockState getPolymerBlockState(BlockState state, PacketContext context) {
return VersionSync.isOnClient(context) ? state : net.minecraft.block.Blocks.COMPARATOR.getDefaultState().with(AbstractRedstoneGateBlock.POWERED, state.get(POWERED)); return VersionSync.isOnClient(context) ? state : net.minecraft.world.level.block.Blocks.COMPARATOR.defaultBlockState().setValue(DiodeBlock.POWERED, state.getValue(POWERED));
} }
@Override @Override
public boolean handleMiningOnServer(ItemStack tool, BlockState state, BlockPos pos, ServerPlayerEntity player) { public boolean handleMiningOnServer(ItemStack tool, BlockState state, BlockPos pos, ServerPlayer player) {
return false; return false;
} }
@Override @Override
public @Nullable ElementHolder createElementHolder(ServerWorld world, BlockPos pos, BlockState initialBlockState) { public @Nullable ElementHolder createElementHolder(ServerLevel world, BlockPos pos, BlockState initialBlockState) {
ElementHolder holder = new ElementHolder() { ElementHolder holder = new ElementHolder() {
@Override @Override
public boolean startWatching(ServerPlayNetworkHandler player) { public boolean startWatching(ServerGamePacketListenerImpl player) {
if(PolymerResourcePackUtils.hasMainPack(player) && !VersionSync.isOnClient(player)) { if(PolymerResourcePackUtils.hasMainPack(player) && !VersionSync.isOnClient(player)) {
return super.startWatching(player); return super.startWatching(player);
} else { } else {
@@ -128,7 +128,7 @@ public class MinionTriggerBlock extends InstructionBoundBlock implements Polymer
} }
}; };
ItemStack stack = new ItemStack(Items.BARRIER); ItemStack stack = new ItemStack(Items.BARRIER);
stack.set(DataComponentTypes.ITEM_MODEL, Identifier.of(Minions.MOD_ID, "minion_trigger_no_plate_" + (initialBlockState.get(MinionTriggerBlock.POWERED) ? "active" : "inactive"))); stack.set(DataComponents.ITEM_MODEL, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger_no_plate_" + (initialBlockState.getValue(MinionTriggerBlock.POWERED) ? "active" : "inactive")));
ItemDisplayElement element = new ItemDisplayElement(stack); ItemDisplayElement element = new ItemDisplayElement(stack);
element.setItemDisplayContext(ItemDisplayContext.NONE); element.setItemDisplayContext(ItemDisplayContext.NONE);
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockEntity.java
+12 -12
View File
@@ -2,11 +2,11 @@ package io.github.skippyall.minions.block.miniontrigger;
import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlockEntity; import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlockEntity;
import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.registration.MinionBlocks;
import net.minecraft.block.BlockState; import net.minecraft.core.BlockPos;
import net.minecraft.storage.ReadView; import net.minecraft.core.UUIDUtil;
import net.minecraft.storage.WriteView; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.util.Uuids; import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.storage.ValueOutput;
public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity<MinionTriggerMinionListener> { public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity<MinionTriggerMinionListener> {
public MinionTriggerBlockEntity(BlockPos pos, BlockState state) { public MinionTriggerBlockEntity(BlockPos pos, BlockState state) {
@@ -15,7 +15,7 @@ public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity<Minion
@Override @Override
protected MinionTriggerMinionListener createListener() { protected MinionTriggerMinionListener createListener() {
return new MinionTriggerMinionListener(world.getRegistryKey(), pos, minionUuid, instructionName); return new MinionTriggerMinionListener(level.dimension(), worldPosition, minionUuid, instructionName);
} }
@Override @Override
@@ -24,7 +24,7 @@ public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity<Minion
} }
public void updatePower() { public void updatePower() {
boolean powered = getCachedState().get(MinionTriggerBlock.POWERED); boolean powered = getBlockState().getValue(MinionTriggerBlock.POWERED);
MinionTriggerMinionListener listener = getListener(); MinionTriggerMinionListener listener = getListener();
if(listener != null) { if(listener != null) {
@@ -51,15 +51,15 @@ public class MinionTriggerBlockEntity extends InstructionBoundBlockEntity<Minion
} }
@Override @Override
protected void readData(ReadView view) { protected void loadAdditional(ValueInput view) {
minionUuid = view.read("minionUuid", Uuids.CODEC).orElse(null); minionUuid = view.read("minionUuid", UUIDUtil.AUTHLIB_CODEC).orElse(null);
instructionName = view.getString("instructionName", ""); instructionName = view.getStringOr("instructionName", "");
} }
@Override @Override
protected void writeData(WriteView view) { protected void saveAdditional(ValueOutput view) {
if(minionUuid != null) { if(minionUuid != null) {
view.put("minionUuid", Uuids.CODEC, minionUuid); view.store("minionUuid", UUIDUtil.AUTHLIB_CODEC, minionUuid);
} }
view.putString("instructionName", instructionName); view.putString("instructionName", instructionName);
} }
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockItem.java
+6 -6
View File
@@ -2,20 +2,20 @@ package io.github.skippyall.minions.block.miniontrigger;
import eu.pb4.polymer.core.api.item.PolymerBlockItem; import eu.pb4.polymer.core.api.item.PolymerBlockItem;
import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils; import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils;
import net.minecraft.block.Block; import net.minecraft.resources.ResourceLocation;
import net.minecraft.item.Item; import net.minecraft.world.item.Item;
import net.minecraft.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext; import xyz.nucleoid.packettweaker.PacketContext;
public class MinionTriggerBlockItem extends PolymerBlockItem { public class MinionTriggerBlockItem extends PolymerBlockItem {
public MinionTriggerBlockItem(Block block, Settings settings, Item polymerItem) { public MinionTriggerBlockItem(Block block, Properties settings, Item polymerItem) {
super(block, settings, polymerItem, true); super(block, settings, polymerItem, true);
} }
@Override @Override
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context) { public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
if(PolymerResourcePackUtils.hasMainPack(context)) { if(PolymerResourcePackUtils.hasMainPack(context)) {
return super.getPolymerItemModel(stack, context); return super.getPolymerItemModel(stack, context);
} else { } else {
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java
+13 -14
View File
@@ -9,13 +9,12 @@ import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener;
import io.github.skippyall.minions.registration.MinionBlocks; import io.github.skippyall.minions.registration.MinionBlocks;
import net.minecraft.registry.RegistryKey; import net.minecraft.core.BlockPos;
import net.minecraft.core.UUIDUtil;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Identifier; import net.minecraft.world.level.Level;
import net.minecraft.util.Uuids;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@@ -24,9 +23,9 @@ import java.util.UUID;
public class MinionTriggerMinionListener extends BlockEntityMinionInstructionListener<MinionTriggerBlockEntity> { public class MinionTriggerMinionListener extends BlockEntityMinionInstructionListener<MinionTriggerBlockEntity> {
public static final Codec<MinionTriggerMinionListener> CODEC = RecordCodecBuilder.create(instance -> public static final Codec<MinionTriggerMinionListener> CODEC = RecordCodecBuilder.create(instance ->
instance.group( instance.group(
World.CODEC.fieldOf("world").forGetter(listener -> listener.worldKey), Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(listener -> listener.worldKey),
BlockPos.CODEC.fieldOf("pos").forGetter(listener -> listener.pos), BlockPos.CODEC.fieldOf("pos").forGetter(listener -> listener.pos),
Uuids.CODEC.fieldOf("minionUuid").forGetter(listener -> listener.minionUuid), UUIDUtil.AUTHLIB_CODEC.fieldOf("minionUuid").forGetter(listener -> listener.minionUuid),
Codec.STRING.fieldOf("instructionName").forGetter(listener -> listener.instructionName) Codec.STRING.fieldOf("instructionName").forGetter(listener -> listener.instructionName)
).apply(instance, MinionTriggerMinionListener::new)); ).apply(instance, MinionTriggerMinionListener::new));
@@ -36,7 +35,7 @@ public class MinionTriggerMinionListener extends BlockEntityMinionInstructionLis
boolean runningCache; boolean runningCache;
boolean incomingPowerCache; boolean incomingPowerCache;
MinionTriggerMinionListener(RegistryKey<World> worldKey, BlockPos pos, UUID minionUuid, String instructionName) { MinionTriggerMinionListener(ResourceKey<Level> worldKey, BlockPos pos, UUID minionUuid, String instructionName) {
super(worldKey, pos, minionUuid, MinionBlocks.MINION_TRIGGER_BE_TYPE); super(worldKey, pos, minionUuid, MinionBlocks.MINION_TRIGGER_BE_TYPE);
this.instructionName = Objects.requireNonNull(instructionName); this.instructionName = Objects.requireNonNull(instructionName);
} }
@@ -83,14 +82,14 @@ public class MinionTriggerMinionListener extends BlockEntityMinionInstructionLis
} }
@Override @Override
public Optional<Identifier> getCodecId() { public Optional<ResourceLocation> getCodecId() {
return Optional.of(Identifier.of(Minions.MOD_ID, "minion_trigger")); return Optional.of(ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger"));
} }
public void updateComparatorsIfLoaded(MinecraftServer server) { public void updateComparatorsIfLoaded(MinecraftServer server) {
World world = server.getWorld(worldKey); Level world = server.getLevel(worldKey);
if(world.isPosLoaded(pos)) { if(world.isLoaded(pos)) {
world.updateComparators(pos, MinionBlocks.MINION_TRIGGER_BLOCK); world.updateNeighbourForOutputSignal(pos, MinionBlocks.MINION_TRIGGER_BLOCK);
} }
} }
src/main/java/io/github/skippyall/minions/clipboard/BlockPosClipboard.java
+11 -12
View File
@@ -2,20 +2,19 @@ package io.github.skippyall.minions.clipboard;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.component.ComponentsAccess;
import net.minecraft.item.Item;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.registry.RegistryKey;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import java.util.function.Consumer; import java.util.function.Consumer;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponentGetter;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
public record BlockPosClipboard(RegistryKey<World> world, BlockPos pos) implements Clipboard { public record BlockPosClipboard(ResourceKey<Level> world, BlockPos pos) implements Clipboard {
public static final MapCodec<BlockPosClipboard> CODEC = RecordCodecBuilder.mapCodec(instance -> public static final MapCodec<BlockPosClipboard> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group( instance.group(
World.CODEC.fieldOf("world").forGetter(BlockPosClipboard::world), Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(BlockPosClipboard::world),
BlockPos.CODEC.fieldOf("pos").forGetter(BlockPosClipboard::pos) BlockPos.CODEC.fieldOf("pos").forGetter(BlockPosClipboard::pos)
).apply(instance, BlockPosClipboard::new) ).apply(instance, BlockPosClipboard::new)
); );
@@ -27,7 +26,7 @@ public record BlockPosClipboard(RegistryKey<World> world, BlockPos pos) implemen
} }
@Override @Override
public void appendTooltip(Item.TooltipContext context, Consumer<Text> textConsumer, TooltipType type, ComponentsAccess components) { public void addToTooltip(Item.TooltipContext context, Consumer<Component> textConsumer, TooltipFlag type, DataComponentGetter components) {
textConsumer.accept(Text.translatable("minions.reference.block.tooltip", pos.toString())); textConsumer.accept(Component.translatable("minions.reference.block.tooltip", pos.toString()));
} }
} }
src/main/java/io/github/skippyall/minions/clipboard/Clipboard.java
+3 -4
View File
@@ -3,12 +3,11 @@ package io.github.skippyall.minions.clipboard;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.item.tooltip.TooltipAppender;
import java.util.function.Function; import java.util.function.Function;
import net.minecraft.world.item.component.TooltipProvider;
public interface Clipboard extends TooltipAppender { public interface Clipboard extends TooltipProvider {
Codec<Clipboard> CODEC = MinionRegistries.CLIPBOARD_TYPES.getCodec().dispatch(Clipboard::getCodec, Function.identity()); Codec<Clipboard> CODEC = MinionRegistries.CLIPBOARD_TYPES.byNameCodec().dispatch(Clipboard::getCodec, Function.identity());
MapCodec<? extends Clipboard> getCodec(); MapCodec<? extends Clipboard> getCodec();
} }
src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java
+15 -15
View File
@@ -4,19 +4,19 @@ import eu.pb4.polymer.core.api.item.PolymerItem;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionComponentTypes; import io.github.skippyall.minions.registration.MinionComponentTypes;
import io.github.skippyall.minions.registration.MinionItems; import io.github.skippyall.minions.registration.MinionItems;
import net.minecraft.component.DataComponentTypes; import net.minecraft.core.BlockPos;
import net.minecraft.item.Item; import net.minecraft.core.component.DataComponents;
import net.minecraft.item.ItemStack; import net.minecraft.resources.ResourceLocation;
import net.minecraft.item.Items; import net.minecraft.world.item.Item;
import net.minecraft.item.tooltip.TooltipType; import net.minecraft.world.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.world.item.Items;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.World; import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext; import xyz.nucleoid.packettweaker.PacketContext;
public class ClipboardItem extends Item implements PolymerItem { public class ClipboardItem extends Item implements PolymerItem {
public ClipboardItem(Settings settings) { public ClipboardItem(Properties settings) {
super(settings); super(settings);
} }
@@ -26,26 +26,26 @@ public class ClipboardItem extends Item implements PolymerItem {
} }
@Override @Override
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context) { public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
return null; return null;
} }
@Override @Override
public ItemStack getPolymerItemStack(ItemStack itemStack, TooltipType tooltipType, PacketContext context) { public ItemStack getPolymerItemStack(ItemStack itemStack, TooltipFlag tooltipType, PacketContext context) {
ItemStack stack = PolymerItem.super.getPolymerItemStack(itemStack, tooltipType, context); ItemStack stack = PolymerItem.super.getPolymerItemStack(itemStack, tooltipType, context);
stack.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true); stack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true);
return stack; return stack;
} }
public static ItemStack createInstructionReference(MinionFakePlayer minion, String instructionName) { public static ItemStack createInstructionReference(MinionFakePlayer minion, String instructionName) {
ItemStack stack = new ItemStack(MinionItems.REFERENCE_ITEM); ItemStack stack = new ItemStack(MinionItems.REFERENCE_ITEM);
stack.set(MinionComponentTypes.REFERENCE, new InstructionClipboard(minion.getUuid(), instructionName, minion.getGameProfile().getName())); stack.set(MinionComponentTypes.REFERENCE, new InstructionClipboard(minion.getUUID(), instructionName, minion.getGameProfile().getName()));
return stack; return stack;
} }
public static ItemStack createBlockPosReference(World world, BlockPos pos) { public static ItemStack createBlockPosReference(Level world, BlockPos pos) {
ItemStack stack = new ItemStack(MinionItems.REFERENCE_ITEM); ItemStack stack = new ItemStack(MinionItems.REFERENCE_ITEM);
stack.set(MinionComponentTypes.REFERENCE, new BlockPosClipboard(world.getRegistryKey(), pos)); stack.set(MinionComponentTypes.REFERENCE, new BlockPosClipboard(world.dimension(), pos));
return stack; return stack;
} }
} }
src/main/java/io/github/skippyall/minions/clipboard/InstructionClipboard.java
+8 -9
View File
@@ -3,19 +3,18 @@ package io.github.skippyall.minions.clipboard;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.component.ComponentsAccess;
import net.minecraft.item.Item;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.text.Text;
import net.minecraft.util.Uuids;
import java.util.UUID; import java.util.UUID;
import java.util.function.Consumer; import java.util.function.Consumer;
import net.minecraft.core.UUIDUtil;
import net.minecraft.core.component.DataComponentGetter;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.TooltipFlag;
public record InstructionClipboard(UUID selectedMinion, String selectedInstruction, String visualMinionName) implements Clipboard { public record InstructionClipboard(UUID selectedMinion, String selectedInstruction, String visualMinionName) implements Clipboard {
public static final MapCodec<InstructionClipboard> CODEC = RecordCodecBuilder.mapCodec(instance -> public static final MapCodec<InstructionClipboard> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group( instance.group(
Uuids.CODEC.fieldOf("selectedMinion").forGetter(InstructionClipboard::selectedMinion), UUIDUtil.AUTHLIB_CODEC.fieldOf("selectedMinion").forGetter(InstructionClipboard::selectedMinion),
Codec.STRING.fieldOf("selectedInstruction").forGetter(InstructionClipboard::selectedInstruction), Codec.STRING.fieldOf("selectedInstruction").forGetter(InstructionClipboard::selectedInstruction),
Codec.STRING.fieldOf("visualMinionName").forGetter(InstructionClipboard::visualMinionName) Codec.STRING.fieldOf("visualMinionName").forGetter(InstructionClipboard::visualMinionName)
).apply(instance, InstructionClipboard::new)); ).apply(instance, InstructionClipboard::new));
@@ -26,7 +25,7 @@ public record InstructionClipboard(UUID selectedMinion, String selectedInstructi
} }
@Override @Override
public void appendTooltip(Item.TooltipContext context, Consumer<Text> textConsumer, TooltipType type, ComponentsAccess components) { public void addToTooltip(Item.TooltipContext context, Consumer<Component> textConsumer, TooltipFlag type, DataComponentGetter components) {
textConsumer.accept(Text.translatable("minions.reference.instruction.tooltip", selectedInstruction, visualMinionName)); textConsumer.accept(Component.translatable("minions.reference.instruction.tooltip", selectedInstruction, visualMinionName));
} }
} }
src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java
+11 -12
View File
@@ -6,31 +6,30 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.suggestion.Suggestions; import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder; import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import io.github.skippyall.minions.docs.DocsManager; import io.github.skippyall.minions.docs.DocsManager;
import net.minecraft.command.argument.IdentifierArgumentType;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.util.Identifier;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.arguments.ResourceLocationArgument;
import net.minecraft.resources.ResourceLocation;
import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.commands.Commands.argument;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.commands.Commands.literal;
public class DocsSubcommand { public class DocsSubcommand {
public static final LiteralArgumentBuilder<ServerCommandSource> DOCS = literal("docs") public static final LiteralArgumentBuilder<CommandSourceStack> DOCS = literal("docs")
.then( .then(
argument("docName", IdentifierArgumentType.identifier()) argument("docName", ResourceLocationArgument.id())
.suggests(DocsSubcommand::getSuggestions) .suggests(DocsSubcommand::getSuggestions)
.executes(DocsSubcommand::execute) .executes(DocsSubcommand::execute)
); );
public static CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) { public static CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) {
DocsManager.getDocsEntryIds().forEach(id -> builder.suggest(id.toString())); DocsManager.getDocsEntryIds().forEach(id -> builder.suggest(id.toString()));
return CompletableFuture.completedFuture(builder.build()); return CompletableFuture.completedFuture(builder.build());
} }
public static int execute(CommandContext<ServerCommandSource> context) throws CommandSyntaxException { public static int execute(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
Identifier id = IdentifierArgumentType.getIdentifier(context, "docName"); ResourceLocation id = ResourceLocationArgument.getId(context, "docName");
DocsManager.showDocsEntry(context.getSource().getPlayerOrThrow(), id); DocsManager.showDocsEntry(context.getSource().getPlayerOrException(), id);
return 1; return 1;
} }
} }
src/main/java/io/github/skippyall/minions/command/ListSubcommand.java
+6 -7
View File
@@ -4,21 +4,20 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContext;
import io.github.skippyall.minions.minion.MinionData; import io.github.skippyall.minions.minion.MinionData;
import io.github.skippyall.minions.minion.MinionPersistentState; import io.github.skippyall.minions.minion.MinionPersistentState;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text;
import java.util.Collection; import java.util.Collection;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.chat.Component;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.commands.Commands.literal;
public class ListSubcommand { public class ListSubcommand {
public static final LiteralArgumentBuilder<ServerCommandSource> LIST = literal("list") public static final LiteralArgumentBuilder<CommandSourceStack> LIST = literal("list")
.executes(ListSubcommand::list); .executes(ListSubcommand::list);
public static int list(CommandContext<ServerCommandSource> context) { public static int list(CommandContext<CommandSourceStack> context) {
Collection<MinionData> minions = MinionPersistentState.get(context.getSource().getServer()).getMinionData().values(); Collection<MinionData> minions = MinionPersistentState.get(context.getSource().getServer()).getMinionData().values();
for (MinionData minion : minions) { for (MinionData minion : minions) {
context.getSource().sendFeedback(() -> Text.literal(minion.name() + "(" + minion.uuid() + "):" + minion.isSpawned()), false); context.getSource().sendSuccess(() -> Component.literal(minion.name() + "(" + minion.uuid() + "):" + minion.isSpawned()), false);
} }
return 0; return 0;
} }
src/main/java/io/github/skippyall/minions/command/MinionArgument.java
+5 -6
View File
@@ -9,16 +9,15 @@ import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import io.github.skippyall.minions.minion.MinionData; import io.github.skippyall.minions.minion.MinionData;
import io.github.skippyall.minions.minion.MinionPersistentState; import io.github.skippyall.minions.minion.MinionPersistentState;
import io.github.skippyall.minions.minion.MinionProfileUtils; import io.github.skippyall.minions.minion.MinionProfileUtils;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
public class MinionArgument { public class MinionArgument {
public static final SimpleCommandExceptionType MINION_NOT_PRESENT = new SimpleCommandExceptionType(Text.translatable("minions.command.minion.not_present")); public static final SimpleCommandExceptionType MINION_NOT_PRESENT = new SimpleCommandExceptionType(Component.translatable("minions.command.minion.not_present"));
public static final MinionSuggestionProvider SUGGESTION_PROVIDER = new MinionSuggestionProvider(); public static final MinionSuggestionProvider SUGGESTION_PROVIDER = new MinionSuggestionProvider();
@@ -38,9 +37,9 @@ public class MinionArgument {
return data.get(); return data.get();
} }
public static class MinionSuggestionProvider implements SuggestionProvider<ServerCommandSource> { public static class MinionSuggestionProvider implements SuggestionProvider<CommandSourceStack> {
@Override @Override
public CompletableFuture<Suggestions> getSuggestions(CommandContext<ServerCommandSource> context, SuggestionsBuilder builder) throws CommandSyntaxException { public CompletableFuture<Suggestions> getSuggestions(CommandContext<CommandSourceStack> context, SuggestionsBuilder builder) throws CommandSyntaxException {
for (MinionData data : MinionPersistentState.get(context.getSource().getServer()).getMinionDataList()) { for (MinionData data : MinionPersistentState.get(context.getSource().getServer()).getMinionDataList()) {
builder.suggest(data.name()); builder.suggest(data.name());
} }
src/main/java/io/github/skippyall/minions/command/MinionsCommand.java
+6 -6
View File
@@ -3,15 +3,15 @@ package io.github.skippyall.minions.command;
import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import io.github.skippyall.minions.MinionsConfig; import io.github.skippyall.minions.MinionsConfig;
import net.minecraft.command.CommandRegistryAccess; import net.minecraft.commands.CommandBuildContext;
import net.minecraft.server.command.CommandManager; import net.minecraft.commands.CommandSourceStack;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.commands.Commands;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.commands.Commands.literal;
public class MinionsCommand { public class MinionsCommand {
public static void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandRegistryAccess access, CommandManager.RegistrationEnvironment environment) { public static void register(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext access, Commands.CommandSelection environment) {
LiteralArgumentBuilder<ServerCommandSource> builder = literal("minions") LiteralArgumentBuilder<CommandSourceStack> builder = literal("minions")
.then(SpawnSubcommand.SPAWN) .then(SpawnSubcommand.SPAWN)
.then(ListSubcommand.LIST) .then(ListSubcommand.LIST)
.then(DocsSubcommand.DOCS) .then(DocsSubcommand.DOCS)
src/main/java/io/github/skippyall/minions/command/MobCapDebugSubcommand.java
+9 -9
View File
@@ -4,21 +4,21 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContext;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor; import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor; import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
import io.github.skippyall.minions.mixins.antimobcap.ServerChunkManagerAccessor; import io.github.skippyall.minions.mixins.antimobcap.ServerChunkCacheAccessor;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.commands.CommandSourceStack;
import net.minecraft.server.world.ChunkLevelManager; import net.minecraft.network.chat.Component;
import net.minecraft.text.Text; import net.minecraft.server.level.DistanceManager;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.commands.Commands.literal;
public class MobCapDebugSubcommand { public class MobCapDebugSubcommand {
public static final LiteralArgumentBuilder<ServerCommandSource> MOB_CAP_DEBUG = literal("mobcapdebug") public static final LiteralArgumentBuilder<CommandSourceStack> MOB_CAP_DEBUG = literal("mobcapdebug")
.executes(MobCapDebugSubcommand::mobcapdebugCommand); .executes(MobCapDebugSubcommand::mobcapdebugCommand);
public static int mobcapdebugCommand(CommandContext<ServerCommandSource> context) { public static int mobcapdebugCommand(CommandContext<CommandSourceStack> context) {
ChunkLevelManager levelManager = ((ServerChunkManagerAccessor)context.getSource().getWorld().getChunkManager()).getLevelManager(); DistanceManager levelManager = ((ServerChunkCacheAccessor)context.getSource().getLevel().getChunkSource()).getDistanceManager();
int tickedChunkCount = ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)levelManager).minions$getMinionless()).minions$getTickedChunkCount(); int tickedChunkCount = ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)levelManager).minions$getMinionless()).minions$getTickedChunkCount();
context.getSource().sendFeedback(() -> Text.of(String.valueOf(tickedChunkCount)), false); context.getSource().sendSuccess(() -> Component.nullToEmpty(String.valueOf(tickedChunkCount)), false);
return 0; return 0;
} }
} }
src/main/java/io/github/skippyall/minions/command/SpawnSubcommand.java
+12 -12
View File
@@ -6,24 +6,24 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.exceptions.CommandSyntaxException; import com.mojang.brigadier.exceptions.CommandSyntaxException;
import io.github.skippyall.minions.minion.MinionData; import io.github.skippyall.minions.minion.MinionData;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.command.argument.PosArgument; import net.minecraft.commands.CommandSourceStack;
import net.minecraft.command.argument.Vec3ArgumentType; import net.minecraft.commands.arguments.coordinates.Coordinates;
import net.minecraft.server.command.ServerCommandSource; import net.minecraft.commands.arguments.coordinates.Vec3Argument;
import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.commands.Commands.argument;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.commands.Commands.literal;
public class SpawnSubcommand { public class SpawnSubcommand {
public static final LiteralArgumentBuilder<ServerCommandSource> SPAWN = literal("spawn") public static final LiteralArgumentBuilder<CommandSourceStack> SPAWN = literal("spawn")
.requires(source -> source.hasPermissionLevel(2)) .requires(source -> source.hasPermission(2))
.then(argument("minion", StringArgumentType.word()) .then(argument("minion", StringArgumentType.word())
.suggests(MinionArgument.SUGGESTION_PROVIDER) .suggests(MinionArgument.SUGGESTION_PROVIDER)
.then(argument("pos", Vec3ArgumentType.vec3()) .then(argument("pos", Vec3Argument.vec3())
.executes(context -> .executes(context ->
spawnCommand( spawnCommand(
context.getSource(), context.getSource(),
StringArgumentType.getString(context, "minion"), StringArgumentType.getString(context, "minion"),
Vec3ArgumentType.getPosArgument(context, "pos"), Vec3Argument.getCoordinates(context, "pos"),
false false
) )
) )
@@ -32,7 +32,7 @@ public class SpawnSubcommand {
spawnCommand( spawnCommand(
context.getSource(), context.getSource(),
StringArgumentType.getString(context, "minion"), StringArgumentType.getString(context, "minion"),
Vec3ArgumentType.getPosArgument(context, "pos"), Vec3Argument.getCoordinates(context, "pos"),
BoolArgumentType.getBool(context, "force") BoolArgumentType.getBool(context, "force")
) )
) )
@@ -47,9 +47,9 @@ public class SpawnSubcommand {
)) ))
); );
public static int spawnCommand(ServerCommandSource source, String minion, PosArgument pos, boolean force) throws CommandSyntaxException { public static int spawnCommand(CommandSourceStack source, String minion, Coordinates pos, boolean force) throws CommandSyntaxException {
MinionData data = MinionArgument.parse(source.getServer(), minion); MinionData data = MinionArgument.parse(source.getServer(), minion);
MinionFakePlayer.spawnMinion(data, source.getWorld(), pos != null ? pos.getPos(source) : null, pos != null ? pos.getRotation(source) : null, force); MinionFakePlayer.spawnMinion(data, source.getLevel(), pos != null ? pos.getPosition(source) : null, pos != null ? pos.getRotation(source) : null, force);
return 0; return 0;
} }
} }
src/main/java/io/github/skippyall/minions/command/TestSubcommand.java
+17 -18
View File
@@ -3,33 +3,32 @@ package io.github.skippyall.minions.command;
import com.mojang.brigadier.builder.LiteralArgumentBuilder; import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext; import com.mojang.brigadier.context.CommandContext;
import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.Minions;
import net.minecraft.block.Blocks;
import net.minecraft.command.argument.BlockPosArgumentType;
import net.minecraft.server.command.ServerCommandSource;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.world.World;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.chat.Component;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import static net.minecraft.server.command.CommandManager.argument; import static net.minecraft.commands.Commands.argument;
import static net.minecraft.server.command.CommandManager.literal; import static net.minecraft.commands.Commands.literal;
public class TestSubcommand { public class TestSubcommand {
public static LiteralArgumentBuilder<ServerCommandSource> TEST = literal("test") public static LiteralArgumentBuilder<CommandSourceStack> TEST = literal("test")
.then(argument("pos", BlockPosArgumentType.blockPos()) .then(argument("pos", BlockPosArgument.blockPos())
.executes(TestSubcommand::execute) .executes(TestSubcommand::execute)
); );
private static int execute(CommandContext<ServerCommandSource> context) { private static int execute(CommandContext<CommandSourceStack> context) {
try { try {
BlockPos pos = BlockPosArgumentType.getBlockPos(context, "pos"); BlockPos pos = BlockPosArgument.getBlockPos(context, "pos");
Collection<BlockPos> result = findInputs(context.getSource().getWorld(), pos); Collection<BlockPos> result = findInputs(context.getSource().getLevel(), pos);
for (BlockPos resultPos : result) { for (BlockPos resultPos : result) {
context.getSource().sendFeedback(() -> Text.literal(resultPos.toShortString()), false); context.getSource().sendSuccess(() -> Component.literal(resultPos.toShortString()), false);
} }
} catch (Throwable e) { } catch (Throwable e) {
Minions.LOGGER.error("Error", e); Minions.LOGGER.error("Error", e);
@@ -37,7 +36,7 @@ public class TestSubcommand {
return 0; return 0;
} }
private static Collection<BlockPos> findInputs(World world, BlockPos pos) { private static Collection<BlockPos> findInputs(Level world, BlockPos pos) {
//positions that are already processed //positions that are already processed
Collection<BlockPos> visitedPositions = new HashSet<>(); Collection<BlockPos> visitedPositions = new HashSet<>();
//positions we are currently looking at //positions we are currently looking at
@@ -53,7 +52,7 @@ public class TestSubcommand {
for(BlockPos currentPosition : currentPositions) { for(BlockPos currentPosition : currentPositions) {
for(Direction dir : Direction.values()) { for(Direction dir : Direction.values()) {
//check each neighbor of the current positions //check each neighbor of the current positions
BlockPos newPos = currentPosition.offset(dir); BlockPos newPos = currentPosition.relative(dir);
//Do not check blocks that were already checked //Do not check blocks that were already checked
if(!visitedPositions.contains(newPos)) { if(!visitedPositions.contains(newPos)) {
if (world.getBlockState(newPos).getBlock() == Blocks.REDSTONE_BLOCK) { if (world.getBlockState(newPos).getBlock() == Blocks.REDSTONE_BLOCK) {
src/main/java/io/github/skippyall/minions/docs/DocsEntry.java
+4 -5
View File
@@ -4,18 +4,17 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.dialog.body.DialogBody;
import net.minecraft.registry.DynamicRegistryManager;
import java.util.List; import java.util.List;
import java.util.function.Function; import java.util.function.Function;
import net.minecraft.core.RegistryAccess;
import net.minecraft.server.dialog.body.DialogBody;
public interface DocsEntry { public interface DocsEntry {
Codec<DocsEntry> CODEC = MinionRegistries.DOCS_ENTRY_TYPES.getCodec().dispatch(DocsEntry::getCodec, Function.identity()); Codec<DocsEntry> CODEC = MinionRegistries.DOCS_ENTRY_TYPES.byNameCodec().dispatch(DocsEntry::getCodec, Function.identity());
Metadata getMetadata(); Metadata getMetadata();
List<DialogBody> getDialog(DynamicRegistryManager manager); List<DialogBody> getDialog(RegistryAccess manager);
MapCodec<? extends DocsEntry> getCodec(); MapCodec<? extends DocsEntry> getCodec();
src/main/java/io/github/skippyall/minions/docs/DocsManager.java
+47 -48
View File
@@ -4,22 +4,21 @@ import com.google.gson.JsonParseException;
import com.mojang.serialization.JsonOps; import com.mojang.serialization.JsonOps;
import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.Minions;
import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener; import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener;
import net.minecraft.dialog.AfterAction; import net.minecraft.core.Holder;
import net.minecraft.dialog.DialogActionButtonData; import net.minecraft.network.chat.ClickEvent;
import net.minecraft.dialog.DialogButtonData; import net.minecraft.network.chat.Component;
import net.minecraft.dialog.DialogCommonData; import net.minecraft.resources.ResourceLocation;
import net.minecraft.dialog.action.SimpleDialogAction; import net.minecraft.server.dialog.ActionButton;
import net.minecraft.dialog.type.MultiActionDialog; import net.minecraft.server.dialog.CommonButtonData;
import net.minecraft.registry.entry.RegistryEntry; import net.minecraft.server.dialog.CommonDialogData;
import net.minecraft.resource.Resource; import net.minecraft.server.dialog.DialogAction;
import net.minecraft.resource.ResourceManager; import net.minecraft.server.dialog.MultiActionDialog;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.dialog.action.StaticAction;
import net.minecraft.text.ClickEvent; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.text.Text; import net.minecraft.server.packs.resources.Resource;
import net.minecraft.util.Identifier; import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.util.Pair;
import net.minecraft.util.StrictJsonParser; import net.minecraft.util.StrictJsonParser;
import net.minecraft.util.Tuple;
import java.io.IOException; import java.io.IOException;
import java.io.Reader; import java.io.Reader;
import java.util.ArrayList; import java.util.ArrayList;
@@ -31,46 +30,46 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
public class DocsManager implements SimpleResourceReloadListener<Pair<Map<Identifier, DocsEntry>, DocsTree>> { public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<ResourceLocation, DocsEntry>, DocsTree>> {
private static Map<Identifier, DocsEntry> docs; private static Map<ResourceLocation, DocsEntry> docs;
private static DocsTree tree; private static DocsTree tree;
public static DocsTree getTree() { public static DocsTree getTree() {
return tree; return tree;
} }
public static void showDocsEntry(ServerPlayerEntity player, Identifier id) { public static void showDocsEntry(ServerPlayer player, ResourceLocation id) {
DocsEntry entry = getDocsEntry(id); DocsEntry entry = getDocsEntry(id);
if(entry == null) { if(entry == null) {
return; return;
} }
List<DialogActionButtonData> buttons = new ArrayList<>(); List<ActionButton> buttons = new ArrayList<>();
if(tree != null) { if(tree != null) {
DocsTree.DocElement element = tree.getElement(id); DocsTree.DocElement element = tree.getElement(id);
if (element.previous() != null) { if (element.previous() != null) {
Identifier previousId = element.previous().getId(); ResourceLocation previousId = element.previous().getId();
buttons.add(getDialogButton(Text.literal("<- ").append(Text.translatable(getDocsEntry(previousId).getMetadata().titleKey())), previousId.toString())); buttons.add(getDialogButton(Component.literal("<- ").append(Component.translatable(getDocsEntry(previousId).getMetadata().titleKey())), previousId.toString()));
} }
if (element.next() != null) { if (element.next() != null) {
Identifier nextId = element.next().getId(); ResourceLocation nextId = element.next().getId();
buttons.add(getDialogButton(Text.translatable(getDocsEntry(nextId).getMetadata().titleKey()).append(Text.literal(" ->")), nextId.toString())); buttons.add(getDialogButton(Component.translatable(getDocsEntry(nextId).getMetadata().titleKey()).append(Component.literal(" ->")), nextId.toString()));
} }
} }
buttons.add(new DialogActionButtonData( buttons.add(new ActionButton(
new DialogButtonData(Text.translatable("gui.ok"), 100), new CommonButtonData(Component.translatable("gui.ok"), 100),
Optional.empty() Optional.empty()
)); ));
player.openDialog(RegistryEntry.of(new MultiActionDialog( player.openDialog(Holder.direct(new MultiActionDialog(
new DialogCommonData( new CommonDialogData(
Text.translatable(entry.getMetadata().titleKey()), Component.translatable(entry.getMetadata().titleKey()),
Optional.empty(), Optional.empty(),
true, true,
false, false,
AfterAction.CLOSE, DialogAction.CLOSE,
entry.getDialog(player.getRegistryManager()), entry.getDialog(player.registryAccess()),
List.of() List.of()
), ),
buttons, buttons,
@@ -79,38 +78,38 @@ public class DocsManager implements SimpleResourceReloadListener<Pair<Map<Identi
))); )));
} }
private static DialogActionButtonData getDialogButton(Text text, String dialogToOpen) { private static ActionButton getDialogButton(Component text, String dialogToOpen) {
return new DialogActionButtonData( return new ActionButton(
new DialogButtonData( new CommonButtonData(
text, 100 text, 100
), ),
Optional.of(new SimpleDialogAction(new ClickEvent.RunCommand("/minions docs " + dialogToOpen))) Optional.of(new StaticAction(new ClickEvent.RunCommand("/minions docs " + dialogToOpen)))
); );
} }
public static DocsEntry getDocsEntry(Identifier id) { public static DocsEntry getDocsEntry(ResourceLocation id) {
return docs.get(id); return docs.get(id);
} }
public static Collection<Identifier> getDocsEntryIds() { public static Collection<ResourceLocation> getDocsEntryIds() {
return docs.keySet(); return docs.keySet();
} }
@Override @Override
public CompletableFuture<Pair<Map<Identifier, DocsEntry>, DocsTree>> load(ResourceManager resourceManager, Executor executor) { public CompletableFuture<Tuple<Map<ResourceLocation, DocsEntry>, DocsTree>> load(ResourceManager resourceManager, Executor executor) {
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
Map<Identifier, Resource> resources = resourceManager.findResources("docs", id -> id.getNamespace().equals(Minions.MOD_ID) && id.getPath().endsWith(".json")); Map<ResourceLocation, Resource> resources = resourceManager.listResources("docs", id -> id.getNamespace().equals(Minions.MOD_ID) && id.getPath().endsWith(".json"));
final DocsTree.BranchElement[] root = {null}; final DocsTree.BranchElement[] root = {null};
Map<Identifier, DocsEntry> docsEntries = new HashMap<>(); Map<ResourceLocation, DocsEntry> docsEntries = new HashMap<>();
resources.forEach((id, resource) -> { resources.forEach((id, resource) -> {
try(Reader reader = resource.getReader()) { try(Reader reader = resource.openAsReader()) {
if(id.getPath().equals("docs/tree.json")) { if(id.getPath().equals("docs/tree.json")) {
DocsTree.BranchElement.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader)) DocsTree.BranchElement.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader))
.ifSuccess(entry -> root[0] = entry.getFirst()) .ifSuccess(entry -> root[0] = entry.getFirst())
.ifError(error -> Minions.LOGGER.warn("Could not parse docs tree {}: {}", id, error.message())); .ifError(error -> Minions.LOGGER.warn("Could not parse docs tree {}: {}", id, error.message()));
} else { } else {
Identifier docId = Identifier.of(id.getNamespace(), id.getPath().substring("docs/".length(), id.getPath().length() - ".json".length())); ResourceLocation docId = ResourceLocation.fromNamespaceAndPath(id.getNamespace(), id.getPath().substring("docs/".length(), id.getPath().length() - ".json".length()));
DocsEntry.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader)) DocsEntry.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader))
.ifSuccess(entry -> docsEntries.put(docId, entry.getFirst())) .ifSuccess(entry -> docsEntries.put(docId, entry.getFirst()))
.ifError(error -> Minions.LOGGER.warn("Could not parse docs entry {}: {}", id, error.message())); .ifError(error -> Minions.LOGGER.warn("Could not parse docs entry {}: {}", id, error.message()));
@@ -121,24 +120,24 @@ public class DocsManager implements SimpleResourceReloadListener<Pair<Map<Identi
}); });
if(root[0] != null) { if(root[0] != null) {
DocsTree tree = new DocsTree(root[0]); DocsTree tree = new DocsTree(root[0]);
return new Pair<>(docsEntries, tree); return new Tuple<>(docsEntries, tree);
} else { } else {
return new Pair<>(docsEntries, null); return new Tuple<>(docsEntries, null);
} }
}, executor); }, executor);
} }
@Override @Override
public CompletableFuture<Void> apply(Pair<Map<Identifier, DocsEntry>, DocsTree> o, ResourceManager resourceManager, Executor executor) { public CompletableFuture<Void> apply(Tuple<Map<ResourceLocation, DocsEntry>, DocsTree> o, ResourceManager resourceManager, Executor executor) {
return CompletableFuture.supplyAsync(() -> { return CompletableFuture.supplyAsync(() -> {
docs = o.getLeft(); docs = o.getA();
tree = o.getRight(); tree = o.getB();
return null; return null;
}); });
} }
@Override @Override
public Identifier getFabricId() { public ResourceLocation getFabricId() {
return Identifier.of(Minions.MOD_ID, "docs"); return ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "docs");
} }
} }
src/main/java/io/github/skippyall/minions/docs/DocsTree.java
+7 -8
View File
@@ -2,16 +2,15 @@ package io.github.skippyall.minions.docs;
import com.mojang.datafixers.util.Either; import com.mojang.datafixers.util.Either;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import net.minecraft.util.Identifier;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import net.minecraft.resources.ResourceLocation;
public class DocsTree { public class DocsTree {
private final BranchElement root; private final BranchElement root;
private final Map<Identifier, DocElement> entries = new HashMap<>(); private final Map<ResourceLocation, DocElement> entries = new HashMap<>();
public DocsTree(BranchElement root) { public DocsTree(BranchElement root) {
this.root = root; this.root = root;
@@ -30,7 +29,7 @@ public class DocsTree {
return root; return root;
} }
public DocElement getElement(Identifier id) { public DocElement getElement(ResourceLocation id) {
return entries.get(id); return entries.get(id);
} }
@@ -55,15 +54,15 @@ public class DocsTree {
} }
public static final class DocElement extends Element { public static final class DocElement extends Element {
public static final Codec<DocElement> CODEC = Identifier.CODEC.xmap(DocElement::new, DocElement::getId); public static final Codec<DocElement> CODEC = ResourceLocation.CODEC.xmap(DocElement::new, DocElement::getId);
private final Identifier id; private final ResourceLocation id;
public DocElement(Identifier element) { public DocElement(ResourceLocation element) {
this.id = element; this.id = element;
} }
public Identifier getId() { public ResourceLocation getId() {
return id; return id;
} }
} }
src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java
+28 -29
View File
@@ -4,36 +4,35 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec; import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.github.skippyall.minions.gui.GuiDisplay; import io.github.skippyall.minions.gui.GuiDisplay;
import net.minecraft.dialog.body.DialogBody;
import net.minecraft.dialog.body.ItemDialogBody;
import net.minecraft.dialog.body.PlainMessageDialogBody;
import net.minecraft.item.Item;
import net.minecraft.registry.DynamicRegistryManager;
import net.minecraft.registry.Registries;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.text.Text;
import net.minecraft.text.TextCodecs;
import net.minecraft.util.Identifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.ComponentSerialization;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.dialog.body.DialogBody;
import net.minecraft.server.dialog.body.ItemBody;
import net.minecraft.server.dialog.body.PlainMessage;
import net.minecraft.world.item.Item;
public record ReferenceEntry(Metadata metadata, RegistryKey<?> object, Text shortDescription, Text longDescription) implements DocsEntry { public record ReferenceEntry(Metadata metadata, ResourceKey<?> object, Component shortDescription, Component longDescription) implements DocsEntry {
private static final Codec<RegistryKey<?>> REGISTRY_KEY_CODEC = RecordCodecBuilder.create(instance -> private static final Codec<ResourceKey<?>> REGISTRY_KEY_CODEC = RecordCodecBuilder.create(instance ->
instance.group( instance.group(
Identifier.CODEC.fieldOf("registry").forGetter(RegistryKey::getRegistry), ResourceLocation.CODEC.fieldOf("registry").forGetter(ResourceKey::registry),
Identifier.CODEC.fieldOf("value").forGetter(RegistryKey::getValue) ResourceLocation.CODEC.fieldOf("value").forGetter(ResourceKey::location)
).apply(instance, (registry, value) -> RegistryKey.of(RegistryKey.ofRegistry(registry), value)) ).apply(instance, (registry, value) -> ResourceKey.create(ResourceKey.createRegistryKey(registry), value))
); );
public static final MapCodec<ReferenceEntry> CODEC = RecordCodecBuilder.mapCodec(instance -> public static final MapCodec<ReferenceEntry> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group( instance.group(
Metadata.CODEC.fieldOf("metadata").forGetter(ReferenceEntry::getMetadata), Metadata.CODEC.fieldOf("metadata").forGetter(ReferenceEntry::getMetadata),
REGISTRY_KEY_CODEC.fieldOf("object").forGetter(ReferenceEntry::object), REGISTRY_KEY_CODEC.fieldOf("object").forGetter(ReferenceEntry::object),
TextCodecs.CODEC.fieldOf("shortDescription").forGetter(ReferenceEntry::shortDescription), ComponentSerialization.CODEC.fieldOf("shortDescription").forGetter(ReferenceEntry::shortDescription),
TextCodecs.CODEC.fieldOf("longDescription").forGetter(ReferenceEntry::longDescription) ComponentSerialization.CODEC.fieldOf("longDescription").forGetter(ReferenceEntry::longDescription)
).apply(instance, ReferenceEntry::new)); ).apply(instance, ReferenceEntry::new));
@Override @Override
@@ -42,33 +41,33 @@ public record ReferenceEntry(Metadata metadata, RegistryKey<?> object, Text shor
} }
@Override @Override
public List<DialogBody> getDialog(DynamicRegistryManager manager) { public List<DialogBody> getDialog(RegistryAccess manager) {
List<DialogBody> bodyElements = new ArrayList<>(); List<DialogBody> bodyElements = new ArrayList<>();
GuiDisplay display = getObjectDisplay(manager); GuiDisplay display = getObjectDisplay(manager);
if(display != null) { if(display != null) {
bodyElements.add(new ItemDialogBody(display.createItemStack(), Optional.empty(), false, false, 16, 16)); bodyElements.add(new ItemBody(display.createItemStack(), Optional.empty(), false, false, 16, 16));
} }
bodyElements.add(new PlainMessageDialogBody(Text.translatable(object.getValue().toTranslationKey(object.getRegistry().getPath())), 200)); bodyElements.add(new PlainMessage(Component.translatable(object.location().toLanguageKey(object.registry().getPath())), 200));
bodyElements.add(new PlainMessageDialogBody(longDescription, 200)); bodyElements.add(new PlainMessage(longDescription, 200));
return bodyElements; return bodyElements;
} }
public GuiDisplay getObjectDisplay(DynamicRegistryManager manager) { public GuiDisplay getObjectDisplay(RegistryAccess manager) {
GuiDisplay display = GuiDisplay.DEFAULT_DISPLAY; GuiDisplay display = GuiDisplay.DEFAULT_DISPLAY;
if(object.isOf(RegistryKeys.ITEM) || object.isOf(RegistryKeys.BLOCK)) { if(object.isFor(Registries.ITEM) || object.isFor(Registries.BLOCK)) {
Item item; Item item;
if(object.isOf(RegistryKeys.ITEM)) { if(object.isFor(Registries.ITEM)) {
item = Registries.ITEM.get(object.getValue()); item = BuiltInRegistries.ITEM.getValue(object.location());
} else { } else {
item = Registries.BLOCK.get(object.getValue()).asItem(); item = BuiltInRegistries.BLOCK.getValue(object.location()).asItem();
} }
if(item != null) { if(item != null) {
display = new GuiDisplay.ItemBased(item); display = new GuiDisplay.ItemBased(item);
} }
} else { } else {
Identifier displayId = object.getValue().withPrefixedPath(object.getRegistry().getPath() + "/"); ResourceLocation displayId = object.location().withPrefix(object.registry().getPath() + "/");
display = GuiDisplay.getGuiDisplay(displayId, manager); display = GuiDisplay.getGuiDisplay(displayId, manager);
} }
return display; return display;
src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java
+32 -33
View File
@@ -5,49 +5,48 @@ import com.mojang.serialization.Codec;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.util.TranslationUtil; import io.github.skippyall.minions.util.TranslationUtil;
import it.unimi.dsi.fastutil.objects.ReferenceSortedSets; import it.unimi.dsi.fastutil.objects.ReferenceSortedSets;
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.ProfileComponent;
import net.minecraft.component.type.TooltipDisplayComponent;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.registry.DynamicRegistryManager;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.text.Text;
import net.minecraft.util.Formatting;
import net.minecraft.util.Identifier;
import net.minecraft.util.Rarity;
import net.minecraft.util.Uuids;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import net.minecraft.ChatFormatting;
import net.minecraft.core.Registry;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.UUIDUtil;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.component.ResolvableProfile;
import net.minecraft.world.item.component.TooltipDisplay;
public interface GuiDisplay { public interface GuiDisplay {
Codec<GuiDisplay> CODEC = MinionRegistries.GUI_DISPLAY_TYPE.getCodec().dispatch(GuiDisplay::getCodec, codec -> codec.fieldOf("data")); Codec<GuiDisplay> CODEC = MinionRegistries.GUI_DISPLAY_TYPE.byNameCodec().dispatch(GuiDisplay::getCodec, codec -> codec.fieldOf("data"));
GuiDisplay DEFAULT_DISPLAY = new ItemBased(Items.BARRIER); GuiDisplay DEFAULT_DISPLAY = new ItemBased(Items.BARRIER);
static GuiDisplay getGuiDisplay(Identifier id, DynamicRegistryManager manager) { static GuiDisplay getGuiDisplay(ResourceLocation id, RegistryAccess manager) {
return manager.getOptional(MinionRegistries.GUI_DISPLAY).map(registry -> registry.get(id)).orElse(DEFAULT_DISPLAY); return manager.lookup(MinionRegistries.GUI_DISPLAY).map(registry -> registry.getValue(id)).orElse(DEFAULT_DISPLAY);
} }
static <T> GuiDisplay getGuiDisplayFor(Registry<T> registry, T element, DynamicRegistryManager manager) { static <T> GuiDisplay getGuiDisplayFor(Registry<T> registry, T element, RegistryAccess manager) {
Identifier elementId = registry.getId(element); ResourceLocation elementId = registry.getKey(element);
if(elementId == null) { if(elementId == null) {
return DEFAULT_DISPLAY; return DEFAULT_DISPLAY;
} }
Identifier displayId = elementId.withPrefixedPath(registry.getKey().getValue().getPath() + "/"); ResourceLocation displayId = elementId.withPrefix(registry.key().location().getPath() + "/");
return getGuiDisplay(displayId, manager); return getGuiDisplay(displayId, manager);
} }
static <T> ItemStack getDisplayStack(Registry<T> registry, T element, DynamicRegistryManager manager) { static <T> ItemStack getDisplayStack(Registry<T> registry, T element, RegistryAccess manager) {
return getGuiDisplayFor(registry, element, manager).createItemStack(); return getGuiDisplayFor(registry, element, manager).createItemStack();
} }
static <T> ItemStack getDisplayStackWithName(Registry<T> registry, T element, DynamicRegistryManager manager) { static <T> ItemStack getDisplayStackWithName(Registry<T> registry, T element, RegistryAccess manager) {
ItemStack stack = getDisplayStack(registry, element, manager); ItemStack stack = getDisplayStack(registry, element, manager);
stack.set(DataComponentTypes.CUSTOM_NAME, Text.translatable(TranslationUtil.getTranslationKey(element, registry)).styled(style -> style.withItalic(false).withColor(Formatting.WHITE))); stack.set(DataComponents.CUSTOM_NAME, Component.translatable(TranslationUtil.getTranslationKey(element, registry)).withStyle(style -> style.withItalic(false).withColor(ChatFormatting.WHITE)));
return stack; return stack;
} }
@@ -56,18 +55,18 @@ public interface GuiDisplay {
Codec<? extends GuiDisplay> getCodec(); Codec<? extends GuiDisplay> getCodec();
class ModelBased implements GuiDisplay { class ModelBased implements GuiDisplay {
public static final Codec<ModelBased> CODEC = Identifier.CODEC.xmap(ModelBased::new, display -> display.model); public static final Codec<ModelBased> CODEC = ResourceLocation.CODEC.xmap(ModelBased::new, display -> display.model);
private final Identifier model; private final ResourceLocation model;
public ModelBased(Identifier model) { public ModelBased(ResourceLocation model) {
this.model = model; this.model = model;
} }
@Override @Override
public ItemStack createItemStack() { public ItemStack createItemStack() {
ItemStack stack = new ItemStack(Items.BARRIER); ItemStack stack = new ItemStack(Items.BARRIER);
stack.set(DataComponentTypes.ITEM_MODEL, model); stack.set(DataComponents.ITEM_MODEL, model);
return stack; return stack;
} }
@@ -78,7 +77,7 @@ public interface GuiDisplay {
} }
class ItemBased implements GuiDisplay { class ItemBased implements GuiDisplay {
public static final Codec<ItemBased> CODEC = Registries.ITEM.getCodec().xmap(ItemBased::new, display -> display.item); public static final Codec<ItemBased> CODEC = BuiltInRegistries.ITEM.byNameCodec().xmap(ItemBased::new, display -> display.item);
private final Item item; private final Item item;
@@ -89,8 +88,8 @@ public interface GuiDisplay {
@Override @Override
public ItemStack createItemStack() { public ItemStack createItemStack() {
ItemStack stack = new ItemStack(item); ItemStack stack = new ItemStack(item);
stack.set(DataComponentTypes.TOOLTIP_DISPLAY, new TooltipDisplayComponent(true, ReferenceSortedSets.emptySet())); stack.set(DataComponents.TOOLTIP_DISPLAY, new TooltipDisplay(true, ReferenceSortedSets.emptySet()));
stack.set(DataComponentTypes.RARITY, Rarity.COMMON); stack.set(DataComponents.RARITY, Rarity.COMMON);
return stack; return stack;
} }
@@ -101,7 +100,7 @@ public interface GuiDisplay {
} }
class HeadBased implements GuiDisplay { class HeadBased implements GuiDisplay {
public static final Codec<HeadBased> CODEC = Uuids.CODEC.xmap(HeadBased::new, display -> display.uuid); public static final Codec<HeadBased> CODEC = UUIDUtil.AUTHLIB_CODEC.xmap(HeadBased::new, display -> display.uuid);
private final UUID uuid; private final UUID uuid;
@@ -112,7 +111,7 @@ public interface GuiDisplay {
@Override @Override
public ItemStack createItemStack() { public ItemStack createItemStack() {
ItemStack stack = new ItemStack(Items.PLAYER_HEAD); ItemStack stack = new ItemStack(Items.PLAYER_HEAD);
stack.set(DataComponentTypes.PROFILE, new ProfileComponent(Optional.empty(), Optional.of(uuid), new PropertyMap())); stack.set(DataComponents.PROFILE, new ResolvableProfile(Optional.empty(), Optional.of(uuid), new PropertyMap()));
return stack; return stack;
} }
src/main/java/io/github/skippyall/minions/gui/MinionLookGui.java
+17 -18
View File
@@ -9,22 +9,21 @@ import io.github.skippyall.minions.minion.MinionProfileUtils;
import io.github.skippyall.minions.minion.skin.SkinProvider; import io.github.skippyall.minions.minion.skin.SkinProvider;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.registration.SkinProviders; import io.github.skippyall.minions.registration.SkinProviders;
import net.minecraft.component.DataComponentTypes;
import net.minecraft.component.type.ProfileComponent;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.Optional; import java.util.Optional;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.component.ResolvableProfile;
public class MinionLookGui extends SimpleGui { public class MinionLookGui extends SimpleGui {
private ItemStack minionItem; private ItemStack minionItem;
private SkinProvider currentSkinProvider; private SkinProvider currentSkinProvider;
public MinionLookGui(ServerPlayerEntity player, ItemStack minionItem) { public MinionLookGui(ServerPlayer player, ItemStack minionItem) {
super(ScreenHandlerType.GENERIC_9X3, player, false); super(MenuType.GENERIC_9x3, player, false);
this.minionItem = minionItem; this.minionItem = minionItem;
this.currentSkinProvider = SkinProviders.NAME; this.currentSkinProvider = SkinProviders.NAME;
} }
@@ -38,7 +37,7 @@ public class MinionLookGui extends SimpleGui {
private void updateName() { private void updateName() {
setSlot(10, new GuiElementBuilder() setSlot(10, new GuiElementBuilder()
.setItem(Items.OAK_SIGN) .setItem(Items.OAK_SIGN)
.setName(Text.literal(getData().name())) .setName(Component.literal(getData().name()))
.setCallback(() -> { .setCallback(() -> {
openRenameGui(player, minionItem); openRenameGui(player, minionItem);
}) })
@@ -52,26 +51,26 @@ public class MinionLookGui extends SimpleGui {
MinionItem.setData(player.getServer(), getData().withSkin(skin), minionItem); MinionItem.setData(player.getServer(), getData().withSkin(skin), minionItem);
})); }));
if(MinionItem.getData(player.getServer(), minionItem) != null && MinionItem.getData(player.getServer(), minionItem).skin().isPresent()) { if(MinionItem.getData(player.getServer(), minionItem) != null && MinionItem.getData(player.getServer(), minionItem).skin().isPresent()) {
builder.setComponent(DataComponentTypes.PROFILE, new ProfileComponent(Optional.empty(), Optional.empty(), getData().skin().get())); builder.setComponent(DataComponents.PROFILE, new ResolvableProfile(Optional.empty(), Optional.empty(), getData().skin().get()));
} }
setSlot(16, builder); setSlot(16, builder);
} }
private void cycleSkinProvider() { private void cycleSkinProvider() {
int currentId = MinionRegistries.SKIN_PROVIDERS.getRawId(currentSkinProvider); int currentId = MinionRegistries.SKIN_PROVIDERS.getId(currentSkinProvider);
currentId++; currentId++;
if(MinionRegistries.SKIN_PROVIDERS.size() == currentId) { if(MinionRegistries.SKIN_PROVIDERS.size() == currentId) {
currentId = 0; currentId = 0;
} }
currentSkinProvider = MinionRegistries.SKIN_PROVIDERS.get(currentId); currentSkinProvider = MinionRegistries.SKIN_PROVIDERS.byId(currentId);
updateSkinProvider(); updateSkinProvider();
} }
private void updateSkinProvider() { private void updateSkinProvider() {
setSlot(25, new GuiElementBuilder() setSlot(25, new GuiElementBuilder()
.setItem(Items.GREEN_STAINED_GLASS_PANE) .setItem(Items.GREEN_STAINED_GLASS_PANE)
.setComponent(DataComponentTypes.CUSTOM_NAME, currentSkinProvider.getDisplayName()) .setComponent(DataComponents.CUSTOM_NAME, currentSkinProvider.getDisplayName())
.setCallback(this::cycleSkinProvider) .setCallback(this::cycleSkinProvider)
); );
} }
@@ -80,14 +79,14 @@ public class MinionLookGui extends SimpleGui {
return MinionItem.getDataOrDefault(player.getServer(), minionItem); return MinionItem.getDataOrDefault(player.getServer(), minionItem);
} }
public static void open(ServerPlayerEntity player, ItemStack minionItem) { public static void open(ServerPlayer player, ItemStack minionItem) {
MinionLookGui gui = new MinionLookGui(player, minionItem); MinionLookGui gui = new MinionLookGui(player, minionItem);
gui.update(); gui.update();
gui.open(); gui.open();
} }
public void openRenameGui(ServerPlayerEntity player, ItemStack minionItem) { public void openRenameGui(ServerPlayer player, ItemStack minionItem) {
TextInput.inputSync(player, Text.translatable("minions.gui.look.rename.title"), "Minion", name -> MinionProfileUtils.checkMinionNameWithoutPrefix(player.getServer(), name)) TextInput.inputSync(player, Component.translatable("minions.gui.look.rename.title"), "Minion", name -> MinionProfileUtils.checkMinionNameWithoutPrefix(player.getServer(), name))
.thenAccept(name -> { .thenAccept(name -> {
MinionItem.setData(player.getServer(), getData().withName(MinionProfileUtils.getPrefix() + name), minionItem); MinionItem.setData(player.getServer(), getData().withName(MinionProfileUtils.getPrefix() + name), minionItem);
open(); open();
src/main/java/io/github/skippyall/minions/gui/MinionsGui.java
+4 -4
View File
@@ -1,11 +1,11 @@
package io.github.skippyall.minions.gui; package io.github.skippyall.minions.gui;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerPlayer;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public abstract class MinionsGui { public abstract class MinionsGui {
protected final @Nullable MinionsGui parent; protected final @Nullable MinionsGui parent;
protected final ServerPlayerEntity viewer; protected final ServerPlayer viewer;
protected @Nullable MinionsGui child = null; protected @Nullable MinionsGui child = null;
private boolean open = true; private boolean open = true;
@@ -15,12 +15,12 @@ public abstract class MinionsGui {
parent.child = this; parent.child = this;
} }
public MinionsGui(ServerPlayerEntity viewer) { public MinionsGui(ServerPlayer viewer) {
this.viewer = viewer; this.viewer = viewer;
this.parent = null; this.parent = null;
} }
public ServerPlayerEntity getViewer() { public ServerPlayer getViewer() {
return viewer; return viewer;
} }
src/main/java/io/github/skippyall/minions/gui/PaginatedList.java
+12 -13
View File
@@ -2,22 +2,21 @@ package io.github.skippyall.minions.gui;
import eu.pb4.sgui.api.elements.GuiElementBuilder; import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui; import eu.pb4.sgui.api.gui.SimpleGui;
import net.minecraft.item.Items;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.text.Text;
import net.minecraft.util.collection.IndexedIterable;
import java.util.List; import java.util.List;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import net.minecraft.core.IdMap;
import net.minecraft.network.chat.Component;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.Items;
public class PaginatedList extends MinionsGui { public class PaginatedList extends MinionsGui {
private int page = 0; private int page = 0;
private SimpleGui gui; private SimpleGui gui;
private final Text title; private final Component title;
private final int size; private final int size;
private final BiFunction<Integer, PaginatedList, GuiElementBuilder> display; private final BiFunction<Integer, PaginatedList, GuiElementBuilder> display;
public PaginatedList(MinionsGui parent, Text title, int size, BiFunction<Integer, PaginatedList, GuiElementBuilder> display) { public PaginatedList(MinionsGui parent, Component title, int size, BiFunction<Integer, PaginatedList, GuiElementBuilder> display) {
super(parent); super(parent);
this.title = title; this.title = title;
this.size = size; this.size = size;
@@ -27,7 +26,7 @@ public class PaginatedList extends MinionsGui {
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_9X4, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_9x4, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
@@ -43,12 +42,12 @@ public class PaginatedList extends MinionsGui {
gui.close(); gui.close();
} }
public static <T> void createList(MinionsGui parent, Text title, List<T> list, BiFunction<T, PaginatedList, GuiElementBuilder> display) { public static <T> void createList(MinionsGui parent, Component title, List<T> list, BiFunction<T, PaginatedList, GuiElementBuilder> display) {
new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.get(i), gui)); new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.get(i), gui));
} }
public static <T> void createList(MinionsGui parent, Text title, IndexedIterable<T> list, BiFunction<T, PaginatedList, GuiElementBuilder> display) { public static <T> void createList(MinionsGui parent, Component title, IdMap<T> list, BiFunction<T, PaginatedList, GuiElementBuilder> display) {
new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.get(i), gui)); new PaginatedList(parent, title, list.size(), (i, gui) -> display.apply(list.byId(i), gui));
} }
private void addItems() { private void addItems() {
@@ -58,7 +57,7 @@ public class PaginatedList extends MinionsGui {
if(page > 0) { if(page > 0) {
gui.setSlot(30, new GuiElementBuilder(Items.SPECTRAL_ARROW) gui.setSlot(30, new GuiElementBuilder(Items.SPECTRAL_ARROW)
.setItemName(Text.translatable("book.page_button.previous")) .setItemName(Component.translatable("book.page_button.previous"))
.setCallback(() -> { .setCallback(() -> {
page--; page--;
addItems(); addItems();
@@ -70,7 +69,7 @@ public class PaginatedList extends MinionsGui {
if(27 * (page + 1) < size) { if(27 * (page + 1) < size) {
gui.setSlot(32, new GuiElementBuilder(Items.ARROW) gui.setSlot(32, new GuiElementBuilder(Items.ARROW)
.setItemName(Text.translatable("book.page_button.next")) .setItemName(Component.translatable("book.page_button.next"))
.setCallback(() -> { .setCallback(() -> {
page++; page++;
addItems(); addItems();
src/main/java/io/github/skippyall/minions/gui/input/ChoiceInput.java
+17 -17
View File
@@ -6,18 +6,18 @@ import io.github.skippyall.minions.gui.Displayable;
import io.github.skippyall.minions.gui.GuiDisplay; import io.github.skippyall.minions.gui.GuiDisplay;
import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.gui.MinionsGui;
import io.github.skippyall.minions.gui.minion.SimpleMinionsGui; import io.github.skippyall.minions.gui.minion.SimpleMinionsGui;
import net.minecraft.item.Items;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Function; import java.util.function.Function;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.Items;
public class ChoiceInput { public class ChoiceInput {
public static <T> BiFunction<ServerPlayerEntity, T, CompletableFuture<T>> createDialogOpener(ScreenHandlerType<?> screen, Text title, Function<T, GuiDisplay> displayFunction, T[] values, @Nullable T fallback) { public static <T> BiFunction<ServerPlayer, T, CompletableFuture<T>> createDialogOpener(MenuType<?> screen, Component title, Function<T, GuiDisplay> displayFunction, T[] values, @Nullable T fallback) {
return (player, object) -> { return (player, object) -> {
CompletableFuture<T> future = new CompletableFuture<>(); CompletableFuture<T> future = new CompletableFuture<>();
@@ -44,14 +44,14 @@ public class ChoiceInput {
}; };
} }
public static <T extends Displayable> BiFunction<ServerPlayerEntity, T, CompletableFuture<T>> createDialogOpener(T[] values) { public static <T extends Displayable> BiFunction<ServerPlayer, T, CompletableFuture<T>> createDialogOpener(T[] values) {
return createDialogOpener(ScreenHandlerType.GENERIC_9X3, Text.empty(), t -> t != null ? t.getDisplay() : null, values, null); return createDialogOpener(MenuType.GENERIC_9x3, Component.empty(), t -> t != null ? t.getDisplay() : null, values, null);
} }
public static CompletableFuture<Void> confirm(ServerPlayerEntity player, Text title) { public static CompletableFuture<Void> confirm(ServerPlayer player, Component title) {
CompletableFuture<Void> future = new CompletableFuture<>(); CompletableFuture<Void> future = new CompletableFuture<>();
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false) { SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, player, false) {
@Override @Override
public void onClose() { public void onClose() {
future.cancel(false); future.cancel(false);
@@ -61,12 +61,12 @@ public class ChoiceInput {
gui.setTitle(title); gui.setTitle(title);
gui.setSlot(3, new GuiElementBuilder(Items.REDSTONE_BLOCK) gui.setSlot(3, new GuiElementBuilder(Items.REDSTONE_BLOCK)
.setName(Text.translatable("minions.gui.abort")) .setName(Component.translatable("minions.gui.abort"))
.setCallback(() -> future.cancel(false)) .setCallback(() -> future.cancel(false))
); );
gui.setSlot(5, new GuiElementBuilder(Items.EMERALD_BLOCK) gui.setSlot(5, new GuiElementBuilder(Items.EMERALD_BLOCK)
.setName(Text.translatable("minions.gui.confirm")) .setName(Component.translatable("minions.gui.confirm"))
.setCallback(() -> future.complete(null)) .setCallback(() -> future.complete(null))
); );
@@ -74,11 +74,11 @@ public class ChoiceInput {
return future; return future;
} }
public static CompletableFuture<Void> confirm(MinionsGui parent, Text title) { public static CompletableFuture<Void> confirm(MinionsGui parent, Component title) {
CompletableFuture<Void> future = new CompletableFuture<>(); CompletableFuture<Void> future = new CompletableFuture<>();
new SimpleMinionsGui(parent, (onClose, me) -> { new SimpleMinionsGui(parent, (onClose, me) -> {
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, parent.getViewer(), false) { SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, parent.getViewer(), false) {
@Override @Override
public void onClose() { public void onClose() {
future.cancel(false); future.cancel(false);
@@ -89,12 +89,12 @@ public class ChoiceInput {
gui.setTitle(title); gui.setTitle(title);
gui.setSlot(3, new GuiElementBuilder(Items.REDSTONE_BLOCK) gui.setSlot(3, new GuiElementBuilder(Items.REDSTONE_BLOCK)
.setName(Text.translatable("minions.gui.abort")) .setName(Component.translatable("minions.gui.abort"))
.setCallback(() -> future.cancel(false)) .setCallback(() -> future.cancel(false))
); );
gui.setSlot(5, new GuiElementBuilder(Items.EMERALD_BLOCK) gui.setSlot(5, new GuiElementBuilder(Items.EMERALD_BLOCK)
.setName(Text.translatable("minions.gui.confirm")) .setName(Component.translatable("minions.gui.confirm"))
.setCallback(() -> future.complete(null)) .setCallback(() -> future.complete(null))
); );
@@ -104,8 +104,8 @@ public class ChoiceInput {
return future; return future;
} }
public static BiFunction<ServerPlayerEntity, Boolean, CompletableFuture<Boolean>> inputBoolean(Text title) { public static BiFunction<ServerPlayer, Boolean, CompletableFuture<Boolean>> inputBoolean(Component title) {
return createDialogOpener(ScreenHandlerType.GENERIC_3X3, title, value -> { return createDialogOpener(MenuType.GENERIC_3x3, title, value -> {
if(value) { if(value) {
return new GuiDisplay.ItemBased(Items.EMERALD_BLOCK); return new GuiDisplay.ItemBased(Items.EMERALD_BLOCK);
} else { } else {
src/main/java/io/github/skippyall/minions/gui/input/TextInput.java
+25 -26
View File
@@ -4,28 +4,27 @@ import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.AnvilInputGui; import eu.pb4.sgui.api.gui.AnvilInputGui;
import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.gui.MinionsGui;
import io.github.skippyall.minions.gui.minion.SimpleMinionsGui; import io.github.skippyall.minions.gui.minion.SimpleMinionsGui;
import net.minecraft.item.Items;
import net.minecraft.screen.AnvilScreenHandler;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.function.Function; import java.util.function.Function;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.inventory.AnvilMenu;
import net.minecraft.world.item.Items;
public class TextInput<T> extends AnvilInputGui { public class TextInput<T> extends AnvilInputGui {
private final GuiElementBuilder valid = new GuiElementBuilder() private final GuiElementBuilder valid = new GuiElementBuilder()
.setItem(Items.EMERALD_BLOCK) .setItem(Items.EMERALD_BLOCK)
.setName(Text.literal("OK")) .setName(Component.literal("OK"))
.setCallback(this::onConfirm); .setCallback(this::onConfirm);
private final GuiElementBuilder invalid = new GuiElementBuilder() private final GuiElementBuilder invalid = new GuiElementBuilder()
.setItem(Items.REDSTONE_BLOCK); .setItem(Items.REDSTONE_BLOCK);
private final Function<String, CompletableFuture<Result<T, Text>>> parser; private final Function<String, CompletableFuture<Result<T, Component>>> parser;
private final CompletableFuture<T> future; private final CompletableFuture<T> future;
private Result<T, Text> result; private Result<T, Component> result;
private boolean isConfirm; private boolean isConfirm;
public TextInput(ServerPlayerEntity player, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser, CompletableFuture<T> future) { public TextInput(ServerPlayer player, Component title, String defaultValue, Function<String, CompletableFuture<Result<T, Component>>> parser, CompletableFuture<T> future) {
super(player, false); super(player, false);
setTitle(title); setTitle(title);
setDefaultInputValue(defaultValue); setDefaultInputValue(defaultValue);
@@ -35,21 +34,21 @@ public class TextInput<T> extends AnvilInputGui {
updateConfirmButton(defaultValue); updateConfirmButton(defaultValue);
} }
public static <T> CompletableFuture<T> inputSync(ServerPlayerEntity player, Text title, String defaultValue, Function<String, Result<T, Text>> parser) { public static <T> CompletableFuture<T> inputSync(ServerPlayer player, Component title, String defaultValue, Function<String, Result<T, Component>> parser) {
return input(player, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string))); return input(player, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string)));
} }
public static <T> CompletableFuture<T> inputSync(MinionsGui gui, Text title, String defaultValue, Function<String, Result<T, Text>> parser) { public static <T> CompletableFuture<T> inputSync(MinionsGui gui, Component title, String defaultValue, Function<String, Result<T, Component>> parser) {
return input(gui, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string))); return input(gui, title, defaultValue, (String string) -> CompletableFuture.completedFuture(parser.apply(string)));
} }
public static <T> CompletableFuture<T> input(ServerPlayerEntity player, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser) { public static <T> CompletableFuture<T> input(ServerPlayer player, Component title, String defaultValue, Function<String, CompletableFuture<Result<T, Component>>> parser) {
CompletableFuture<T> future = new CompletableFuture<>(); CompletableFuture<T> future = new CompletableFuture<>();
new TextInput<>(player, title, defaultValue, parser, future).open(); new TextInput<>(player, title, defaultValue, parser, future).open();
return future; return future;
} }
public static <T> CompletableFuture<T> input(MinionsGui gui, Text title, String defaultValue, Function<String, CompletableFuture<Result<T, Text>>> parser) { public static <T> CompletableFuture<T> input(MinionsGui gui, Component title, String defaultValue, Function<String, CompletableFuture<Result<T, Component>>> parser) {
CompletableFuture<T> future = new CompletableFuture<>(); CompletableFuture<T> future = new CompletableFuture<>();
new SimpleMinionsGui(gui, (onClose, me) -> { new SimpleMinionsGui(gui, (onClose, me) -> {
TextInput<T> input = new TextInput<>(gui.getViewer(), title, defaultValue, parser, future); TextInput<T> input = new TextInput<>(gui.getViewer(), title, defaultValue, parser, future);
@@ -63,28 +62,28 @@ public class TextInput<T> extends AnvilInputGui {
return future; return future;
} }
public static CompletableFuture<String> inputString(ServerPlayerEntity player, Text title, String defaultValue) { public static CompletableFuture<String> inputString(ServerPlayer player, Component title, String defaultValue) {
return inputSync(player, title, defaultValue, Result.Success::new); return inputSync(player, title, defaultValue, Result.Success::new);
} }
public static CompletableFuture<String> inputString(MinionsGui gui, Text title, String defaultValue) { public static CompletableFuture<String> inputString(MinionsGui gui, Component title, String defaultValue) {
return inputSync(gui, title, defaultValue, Result.Success::new); return inputSync(gui, title, defaultValue, Result.Success::new);
} }
public static CompletableFuture<Long> inputLong(ServerPlayerEntity player, Text title, String defaultValue) { public static CompletableFuture<Long> inputLong(ServerPlayer player, Component title, String defaultValue) {
return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Long.valueOf(string), Text.translatable("minions.command.input.int.fail"))); return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Long.valueOf(string), Component.translatable("minions.command.input.int.fail")));
} }
public static CompletableFuture<Long> inputLong(MinionsGui gui, Text title, String defaultValue) { public static CompletableFuture<Long> inputLong(MinionsGui gui, Component title, String defaultValue) {
return inputSync(gui, title, defaultValue, string -> Result.wrapCustomError(() -> Long.valueOf(string), Text.translatable("minions.command.input.int.fail"))); return inputSync(gui, title, defaultValue, string -> Result.wrapCustomError(() -> Long.valueOf(string), Component.translatable("minions.command.input.int.fail")));
} }
public static CompletableFuture<Double> inputDouble(ServerPlayerEntity player, Text title, String defaultValue) { public static CompletableFuture<Double> inputDouble(ServerPlayer player, Component title, String defaultValue) {
return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Double.valueOf(string), Text.translatable("minions.command.input.float.fail"))); return inputSync(player, title, defaultValue, string -> Result.wrapCustomError(() -> Double.valueOf(string), Component.translatable("minions.command.input.float.fail")));
} }
public static CompletableFuture<Double> inputDouble(MinionsGui gui, Text title, String defaultValue) { public static CompletableFuture<Double> inputDouble(MinionsGui gui, Component title, String defaultValue) {
return inputSync(gui, title, defaultValue, string -> Result.wrapCustomError(() -> Double.valueOf(string), Text.translatable("minions.command.input.float.fail"))); return inputSync(gui, title, defaultValue, string -> Result.wrapCustomError(() -> Double.valueOf(string), Component.translatable("minions.command.input.float.fail")));
} }
@Override @Override
@@ -96,10 +95,10 @@ public class TextInput<T> extends AnvilInputGui {
parser.apply(input).thenAccept(result -> { parser.apply(input).thenAccept(result -> {
this.result = result; this.result = result;
if(result.isSuccess()) { if(result.isSuccess()) {
setSlot(AnvilScreenHandler.OUTPUT_ID, valid); setSlot(AnvilMenu.RESULT_SLOT, valid);
} else { } else {
Text text = result.getErrorOrThrow(); Component text = result.getErrorOrThrow();
setSlot(AnvilScreenHandler.OUTPUT_ID, invalid.setName(text)); setSlot(AnvilMenu.RESULT_SLOT, invalid.setName(text));
} }
}); });
} }
src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java
+15 -15
View File
@@ -15,10 +15,10 @@ import io.github.skippyall.minions.program.supplier.ValueSupplierList;
import io.github.skippyall.minions.program.supplier.ValueSupplierType; import io.github.skippyall.minions.program.supplier.ValueSupplierType;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.util.TranslationUtil; import io.github.skippyall.minions.util.TranslationUtil;
import net.minecraft.item.ItemStack; import net.minecraft.network.chat.Component;
import net.minecraft.item.Items; import net.minecraft.world.inventory.MenuType;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.world.item.ItemStack;
import net.minecraft.text.Text; import net.minecraft.world.item.Items;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class ArgumentGui extends MinionsGui { public class ArgumentGui extends MinionsGui {
@@ -59,16 +59,16 @@ public class ArgumentGui extends MinionsGui {
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
} }
}; };
gui.setTitle(Text.translatable( gui.setTitle(Component.translatable(
"minions.gui.instruction.argument.title", "minions.gui.instruction.argument.title",
parameter.name(), parameter.name(),
Text.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES)) Component.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES))
)); ));
updateTypeConfiguration(); updateTypeConfiguration();
@@ -80,14 +80,14 @@ public class ArgumentGui extends MinionsGui {
private void updateTypeConfiguration() { private void updateTypeConfiguration() {
ItemStack displayStack; ItemStack displayStack;
if(argumentType != null) { if(argumentType != null) {
displayStack = GuiDisplay.getDisplayStack(MinionRegistries.VALUE_SUPPLIER_TYPES, argumentType, viewer.getRegistryManager()); displayStack = GuiDisplay.getDisplayStack(MinionRegistries.VALUE_SUPPLIER_TYPES, argumentType, viewer.registryAccess());
} else { } else {
displayStack = new ItemStack(Items.BARRIER); displayStack = new ItemStack(Items.BARRIER);
} }
gui.setSlot(3, new GuiElementBuilder(displayStack) gui.setSlot(3, new GuiElementBuilder(displayStack)
.setName(Text.translatable("minions.gui.instruction.argument.configure.type")) .setName(Component.translatable("minions.gui.instruction.argument.configure.type"))
.addLoreLine(Text.translatable(TranslationUtil.getTranslationKey( .addLoreLine(Component.translatable(TranslationUtil.getTranslationKey(
argumentType, argumentType,
MinionRegistries.VALUE_SUPPLIER_TYPES, MinionRegistries.VALUE_SUPPLIER_TYPES,
"minions.gui.not_set" "minions.gui.not_set"
@@ -99,8 +99,8 @@ public class ArgumentGui extends MinionsGui {
private void updateArgumentConfiguration() { private void updateArgumentConfiguration() {
if(argumentType != null) { if(argumentType != null) {
gui.setSlot(4, new GuiElementBuilder(Items.STRUCTURE_VOID) gui.setSlot(4, new GuiElementBuilder(Items.STRUCTURE_VOID)
.setName(Text.translatable("minions.gui.instruction.argument.configure.data")) .setName(Component.translatable("minions.gui.instruction.argument.configure.data"))
.addLoreLine(getArgument() != null ? getArgument().getDisplayText() : Text.translatable("minions.gui.not_set")) .addLoreLine(getArgument() != null ? getArgument().getDisplayText() : Component.translatable("minions.gui.not_set"))
.setCallback(() -> argumentType.openConfiguration(this, parameter.type(), getArgument()) .setCallback(() -> argumentType.openConfiguration(this, parameter.type(), getArgument())
.thenAccept(newArgument -> { .thenAccept(newArgument -> {
setArgument(newArgument); setArgument(newArgument);
@@ -116,7 +116,7 @@ public class ArgumentGui extends MinionsGui {
private void updateConverterConfiguration() { private void updateConverterConfiguration() {
if(entry != null) { if(entry != null) {
gui.setSlot(5, new GuiElementBuilder(Items.CRAFTER) gui.setSlot(5, new GuiElementBuilder(Items.CRAFTER)
.setName(Text.translatable("minions.gui.instruction.converters")) .setName(Component.translatable("minions.gui.instruction.converters"))
.setCallback(this::configureConvertersMenu) .setCallback(this::configureConvertersMenu)
); );
} }
@@ -145,8 +145,8 @@ public class ArgumentGui extends MinionsGui {
} }
public void selectArgumentType() { public void selectArgumentType() {
PaginatedList.createList(this, Text.translatable("minions.gui.instruction.argument.configure.type.title"), MinionRegistries.VALUE_SUPPLIER_TYPES, (type, me) -> PaginatedList.createList(this, Component.translatable("minions.gui.instruction.argument.configure.type.title"), MinionRegistries.VALUE_SUPPLIER_TYPES, (type, me) ->
new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_SUPPLIER_TYPES, type, viewer.getRegistryManager())) new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_SUPPLIER_TYPES, type, viewer.registryAccess()))
.setCallback(() -> { .setCallback(() -> {
setArgumentType(type); setArgumentType(type);
me.close(); me.close();
src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java
+19 -19
View File
@@ -12,11 +12,11 @@ import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener;
import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.Parameter;
import net.minecraft.item.Items; import net.minecraft.network.chat.Component;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.sounds.SoundEvents;
import net.minecraft.sound.SoundCategory; import net.minecraft.sounds.SoundSource;
import net.minecraft.sound.SoundEvents; import net.minecraft.world.inventory.MenuType;
import net.minecraft.text.Text; import net.minecraft.world.item.Items;
public class ConfigureInstructionGui extends MinionsGui implements ConfiguredInstructionListener, MinionListener { public class ConfigureInstructionGui extends MinionsGui implements ConfiguredInstructionListener, MinionListener {
private String name; private String name;
@@ -40,17 +40,17 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
} }
}; };
gui.setTitle(Text.literal(name)); gui.setTitle(Component.literal(name));
gui.setSlot(7, new GuiElementBuilder(Items.ANVIL) gui.setSlot(7, new GuiElementBuilder(Items.ANVIL)
.setName(Text.translatable("minions.gui.instruction.configure.rename")) .setName(Component.translatable("minions.gui.instruction.configure.rename"))
.setCallback(() -> InstructionGui.inputInstructionName(this, context, name).thenAccept(newName -> { .setCallback(() -> InstructionGui.inputInstructionName(this, context, name).thenAccept(newName -> {
minion.getInstructionManager().setInstructionName(name, newName); minion.getInstructionManager().setInstructionName(name, newName);
reopen(); reopen();
@@ -58,8 +58,8 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
); );
gui.setSlot(8, new GuiElementBuilder(Items.LAVA_BUCKET) gui.setSlot(8, new GuiElementBuilder(Items.LAVA_BUCKET)
.setName(Text.translatable("minions.gui.instruction.configure.delete")) .setName(Component.translatable("minions.gui.instruction.configure.delete"))
.setCallback(() -> ChoiceInput.confirm(this, Text.translatable("minions.gui.instruction.configure.delete.confirm", name)) .setCallback(() -> ChoiceInput.confirm(this, Component.translatable("minions.gui.instruction.configure.delete.confirm", name))
.thenAccept(v -> { .thenAccept(v -> {
minion.getInstructionManager().removeInstruction(name); minion.getInstructionManager().removeInstruction(name);
close(); close();
@@ -68,14 +68,14 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
updateSuppliers(); updateSuppliers();
gui.setSlot(13, InstructionGui.createInstructionElement(instruction.getInstruction(), viewer.getRegistryManager())); gui.setSlot(13, InstructionGui.createInstructionElement(instruction.getInstruction(), viewer.registryAccess()));
gui.setSlot(25, new GuiElementBuilder(Items.FEATHER) gui.setSlot(25, new GuiElementBuilder(Items.FEATHER)
.setName(Text.translatable("minions.gui.instruction.configure.copy")) .setName(Component.translatable("minions.gui.instruction.configure.copy"))
.addLoreLine(Text.translatable("minions.gui.instruction.configure.copy.description")) .addLoreLine(Component.translatable("minions.gui.instruction.configure.copy.description"))
.setCallback(() -> { .setCallback(() -> {
viewer.getInventory().offer(ClipboardItem.createInstructionReference(minion, name), true); viewer.getInventory().placeItemBackInInventory(ClipboardItem.createInstructionReference(minion, name), true);
viewer.playSoundToPlayer(SoundEvents.BLOCK_NOTE_BLOCK_CHIME.value(), SoundCategory.BLOCKS, 1, 1); viewer.playNotifySound(SoundEvents.NOTE_BLOCK_CHIME.value(), SoundSource.BLOCKS, 1, 1);
}) })
); );
@@ -92,7 +92,7 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
@Override @Override
public void onInstructionRename(MinionFakePlayer minion, ConfiguredInstruction<?> instruction, String oldName, String newName) { public void onInstructionRename(MinionFakePlayer minion, ConfiguredInstruction<?> instruction, String oldName, String newName) {
gui.setTitle(Text.literal(newName)); gui.setTitle(Component.literal(newName));
name = newName; name = newName;
context.setName(newName); context.setName(newName);
} }
@@ -115,12 +115,12 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
private void updateRunSlot() { private void updateRunSlot() {
if(!instruction.isRunning()) { if(!instruction.isRunning()) {
gui.setSlot(26, new GuiElementBuilder(Items.ARROW) gui.setSlot(26, new GuiElementBuilder(Items.ARROW)
.setName(Text.translatable("minions.gui.instruction.run")) .setName(Component.translatable("minions.gui.instruction.run"))
.setCallback(() -> instruction.run(minion.getInstructionManager())) .setCallback(() -> instruction.run(minion.getInstructionManager()))
); );
} else { } else {
gui.setSlot(26, new GuiElementBuilder(Items.BARRIER) gui.setSlot(26, new GuiElementBuilder(Items.BARRIER)
.setName(Text.translatable("minions.gui.instruction.stop")) .setName(Component.translatable("minions.gui.instruction.stop"))
.setCallback(() -> instruction.stop(minion.getInstructionManager())) .setCallback(() -> instruction.stop(minion.getInstructionManager()))
); );
} }
@@ -129,7 +129,7 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
private void updateSuppliers() { private void updateSuppliers() {
int slot = 12; int slot = 12;
for(Parameter<?> parameter : instruction.getInstruction().getParameters().reversed()) { for(Parameter<?> parameter : instruction.getInstruction().getParameters().reversed()) {
gui.setSlot(slot, InstructionGui.createParameterElement(parameter, instruction.getArguments().getArgument(parameter), viewer.getRegistryManager()) gui.setSlot(slot, InstructionGui.createParameterElement(parameter, instruction.getArguments().getArgument(parameter), viewer.registryAccess())
.setCallback(() -> new ArgumentGui(this, GuiContext.ValueSupplier.create(context, parameter))) .setCallback(() -> new ArgumentGui(this, GuiContext.ValueSupplier.create(context, parameter)))
); );
slot--; slot--;
src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java
+12 -12
View File
@@ -10,10 +10,10 @@ import io.github.skippyall.minions.program.conversion.ValueConverter;
import io.github.skippyall.minions.program.conversion.ValueConverterType; import io.github.skippyall.minions.program.conversion.ValueConverterType;
import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.program.value.ValueType;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.item.Items; import net.minecraft.core.RegistryAccess;
import net.minecraft.registry.DynamicRegistryManager; import net.minecraft.network.chat.Component;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.world.inventory.MenuType;
import net.minecraft.text.Text; import net.minecraft.world.item.Items;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
public class ConverterGui extends MinionsGui { public class ConverterGui extends MinionsGui {
@@ -42,14 +42,14 @@ public class ConverterGui extends MinionsGui {
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.instruction.converter.title")); gui.setTitle(Component.translatable("minions.gui.instruction.converter.title"));
updateTypeDisplay(); updateTypeDisplay();
updateConverterDisplay(); updateConverterDisplay();
@@ -63,15 +63,15 @@ public class ConverterGui extends MinionsGui {
} }
private void updateTypeDisplay() { private void updateTypeDisplay() {
gui.setSlot(3, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, valueConverterType, viewer.getRegistryManager())) gui.setSlot(3, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, valueConverterType, viewer.registryAccess()))
.setCallback(this::configureType) .setCallback(this::configureType)
); );
} }
private void updateConverterDisplay() { private void updateConverterDisplay() {
gui.setSlot(5, new GuiElementBuilder(Items.STRUCTURE_VOID) gui.setSlot(5, new GuiElementBuilder(Items.STRUCTURE_VOID)
.setName(Text.translatable("minions.gui.instruction.converter.title")) .setName(Component.translatable("minions.gui.instruction.converter.title"))
.addLoreLine(converter == null ? Text.translatable("minions.gui.not_set") : converter.getDisplayText()) .addLoreLine(converter == null ? Component.translatable("minions.gui.not_set") : converter.getDisplayText())
.setCallback(this::configureData) .setCallback(this::configureData)
); );
} }
@@ -100,10 +100,10 @@ public class ConverterGui extends MinionsGui {
private void configureType() { private void configureType() {
PaginatedList.createList( PaginatedList.createList(
this, this,
Text.translatable("minions.gui.instruction.converter.type.title"), Component.translatable("minions.gui.instruction.converter.type.title"),
MinionRegistries.VALUE_CONVERTER_TYPES, MinionRegistries.VALUE_CONVERTER_TYPES,
(type, me) -> new GuiElementBuilder( (type, me) -> new GuiElementBuilder(
GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, type, viewer.getRegistryManager()) GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, type, viewer.registryAccess())
).setCallback(() -> { ).setCallback(() -> {
setType(type); setType(type);
me.close(); me.close();
@@ -123,7 +123,7 @@ public class ConverterGui extends MinionsGui {
} }
} }
public static GuiElementBuilder createConverterElement(ValueConverter<?,?> converter, DynamicRegistryManager manager) { public static GuiElementBuilder createConverterElement(ValueConverter<?,?> converter, RegistryAccess manager) {
GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), manager)); GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), manager));
builder.addLoreLine(converter.getDisplayText()); builder.addLoreLine(converter.getDisplayText());
return builder; return builder;
src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java
+9 -9
View File
@@ -9,9 +9,9 @@ import io.github.skippyall.minions.program.conversion.ValueConverter;
import io.github.skippyall.minions.program.value.ValueType; import io.github.skippyall.minions.program.value.ValueType;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.util.TranslationUtil; import io.github.skippyall.minions.util.TranslationUtil;
import net.minecraft.item.Items; import net.minecraft.network.chat.Component;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.world.inventory.MenuType;
import net.minecraft.text.Text; import net.minecraft.world.item.Items;
public class ConverterListGui extends MinionsGui { public class ConverterListGui extends MinionsGui {
private ConverterList converters; private ConverterList converters;
@@ -32,14 +32,14 @@ public class ConverterListGui extends MinionsGui {
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.instruction.converters")); gui.setTitle(Component.translatable("minions.gui.instruction.converters"));
updateConverters(); updateConverters();
@@ -81,7 +81,7 @@ public class ConverterListGui extends MinionsGui {
ValueType<?> fromType = actualConverterIndex >= 1 ? converters.getConverters().get(actualConverterIndex - 1).getTo() : inputType; ValueType<?> fromType = actualConverterIndex >= 1 ? converters.getConverters().get(actualConverterIndex - 1).getTo() : inputType;
ValueType<?> toType = actualConverterIndex < converters.getConverters().size() - 1 ? converters.getConverters().get(actualConverterIndex + 1).getFrom() : outputType; ValueType<?> toType = actualConverterIndex < converters.getConverters().size() - 1 ? converters.getConverters().get(actualConverterIndex + 1).getFrom() : outputType;
gui.setSlot(slot, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), viewer.getRegistryManager())) gui.setSlot(slot, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, converter.getType(), viewer.registryAccess()))
.addLoreLine(converter.getDisplayText()) .addLoreLine(converter.getDisplayText())
.setCallback(() -> new ConverterGui(this, converter, fromType, toType, converters, false, actualConverterIndex)) .setCallback(() -> new ConverterGui(this, converter, fromType, toType, converters, false, actualConverterIndex))
); );
@@ -91,10 +91,10 @@ public class ConverterListGui extends MinionsGui {
ValueType<?> toType = actualConverterIndex < converters.getConverters().size() - 1 ? converters.getConverters().get(actualConverterIndex + 1).getFrom() : outputType; ValueType<?> toType = actualConverterIndex < converters.getConverters().size() - 1 ? converters.getConverters().get(actualConverterIndex + 1).getFrom() : outputType;
gui.setSlot(slot + 1, new GuiElementBuilder(Items.MAGENTA_GLAZED_TERRACOTTA) gui.setSlot(slot + 1, new GuiElementBuilder(Items.MAGENTA_GLAZED_TERRACOTTA)
.setName(Text.translatable( .setName(Component.translatable(
"minions.gui.instruction.converters.cast", "minions.gui.instruction.converters.cast",
Text.translatable(TranslationUtil.getTranslationKey(fromType, MinionRegistries.VALUE_TYPES)), Component.translatable(TranslationUtil.getTranslationKey(fromType, MinionRegistries.VALUE_TYPES)),
Text.translatable(TranslationUtil.getTranslationKey(toType, MinionRegistries.VALUE_TYPES)) Component.translatable(TranslationUtil.getTranslationKey(toType, MinionRegistries.VALUE_TYPES))
)) ))
.setCallback(() -> new ConverterGui(this, null, fromType, toType, converters, true, actualConverterIndex + 1)) .setCallback(() -> new ConverterGui(this, null, fromType, toType, converters, true, actualConverterIndex + 1))
); );
src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java
+33 -33
View File
@@ -18,38 +18,38 @@ import io.github.skippyall.minions.program.supplier.ValueSupplier;
import io.github.skippyall.minions.registration.MinionComponentTypes; import io.github.skippyall.minions.registration.MinionComponentTypes;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.util.TranslationUtil; import io.github.skippyall.minions.util.TranslationUtil;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.registry.DynamicRegistryManager;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.NoSuchElementException; import java.util.NoSuchElementException;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.core.RegistryAccess;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
public class InstructionGui { public class InstructionGui {
public static MinionsGui openInstructionMainMenu(MinionsGui parent, GuiContext.Minion context) { public static MinionsGui openInstructionMainMenu(MinionsGui parent, GuiContext.Minion context) {
return new SimpleMinionsGui(parent, (onClose, me) -> { return new SimpleMinionsGui(parent, (onClose, me) -> {
ServerPlayerEntity player = parent.getViewer(); ServerPlayer player = parent.getViewer();
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, player, false) { SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, player, false) {
@Override @Override
public void onClose() { public void onClose() {
onClose.run(); onClose.run();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.instruction.title")); gui.setTitle(Component.translatable("minions.gui.instruction.title"));
gui.setSlot(3, new GuiElementBuilder() gui.setSlot(3, new GuiElementBuilder()
.setItem(Items.BOOK) .setItem(Items.BOOK)
.setName(Text.translatable("minions.gui.instruction.list")) .setName(Component.translatable("minions.gui.instruction.list"))
.setCallback(() -> new InstructionListGui(me, context)) .setCallback(() -> new InstructionListGui(me, context))
); );
gui.setSlot(5, new GuiElementBuilder() gui.setSlot(5, new GuiElementBuilder()
.setItem(Items.WRITABLE_BOOK) .setItem(Items.WRITABLE_BOOK)
.setName(Text.translatable("minions.gui.instruction.create")) .setName(Component.translatable("minions.gui.instruction.create"))
.setCallback(() -> createNewInstruction(me, context)) .setCallback(() -> createNewInstruction(me, context))
); );
@@ -60,10 +60,10 @@ public class InstructionGui {
public static void createNewInstruction(MinionsGui parent, GuiContext.Minion context) { public static void createNewInstruction(MinionsGui parent, GuiContext.Minion context) {
MinionFakePlayer minion = context.getMinion(); MinionFakePlayer minion = context.getMinion();
ServerPlayerEntity viewer = parent.getViewer(); ServerPlayer viewer = parent.getViewer();
selectInstructionModuleMenu(parent, context).thenAccept(instructionType -> selectInstructionModuleMenu(parent, context).thenAccept(instructionType ->
inputInstructionName(parent, context, "Instruction").thenAccept(name -> { inputInstructionName(parent, context, "Instruction").thenAccept(name -> {
if (!minion.isRemoved() && !minion.isDisconnected()) { if (!minion.isRemoved() && !minion.hasDisconnected()) {
ConfiguredInstruction<MinionRuntime> configuredInstruction = minion.getInstructionManager().createInstruction(name, instructionType); ConfiguredInstruction<MinionRuntime> configuredInstruction = minion.getInstructionManager().createInstruction(name, instructionType);
new ConfigureInstructionGui(parent, GuiContext.Instruction.create(context, configuredInstruction, name)); new ConfigureInstructionGui(parent, GuiContext.Instruction.create(context, configuredInstruction, name));
} }
@@ -72,36 +72,36 @@ public class InstructionGui {
} }
public static CompletableFuture<String> inputInstructionName(MinionsGui parent, GuiContext.Minion context, String defaultValue) { public static CompletableFuture<String> inputInstructionName(MinionsGui parent, GuiContext.Minion context, String defaultValue) {
return TextInput.inputSync(parent, Text.translatable("minions.gui.instruction.enter_name"), defaultValue, name -> { return TextInput.inputSync(parent, Component.translatable("minions.gui.instruction.enter_name"), defaultValue, name -> {
if (context.getMinion().getInstructionManager().hasInstruction(name)) { if (context.getMinion().getInstructionManager().hasInstruction(name)) {
return new Result.Error<>(Text.translatable("minions.gui.instruction.name_already_used")); return new Result.Error<>(Component.translatable("minions.gui.instruction.name_already_used"));
} }
return new Result.Success<>(name); return new Result.Success<>(name);
}); });
} }
public static boolean checkInstructionExists(String name, ConfiguredInstruction<?> instruction, MinionFakePlayer minion, ServerPlayerEntity player) { public static boolean checkInstructionExists(String name, ConfiguredInstruction<?> instruction, MinionFakePlayer minion, ServerPlayer player) {
boolean stillExists = !minion.isRemoved() && !minion.isDisconnected() && minion.getInstructionManager().getInstruction(name) == instruction; boolean stillExists = !minion.isRemoved() && !minion.hasDisconnected() && minion.getInstructionManager().getInstruction(name) == instruction;
if (!stillExists) { if (!stillExists) {
player.closeHandledScreen(); player.closeContainer();
player.sendMessage(Text.translatable("minions.gui.instruction.removed")); player.sendSystemMessage(Component.translatable("minions.gui.instruction.removed"));
} }
return stillExists; return stillExists;
} }
public static CompletableFuture<InstructionType<MinionRuntime>> selectInstructionModuleMenu(MinionsGui parent, GuiContext.Minion context) { public static CompletableFuture<InstructionType<MinionRuntime>> selectInstructionModuleMenu(MinionsGui parent, GuiContext.Minion context) {
MinionFakePlayer minion = context.getMinion(); MinionFakePlayer minion = context.getMinion();
ServerPlayerEntity viewer = parent.getViewer(); ServerPlayer viewer = parent.getViewer();
if (minion.getModuleInventory().getModules().isEmpty()) { if (minion.getModuleInventory().getModules().isEmpty()) {
viewer.sendMessage(Text.translatable("minions.gui.instruction.no_modules")); viewer.sendSystemMessage(Component.translatable("minions.gui.instruction.no_modules"));
return CompletableFuture.failedFuture(new NoSuchElementException("No modules")); return CompletableFuture.failedFuture(new NoSuchElementException("No modules"));
} }
CompletableFuture<InstructionType<MinionRuntime>> future = new CompletableFuture<>(); CompletableFuture<InstructionType<MinionRuntime>> future = new CompletableFuture<>();
new SimpleMinionsGui(parent, (closeHandler, me) -> { new SimpleMinionsGui(parent, (closeHandler, me) -> {
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { SimpleGui gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
if (!future.isDone()) { if (!future.isDone()) {
@@ -110,10 +110,10 @@ public class InstructionGui {
closeHandler.run(); closeHandler.run();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.instruction.select_instruction")); gui.setTitle(Component.translatable("minions.gui.instruction.select_instruction"));
for (int i = 0; i < minion.getModuleInventory().size(); i++) { for (int i = 0; i < minion.getModuleInventory().getContainerSize(); i++) {
ItemStack moduleItem = minion.getModuleInventory().getStack(i); ItemStack moduleItem = minion.getModuleInventory().getItem(i);
MinionModule module = moduleItem.get(MinionComponentTypes.MODULE); MinionModule module = moduleItem.get(MinionComponentTypes.MODULE);
if (module != null && !module.instructions().isEmpty()) { if (module != null && !module.instructions().isEmpty()) {
gui.addSlot(new GuiElementBuilder(moduleItem) gui.addSlot(new GuiElementBuilder(moduleItem)
@@ -134,7 +134,7 @@ public class InstructionGui {
CompletableFuture<InstructionType<MinionRuntime>> future = new CompletableFuture<>(); CompletableFuture<InstructionType<MinionRuntime>> future = new CompletableFuture<>();
new SimpleMinionsGui(parent, (closeHandler, me) -> { new SimpleMinionsGui(parent, (closeHandler, me) -> {
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, parent.getViewer(), false) { SimpleGui gui = new SimpleGui(MenuType.GENERIC_9x3, parent.getViewer(), false) {
@Override @Override
public void onClose() { public void onClose() {
if (!future.isDone()) { if (!future.isDone()) {
@@ -143,10 +143,10 @@ public class InstructionGui {
closeHandler.run(); closeHandler.run();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.instruction.select_instruction")); gui.setTitle(Component.translatable("minions.gui.instruction.select_instruction"));
for (InstructionType<MinionRuntime> instructionType : module.instructions()) { for (InstructionType<MinionRuntime> instructionType : module.instructions()) {
gui.addSlot(createInstructionElement(instructionType, parent.getViewer().getRegistryManager()) gui.addSlot(createInstructionElement(instructionType, parent.getViewer().registryAccess())
.setCallback(() -> future.complete(instructionType)) .setCallback(() -> future.complete(instructionType))
); );
} }
@@ -157,22 +157,22 @@ public class InstructionGui {
return future; return future;
} }
public static GuiElementBuilder createInstructionElement(InstructionType<MinionRuntime> instructionType, DynamicRegistryManager manager) { public static GuiElementBuilder createInstructionElement(InstructionType<MinionRuntime> instructionType, RegistryAccess manager) {
GuiElementBuilder instructionBuilder; GuiElementBuilder instructionBuilder;
if (instructionType != null) { if (instructionType != null) {
instructionBuilder = new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.INSTRUCTION_TYPES, instructionType, manager)); instructionBuilder = new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.INSTRUCTION_TYPES, instructionType, manager));
} else { } else {
instructionBuilder = new GuiElementBuilder(Items.RED_WOOL) instructionBuilder = new GuiElementBuilder(Items.RED_WOOL)
.setName(Text.translatable("minions.gui.instruction.no_instruction_set")); .setName(Component.translatable("minions.gui.instruction.no_instruction_set"));
} }
return instructionBuilder; return instructionBuilder;
} }
public static GuiElementBuilder createParameterElement(Parameter<?> parameter, @Nullable ValueSupplier<?,?> valueSupplier, DynamicRegistryManager manager) { public static GuiElementBuilder createParameterElement(Parameter<?> parameter, @Nullable ValueSupplier<?,?> valueSupplier, RegistryAccess manager) {
GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_TYPES, parameter.type(), manager)) GuiElementBuilder builder = new GuiElementBuilder(GuiDisplay.getDisplayStack(MinionRegistries.VALUE_TYPES, parameter.type(), manager))
.setName(Text.translatable("minions.gui.instruction.parameter", parameter.name(), Text.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES)))); .setName(Component.translatable("minions.gui.instruction.parameter", parameter.name(), Component.translatable(TranslationUtil.getTranslationKey(parameter.type(), MinionRegistries.VALUE_TYPES))));
if(valueSupplier != null) { if(valueSupplier != null) {
builder.addLoreLine(Text.translatable("minions.gui.instruction.argument", valueSupplier.getDisplayText())); builder.addLoreLine(Component.translatable("minions.gui.instruction.argument", valueSupplier.getDisplayText()));
} }
return builder; return builder;
} }
src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java
+6 -6
View File
@@ -10,8 +10,8 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.network.chat.Component;
import net.minecraft.text.Text; import net.minecraft.world.inventory.MenuType;
public class InstructionListGui extends MinionsGui implements MinionListener { public class InstructionListGui extends MinionsGui implements MinionListener {
private final GuiContext.Minion context; private final GuiContext.Minion context;
@@ -33,13 +33,13 @@ public class InstructionListGui extends MinionsGui implements MinionListener {
@Override @Override
protected void open() { protected void open() {
minion.addMinionListener(this); minion.addMinionListener(this);
gui = new SimpleGui(ScreenHandlerType.GENERIC_9X3, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.instruction.title")); gui.setTitle(Component.translatable("minions.gui.instruction.title"));
resetInstructionList(); resetInstructionList();
gui.open(); gui.open();
} }
@@ -59,8 +59,8 @@ public class InstructionListGui extends MinionsGui implements MinionListener {
int i = 0; int i = 0;
for (String instructionName : minion.getInstructionManager().getInstructionNames()) { for (String instructionName : minion.getInstructionManager().getInstructionNames()) {
ConfiguredInstruction<MinionRuntime> instruction = minion.getInstructionManager().getInstruction(instructionName); ConfiguredInstruction<MinionRuntime> instruction = minion.getInstructionManager().getInstruction(instructionName);
gui.setSlot(i, new GuiElementBuilder(GuiDisplay.getGuiDisplayFor(MinionRegistries.INSTRUCTION_TYPES, instruction.getInstruction(), viewer.getRegistryManager()).createItemStack()) gui.setSlot(i, new GuiElementBuilder(GuiDisplay.getGuiDisplayFor(MinionRegistries.INSTRUCTION_TYPES, instruction.getInstruction(), viewer.registryAccess()).createItemStack())
.setName(Text.literal(instructionName)) .setName(Component.literal(instructionName))
.setCallback(() -> new ConfigureInstructionGui(this, GuiContext.Instruction.create(context, instruction, instructionName))) .setCallback(() -> new ConfigureInstructionGui(this, GuiContext.Instruction.create(context, instruction, instructionName)))
); );
i++; i++;
src/main/java/io/github/skippyall/minions/gui/minion/GuiContext.java
+3 -3
View File
@@ -4,12 +4,12 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.Parameter;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerPlayer;
public interface GuiContext { public interface GuiContext {
ServerPlayerEntity getViewer(); ServerPlayer getViewer();
static GuiContext create(ServerPlayerEntity viewer) { static GuiContext create(ServerPlayer viewer) {
return new GuiContextImpl(viewer); return new GuiContextImpl(viewer);
} }
src/main/java/io/github/skippyall/minions/gui/minion/GuiContextImpl.java
+5 -5
View File
@@ -4,18 +4,18 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction; import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.Parameter;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerPlayer;
//If only this mod was kotlin //If only this mod was kotlin
public class GuiContextImpl implements GuiContext { public class GuiContextImpl implements GuiContext {
private final ServerPlayerEntity viewer; private final ServerPlayer viewer;
public GuiContextImpl(ServerPlayerEntity viewer) { public GuiContextImpl(ServerPlayer viewer) {
this.viewer = viewer; this.viewer = viewer;
} }
@Override @Override
public ServerPlayerEntity getViewer() { public ServerPlayer getViewer() {
return viewer; return viewer;
} }
@@ -81,7 +81,7 @@ public class GuiContextImpl implements GuiContext {
} }
@Override @Override
public ServerPlayerEntity getViewer() { public ServerPlayer getViewer() {
return context.getViewer(); return context.getViewer();
} }
} }
src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java
+11 -11
View File
@@ -7,16 +7,16 @@ import io.github.skippyall.minions.gui.instruction.InstructionGui;
import io.github.skippyall.minions.minion.MinionListener; import io.github.skippyall.minions.minion.MinionListener;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.module.ModuleInventory; import io.github.skippyall.minions.module.ModuleInventory;
import net.minecraft.item.Items; import net.minecraft.network.chat.Component;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.world.inventory.MenuType;
import net.minecraft.text.Text; import net.minecraft.world.item.Items;
public class MinionGui extends MinionsGui implements MinionListener { public class MinionGui extends MinionsGui implements MinionListener {
private final MinionFakePlayer minion; private final MinionFakePlayer minion;
private SimpleGui gui; private SimpleGui gui;
public MinionGui(ServerPlayerEntity viewer, MinionFakePlayer minion) { public MinionGui(ServerPlayer viewer, MinionFakePlayer minion) {
super(viewer); super(viewer);
this.minion = minion; this.minion = minion;
minion.addMinionListener(this); minion.addMinionListener(this);
@@ -29,7 +29,7 @@ public class MinionGui extends MinionsGui implements MinionListener {
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
@@ -40,27 +40,27 @@ public class MinionGui extends MinionsGui implements MinionListener {
gui.setSlot(1, new GuiElementBuilder() gui.setSlot(1, new GuiElementBuilder()
.setItem(Items.COMMAND_BLOCK) .setItem(Items.COMMAND_BLOCK)
.setName(Text.translatable("minions.gui.main.instructions")) .setName(Component.translatable("minions.gui.main.instructions"))
.setCallback(() -> { .setCallback(() -> {
InstructionGui.openInstructionMainMenu(this, GuiContext.Minion.create(GuiContext.create(viewer), minion)); InstructionGui.openInstructionMainMenu(this, GuiContext.Minion.create(GuiContext.create(viewer), minion));
}) })
); );
gui.setSlot(3, new GuiElementBuilder() gui.setSlot(3, new GuiElementBuilder()
.setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE) .setItem(Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
.setName(Text.translatable("minions.gui.main.modules")) .setName(Component.translatable("minions.gui.main.modules"))
.setCallback(() -> { .setCallback(() -> {
ModuleInventory.openModuleInventory(viewer, minion); ModuleInventory.openModuleInventory(viewer, minion);
}) })
); );
gui.setSlot(5, new GuiElementBuilder() gui.setSlot(5, new GuiElementBuilder()
.setItem(Items.CHEST) .setItem(Items.CHEST)
.setName(Text.translatable("minions.gui.main.inventory")) .setName(Component.translatable("minions.gui.main.inventory"))
.setCallback(() -> new MinionInventoryGui(this)) .setCallback(() -> new MinionInventoryGui(this))
); );
gui.setSlot(7, new GuiElementBuilder() gui.setSlot(7, new GuiElementBuilder()
.setItem(Items.BARRIER) .setItem(Items.BARRIER)
.setName(Text.translatable("minions.gui.main.pickup")) .setName(Component.translatable("minions.gui.main.pickup"))
.setCallback(() -> minion.kill(minion.getWorld())) .setCallback(() -> minion.kill(minion.level()))
); );
gui.open(); gui.open();
} }
src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java
+17 -17
View File
@@ -3,14 +3,14 @@ package io.github.skippyall.minions.gui.minion;
import eu.pb4.sgui.api.gui.SimpleGui; import eu.pb4.sgui.api.gui.SimpleGui;
import io.github.skippyall.minions.gui.MinionsGui; import io.github.skippyall.minions.gui.MinionsGui;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.network.chat.Component;
import net.minecraft.entity.player.PlayerInventory; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.item.ItemStack; import net.minecraft.world.entity.player.Inventory;
import net.minecraft.item.Items; import net.minecraft.world.inventory.ArmorSlot;
import net.minecraft.screen.ScreenHandlerType; import net.minecraft.world.inventory.MenuType;
import net.minecraft.screen.slot.ArmorSlot; import net.minecraft.world.inventory.Slot;
import net.minecraft.screen.slot.Slot; import net.minecraft.world.item.ItemStack;
import net.minecraft.text.Text; import net.minecraft.world.item.Items;
public class MinionInventoryGui extends MinionsGui { public class MinionInventoryGui extends MinionsGui {
protected final MinionGui parent; protected final MinionGui parent;
@@ -27,13 +27,13 @@ public class MinionInventoryGui extends MinionsGui {
@Override @Override
protected void open() { protected void open() {
gui = new SimpleGui(ScreenHandlerType.GENERIC_9X6, viewer, false) { gui = new SimpleGui(MenuType.GENERIC_9x6, viewer, false) {
@Override @Override
public void onClose() { public void onClose() {
onBackingClosed(); onBackingClosed();
} }
}; };
gui.setTitle(Text.translatable("minions.gui.inventory.title")); gui.setTitle(Component.translatable("minions.gui.inventory.title"));
for(int i = 0; i < 18; i++) { for(int i = 0; i < 18; i++) {
gui.setSlot(i, new ItemStack(Items.BARRIER)); gui.setSlot(i, new ItemStack(Items.BARRIER));
@@ -45,17 +45,17 @@ public class MinionInventoryGui extends MinionsGui {
gui.setSlot(5, new ItemStack(Items.LEATHER_BOOTS)); gui.setSlot(5, new ItemStack(Items.LEATHER_BOOTS));
gui.setSlot(6, new ItemStack(Items.SHIELD)); gui.setSlot(6, new ItemStack(Items.SHIELD));
gui.setSlotRedirect(2 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.HEAD, EquipmentSlot.HEAD.getOffsetEntitySlotId(PlayerInventory.MAIN_SIZE), 0, 0, null)); gui.setSlotRedirect(2 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.HEAD, EquipmentSlot.HEAD.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlotRedirect(3 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.CHEST, EquipmentSlot.CHEST.getOffsetEntitySlotId(PlayerInventory.MAIN_SIZE), 0, 0, null)); gui.setSlotRedirect(3 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.CHEST, EquipmentSlot.CHEST.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlotRedirect(4 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.LEGS, EquipmentSlot.LEGS.getOffsetEntitySlotId(PlayerInventory.MAIN_SIZE), 0, 0, null)); gui.setSlotRedirect(4 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.LEGS, EquipmentSlot.LEGS.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlotRedirect(5 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.FEET, EquipmentSlot.FEET.getOffsetEntitySlotId(PlayerInventory.MAIN_SIZE), 0, 0, null)); gui.setSlotRedirect(5 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.FEET, EquipmentSlot.FEET.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlotRedirect(6 + 9, new Slot(minion.getInventory(), PlayerInventory.OFF_HAND_SLOT, 0, 0)); gui.setSlotRedirect(6 + 9, new Slot(minion.getInventory(), Inventory.SLOT_OFFHAND, 0, 0));
for (int i = PlayerInventory.HOTBAR_SIZE; i < PlayerInventory.MAIN_SIZE; i++) { for (int i = Inventory.SELECTION_SIZE; i < Inventory.INVENTORY_SIZE; i++) {
gui.setSlotRedirect(i + 9, new Slot(minion.getInventory(), i, 0, 0)); gui.setSlotRedirect(i + 9, new Slot(minion.getInventory(), i, 0, 0));
} }
for (int i = 0; i < PlayerInventory.HOTBAR_SIZE; i++) { for (int i = 0; i < Inventory.SELECTION_SIZE; i++) {
gui.setSlotRedirect(i + 45, new Slot(minion.getInventory(), i, 0, 0)); gui.setSlotRedirect(i + 45, new Slot(minion.getInventory(), i, 0, 0));
} }
gui.open(); gui.open();
src/main/java/io/github/skippyall/minions/listener/BlockEntityMinionInstructionListener.java
+6 -7
View File
@@ -2,18 +2,17 @@ package io.github.skippyall.minions.listener;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener; import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.core.BlockPos;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.resources.ResourceKey;
import net.minecraft.registry.RegistryKey;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.Level;
import net.minecraft.world.World; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
public abstract class BlockEntityMinionInstructionListener<E extends BlockEntity> extends BlockEntityMinionListener<E> { public abstract class BlockEntityMinionInstructionListener<E extends BlockEntity> extends BlockEntityMinionListener<E> {
protected BlockEntityMinionInstructionListener(RegistryKey<World> worldKey, BlockPos pos, UUID minionUuid, BlockEntityType<E> type) { protected BlockEntityMinionInstructionListener(ResourceKey<Level> worldKey, BlockPos pos, UUID minionUuid, BlockEntityType<E> type) {
super(worldKey, pos, minionUuid, type); super(worldKey, pos, minionUuid, type);
} }
src/main/java/io/github/skippyall/minions/listener/BlockEntityMinionListener.java
+20 -20
View File
@@ -6,26 +6,26 @@ import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.github.skippyall.minions.minion.MinionListener; import io.github.skippyall.minions.minion.MinionListener;
import io.github.skippyall.minions.minion.MinionPersistentState; import io.github.skippyall.minions.minion.MinionPersistentState;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.core.BlockPos;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.core.UUIDUtil;
import net.minecraft.registry.RegistryKey; import net.minecraft.resources.ResourceKey;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Uuids; import net.minecraft.world.level.Level;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.World; import net.minecraft.world.level.block.entity.BlockEntityType;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
public abstract class BlockEntityMinionListener<E extends BlockEntity> implements MinionListener { public abstract class BlockEntityMinionListener<E extends BlockEntity> implements MinionListener {
protected RegistryKey<World> worldKey; protected ResourceKey<Level> worldKey;
protected BlockPos pos; protected BlockPos pos;
protected UUID minionUuid; protected UUID minionUuid;
protected BlockEntityType<E> type; protected BlockEntityType<E> type;
protected @Nullable MinionFakePlayer minion; protected @Nullable MinionFakePlayer minion;
protected BlockEntityMinionListener(RegistryKey<World> worldKey, BlockPos pos, UUID minionUuid, BlockEntityType<E> type) { protected BlockEntityMinionListener(ResourceKey<Level> worldKey, BlockPos pos, UUID minionUuid, BlockEntityType<E> type) {
this.worldKey = worldKey; this.worldKey = worldKey;
this.pos = pos; this.pos = pos;
this.minionUuid = minionUuid; this.minionUuid = minionUuid;
@@ -45,10 +45,10 @@ public abstract class BlockEntityMinionListener<E extends BlockEntity> implement
this.minion = null; this.minion = null;
} }
public static <T extends BlockEntityMinionListener<?>> T getListener(World world, BlockPos pos, UUID minionUuid, Class<T> clazz) { public static <T extends BlockEntityMinionListener<?>> T getListener(Level world, BlockPos pos, UUID minionUuid, Class<T> clazz) {
if(minionUuid != null) { if(minionUuid != null) {
for (MinionListener listener : MinionPersistentState.get(world.getServer()).getMinionData(minionUuid).listeners()) { for (MinionListener listener : MinionPersistentState.get(world.getServer()).getMinionData(minionUuid).listeners()) {
if (listener instanceof BlockEntityMinionListener<?> tl && tl.pos.equals(pos) && tl.worldKey.equals(world.getRegistryKey()) && clazz.isInstance(tl)) { if (listener instanceof BlockEntityMinionListener<?> tl && tl.pos.equals(pos) && tl.worldKey.equals(world.dimension()) && clazz.isInstance(tl)) {
return clazz.cast(tl); return clazz.cast(tl);
} }
} }
@@ -56,18 +56,18 @@ public abstract class BlockEntityMinionListener<E extends BlockEntity> implement
return null; return null;
} }
public static <L extends BlockEntityMinionListener<?>> Codec<L> getCodec(Function3<RegistryKey<World>, BlockPos, UUID, L> constructor) { public static <L extends BlockEntityMinionListener<?>> Codec<L> getCodec(Function3<ResourceKey<Level>, BlockPos, UUID, L> constructor) {
return RecordCodecBuilder.create(instance -> return RecordCodecBuilder.create(instance ->
instance.group( instance.group(
World.CODEC.fieldOf("world").forGetter(listener -> listener.worldKey), Level.RESOURCE_KEY_CODEC.fieldOf("world").forGetter(listener -> listener.worldKey),
BlockPos.CODEC.fieldOf("pos").forGetter(listener -> listener.pos), BlockPos.CODEC.fieldOf("pos").forGetter(listener -> listener.pos),
Uuids.CODEC.fieldOf("minionUuid").forGetter(listener -> listener.minionUuid) UUIDUtil.AUTHLIB_CODEC.fieldOf("minionUuid").forGetter(listener -> listener.minionUuid)
).apply(instance, constructor)); ).apply(instance, constructor));
} }
private BlockEntityState getBlockEntityState(MinecraftServer server) { private BlockEntityState getBlockEntityState(MinecraftServer server) {
World world = server.getWorld(worldKey); Level world = server.getLevel(worldKey);
if(world == null || !world.isPosLoaded(pos)) { if(world == null || !world.isLoaded(pos)) {
return BlockEntityState.UNLOADED; return BlockEntityState.UNLOADED;
} }
@@ -79,8 +79,8 @@ public abstract class BlockEntityMinionListener<E extends BlockEntity> implement
} }
public Optional<E> getBlockEntity(MinecraftServer server) { public Optional<E> getBlockEntity(MinecraftServer server) {
World world = server.getWorld(worldKey); Level world = server.getLevel(worldKey);
if(world != null && world.isPosLoaded(pos)) { if(world != null && world.isLoaded(pos)) {
return world.getBlockEntity(pos, type); return world.getBlockEntity(pos, type);
} }
return Optional.empty(); return Optional.empty();
@@ -96,13 +96,13 @@ public abstract class BlockEntityMinionListener<E extends BlockEntity> implement
public void add(MinecraftServer server) { public void add(MinecraftServer server) {
MinionPersistentState.get(server).getMinionData(minionUuid).listeners().addListener(this); MinionPersistentState.get(server).getMinionData(minionUuid).listeners().addListener(this);
MinionPersistentState.get(server).markDirty(); MinionPersistentState.get(server).setDirty();
this.minion = (MinionFakePlayer) server.getPlayerManager().getPlayer(minionUuid); this.minion = (MinionFakePlayer) server.getPlayerList().getPlayer(minionUuid);
} }
public void remove(MinecraftServer server) { public void remove(MinecraftServer server) {
MinionPersistentState.get(server).getMinionData(minionUuid).listeners().removeListener(this); MinionPersistentState.get(server).getMinionData(minionUuid).listeners().removeListener(this);
MinionPersistentState.get(server).markDirty(); MinionPersistentState.get(server).setDirty();
} }
public enum BlockEntityState { public enum BlockEntityState {
src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.java
+5 -6
View File
@@ -1,14 +1,13 @@
package io.github.skippyall.minions.listener; package io.github.skippyall.minions.listener;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import net.minecraft.registry.Registry;
import net.minecraft.util.Identifier;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet; import java.util.concurrent.CopyOnWriteArraySet;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
public class SerializableListenerManager<T extends SerializableListenerManager.SerializableListener> extends ListenerManager<T> { public class SerializableListenerManager<T extends SerializableListenerManager.SerializableListener> extends ListenerManager<T> {
public SerializableListenerManager() { public SerializableListenerManager() {
@@ -20,8 +19,8 @@ public class SerializableListenerManager<T extends SerializableListenerManager.S
} }
public static <T extends SerializableListener> Codec<SerializableListenerManager<T>> getCodec(Registry<Codec<? extends T>> registry) { public static <T extends SerializableListener> Codec<SerializableListenerManager<T>> getCodec(Registry<Codec<? extends T>> registry) {
return registry.getCodec().<T>dispatch( return registry.byNameCodec().<T>dispatch(
listener -> listener.getCodecId().map(registry::get).orElse(Codec.unit(null)), listener -> listener.getCodecId().map(registry::getValue).orElse(Codec.unit(null)),
codec -> codec.fieldOf("data") codec -> codec.fieldOf("data")
).listOf().xmap( ).listOf().xmap(
list -> new SerializableListenerManager<>(new CopyOnWriteArraySet<>(list)), list -> new SerializableListenerManager<>(new CopyOnWriteArraySet<>(list)),
@@ -38,7 +37,7 @@ public class SerializableListenerManager<T extends SerializableListenerManager.S
} }
public interface SerializableListener { public interface SerializableListener {
default Optional<Identifier> getCodecId() { default Optional<ResourceLocation> getCodecId() {
return Optional.empty(); return Optional.empty();
} }
} }
src/main/java/io/github/skippyall/minions/minion/MinionConfig.java
+4 -5
View File
@@ -2,15 +2,14 @@ package io.github.skippyall.minions.minion;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.util.Identifier;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects; import java.util.Objects;
import net.minecraft.resources.ResourceLocation;
public class MinionConfig { public class MinionConfig {
public static final Codec<MinionConfig> CODEC = Codec.<Option<?>, Object>dispatchedMap( public static final Codec<MinionConfig> CODEC = Codec.<Option<?>, Object>dispatchedMap(
MinionRegistries.MINION_CONFIG_OPTIONS.getCodec(), MinionRegistries.MINION_CONFIG_OPTIONS.byNameCodec(),
Option::codec Option::codec
).xmap(MinionConfig::new, config -> config.values); ).xmap(MinionConfig::new, config -> config.values);
@@ -44,11 +43,11 @@ public class MinionConfig {
return Objects.hashCode(values); return Objects.hashCode(values);
} }
public static Option<Boolean> booleanOption(Identifier key, boolean defaultValue) { public static Option<Boolean> booleanOption(ResourceLocation key, boolean defaultValue) {
return new Option<>(key, defaultValue, Codec.BOOL); return new Option<>(key, defaultValue, Codec.BOOL);
} }
public record Option<T>(Identifier key, T defaultValue, Codec<T> codec) { public record Option<T>(ResourceLocation key, T defaultValue, Codec<T> codec) {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (!(o instanceof Option<?> option)) return false; if (!(o instanceof Option<?> option)) return false;
src/main/java/io/github/skippyall/minions/minion/MinionData.java
+4 -5
View File
@@ -5,10 +5,9 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder; import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.github.skippyall.minions.listener.SerializableListenerManager; import io.github.skippyall.minions.listener.SerializableListenerManager;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.core.UUIDUtil;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.util.Uuids; import net.minecraft.util.ExtraCodecs;
import net.minecraft.util.dynamic.Codecs;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
@@ -22,9 +21,9 @@ public record MinionData(
) { ) {
public static final Codec<MinionData> CODEC = RecordCodecBuilder.create(instance -> public static final Codec<MinionData> CODEC = RecordCodecBuilder.create(instance ->
instance.group( instance.group(
Uuids.CODEC.fieldOf("uuid").forGetter(MinionData::uuid), UUIDUtil.AUTHLIB_CODEC.fieldOf("uuid").forGetter(MinionData::uuid),
Codec.STRING.fieldOf("name").forGetter(MinionData::name), Codec.STRING.fieldOf("name").forGetter(MinionData::name),
Codecs.GAME_PROFILE_PROPERTY_MAP.optionalFieldOf("skin").forGetter(MinionData::skin), ExtraCodecs.PROPERTY_MAP.optionalFieldOf("skin").forGetter(MinionData::skin),
Codec.BOOL.optionalFieldOf("isSpawned", false).forGetter(MinionData::isSpawned), Codec.BOOL.optionalFieldOf("isSpawned", false).forGetter(MinionData::isSpawned),
SerializableListenerManager.getCodec(MinionRegistries.MINION_LISTENER_CODECS).optionalFieldOf("listeners").xmap( SerializableListenerManager.getCodec(MinionRegistries.MINION_LISTENER_CODECS).optionalFieldOf("listeners").xmap(
optional -> optional.orElseGet(SerializableListenerManager::new), optional -> optional.orElseGet(SerializableListenerManager::new),
src/main/java/io/github/skippyall/minions/minion/MinionItem.java
+35 -35
View File
@@ -5,35 +5,35 @@ import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.gui.MinionLookGui; import io.github.skippyall.minions.gui.MinionLookGui;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionComponentTypes; import io.github.skippyall.minions.registration.MinionComponentTypes;
import net.minecraft.component.DataComponentTypes; import net.minecraft.core.component.DataComponents;
import net.minecraft.component.type.TooltipDisplayComponent; import net.minecraft.network.chat.Component;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.resources.ResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemUsageContext;
import net.minecraft.item.Items;
import net.minecraft.item.tooltip.TooltipType;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.text.Text; import net.minecraft.world.InteractionHand;
import net.minecraft.util.ActionResult; import net.minecraft.world.InteractionResult;
import net.minecraft.util.Hand; import net.minecraft.world.entity.player.Player;
import net.minecraft.util.Identifier; import net.minecraft.world.item.Item;
import net.minecraft.util.math.Vec2f; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.World; import net.minecraft.world.item.Items;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.component.TooltipDisplay;
import net.minecraft.world.item.context.UseOnContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.Vec2;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext; import xyz.nucleoid.packettweaker.PacketContext;
import java.util.function.Consumer; import java.util.function.Consumer;
public class MinionItem extends Item implements PolymerItem { public class MinionItem extends Item implements PolymerItem {
public MinionItem(Settings settings) { public MinionItem(Properties settings) {
super(settings); super(settings);
} }
@Override @Override
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context) { public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
return null; return null;
} }
@@ -43,39 +43,39 @@ public class MinionItem extends Item implements PolymerItem {
} }
@Override @Override
public ItemStack getPolymerItemStack(ItemStack stack, TooltipType tooltipType, PacketContext player) { public ItemStack getPolymerItemStack(ItemStack stack, TooltipFlag tooltipType, PacketContext player) {
ItemStack out = PolymerItemUtils.createItemStack(stack, tooltipType, player); ItemStack out = PolymerItemUtils.createItemStack(stack, tooltipType, player);
out.set(DataComponentTypes.ENCHANTMENT_GLINT_OVERRIDE, true); out.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true);
return out; return out;
} }
@Override @Override
public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent component, Consumer<Text> tooltip, TooltipType type) { public void appendHoverText(ItemStack stack, TooltipContext context, TooltipDisplay component, Consumer<Component> tooltip, TooltipFlag type) {
MinionData data = null /*getData(stack)*/; MinionData data = null /*getData(stack)*/;
if(data != null) { if(data != null) {
tooltip.accept(Text.translatable("minions.minion_item.tooltip", data.name())); tooltip.accept(Component.translatable("minions.minion_item.tooltip", data.name()));
} }
} }
@Override @Override
public ActionResult use(World world, PlayerEntity user, Hand hand) { public InteractionResult use(Level world, Player user, InteractionHand hand) {
if(user instanceof ServerPlayerEntity serverPlayer) { if(user instanceof ServerPlayer serverPlayer) {
ItemStack stack = user.getStackInHand(hand); ItemStack stack = user.getItemInHand(hand);
MinionLookGui.open(serverPlayer, stack); MinionLookGui.open(serverPlayer, stack);
return ActionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
return ActionResult.SUCCESS_SERVER; return InteractionResult.SUCCESS_SERVER;
} }
@Override @Override
public ActionResult useOnBlock(ItemUsageContext context) { public InteractionResult useOn(UseOnContext context) {
if(!context.getWorld().isClient) { if(!context.getLevel().isClientSide) {
MinionData data = getDataOrDefault(context.getWorld().getServer(), context.getStack()); MinionData data = getDataOrDefault(context.getLevel().getServer(), context.getItemInHand());
MinionFakePlayer.spawnMinion(data, (ServerWorld) context.getWorld(), context.getBlockPos().toCenterPos().add(0,0.5,0), new Vec2f(0, 0)); MinionFakePlayer.spawnMinion(data, (ServerLevel) context.getLevel(), context.getClickedPos().getCenter().add(0,0.5,0), new Vec2(0, 0));
} }
context.getStack().decrement(1); context.getItemInHand().shrink(1);
return ActionResult.SUCCESS; return InteractionResult.SUCCESS;
} }
public static void setData(MinecraftServer server, MinionData data, ItemStack item) { public static void setData(MinecraftServer server, MinionData data, ItemStack item) {
@@ -85,7 +85,7 @@ public class MinionItem extends Item implements PolymerItem {
@Nullable @Nullable
public static MinionData getData(MinecraftServer server, ItemStack item) { public static MinionData getData(MinecraftServer server, ItemStack item) {
if(item.contains(MinionComponentTypes.MINION_DATA)) { if(item.has(MinionComponentTypes.MINION_DATA)) {
return MinionPersistentState.get(server).getMinionData(item.get(MinionComponentTypes.MINION_DATA)); return MinionPersistentState.get(server).getMinionData(item.get(MinionComponentTypes.MINION_DATA));
} }
return null; return null;
@@ -101,6 +101,6 @@ public class MinionItem extends Item implements PolymerItem {
} }
public static boolean containsData(ItemStack item) { public static boolean containsData(ItemStack item) {
return item.contains(MinionComponentTypes.MINION_DATA); return item.has(MinionComponentTypes.MINION_DATA);
} }
} }
src/main/java/io/github/skippyall/minions/minion/MinionPersistentState.java
+7 -8
View File
@@ -2,20 +2,19 @@ package io.github.skippyall.minions.minion;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.world.PersistentState; import net.minecraft.world.level.Level;
import net.minecraft.world.PersistentStateType; import net.minecraft.world.level.saveddata.SavedData;
import net.minecraft.world.World; import net.minecraft.world.level.saveddata.SavedDataType;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
public class MinionPersistentState extends PersistentState { public class MinionPersistentState extends SavedData {
public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList); public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList);
public static PersistentStateType<MinionPersistentState> TYPE = new PersistentStateType<>("minion", MinionPersistentState::new, MinionPersistentState.CODEC, null); public static SavedDataType<MinionPersistentState> TYPE = new SavedDataType<>("minion", MinionPersistentState::new, MinionPersistentState.CODEC, null);
private final Map<UUID, MinionData> minionData = new HashMap<>(); private final Map<UUID, MinionData> minionData = new HashMap<>();
@@ -43,7 +42,7 @@ public class MinionPersistentState extends PersistentState {
public void updateMinionData(MinionData data) { public void updateMinionData(MinionData data) {
minionData.put(data.uuid(), data); minionData.put(data.uuid(), data);
markDirty(); setDirty();
} }
public boolean isMinion(UUID uuid) { public boolean isMinion(UUID uuid) {
@@ -61,6 +60,6 @@ public class MinionPersistentState extends PersistentState {
} }
public static MinionPersistentState get(MinecraftServer server) { public static MinionPersistentState get(MinecraftServer server) {
return server.getWorld(World.OVERWORLD).getPersistentStateManager().getOrCreate(TYPE); return server.getLevel(Level.OVERWORLD).getDataStorage().computeIfAbsent(TYPE);
} }
} }
src/main/java/io/github/skippyall/minions/minion/MinionProfileUtils.java
+8 -9
View File
@@ -5,10 +5,9 @@ import com.mojang.authlib.properties.PropertyMap;
import com.mojang.brigadier.StringReader; import com.mojang.brigadier.StringReader;
import io.github.skippyall.minions.MinionsConfig; import io.github.skippyall.minions.MinionsConfig;
import io.github.skippyall.minions.gui.input.Result; import io.github.skippyall.minions.gui.input.Result;
import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.text.Text; import net.minecraft.util.StringUtil;
import net.minecraft.util.StringHelper;
import java.util.UUID; import java.util.UUID;
import static io.github.skippyall.minions.Minions.LOGGER; import static io.github.skippyall.minions.Minions.LOGGER;
@@ -31,23 +30,23 @@ public class MinionProfileUtils {
return newProfile; return newProfile;
} }
public static Result<String, Text> checkMinionNameWithoutPrefix(MinecraftServer server, String name) { public static Result<String, Component> checkMinionNameWithoutPrefix(MinecraftServer server, String name) {
for(char c : name.toCharArray()) { for(char c : name.toCharArray()) {
if(!StringReader.isAllowedInUnquotedString(c)) { if(!StringReader.isAllowedInUnquotedString(c)) {
return new Result.Error<>(Text.translatable("minions.generic.name.invalid_char")); return new Result.Error<>(Component.translatable("minions.generic.name.invalid_char"));
} }
} }
if((getPrefix() + name).length() > 16) { if((getPrefix() + name).length() > 16) {
return new Result.Error<>(Text.translatable("minions.generic.name.too_long")); return new Result.Error<>(Component.translatable("minions.generic.name.too_long"));
} }
if(!StringHelper.isValidPlayerName(getPrefix() + name)) { if(!StringUtil.isValidPlayerName(getPrefix() + name)) {
return new Result.Error<>(Text.translatable("minions.generic.name.invalid")); return new Result.Error<>(Component.translatable("minions.generic.name.invalid"));
} }
if(MinionPersistentState.get(server).isMinionNameTaken(getPrefix() + name)) { if(MinionPersistentState.get(server).isMinionNameTaken(getPrefix() + name)) {
return new Result.Error<>(Text.translatable("minions.generic.name.taken")); return new Result.Error<>(Component.translatable("minions.generic.name.taken"));
} }
return new Result.Success<>(name); return new Result.Success<>(name);
src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java
+10 -11
View File
@@ -8,14 +8,13 @@ import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.program.instruction.InstructionType;
import io.github.skippyall.minions.program.supplier.ValueSupplierType; import io.github.skippyall.minions.program.supplier.ValueSupplierType;
import io.github.skippyall.minions.registration.MinionRegistries; import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.registry.Registry;
import net.minecraft.storage.ReadView;
import net.minecraft.storage.WriteView;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import net.minecraft.core.Registry;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
public class MinionRuntime implements InstructionRuntime<MinionRuntime> { public class MinionRuntime implements InstructionRuntime<MinionRuntime> {
private final MinionFakePlayer minion; private final MinionFakePlayer minion;
@@ -102,19 +101,19 @@ public class MinionRuntime implements InstructionRuntime<MinionRuntime> {
} }
} }
public void save(WriteView view) { public void save(ValueOutput view) {
WriteView.ListView list = view.getList("configuredInstructions"); ValueOutput.ValueOutputList list = view.childrenList("configuredInstructions");
for (Map.Entry<String, ConfiguredInstruction<MinionRuntime>> instruction : configuredInstructions.entrySet()) { for (Map.Entry<String, ConfiguredInstruction<MinionRuntime>> instruction : configuredInstructions.entrySet()) {
WriteView inner = list.add(); ValueOutput inner = list.addChild();
inner.putString("name", instruction.getKey()); inner.putString("name", instruction.getKey());
instruction.getValue().save(inner, this); instruction.getValue().save(inner, this);
} }
} }
public void load(ReadView view) { public void load(ValueInput view) {
ReadView.ListReadView list = view.getListReadView("configuredInstructions"); ValueInput.ValueInputList list = view.childrenListOrEmpty("configuredInstructions");
for (ReadView inner : list) { for (ValueInput inner : list) {
Optional<String> name = inner.getOptionalString("name"); Optional<String> name = inner.getString("name");
if(name.isEmpty()) { if(name.isEmpty()) {
Minions.LOGGER.error("Tried deserializing configured instruction without a name of minion \"{}\":", minion.getGameProfile().getName()); Minions.LOGGER.error("Tried deserializing configured instruction without a name of minion \"{}\":", minion.getGameProfile().getName());
continue; continue;
src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java
+96 -97
View File
@@ -3,34 +3,33 @@ package io.github.skippyall.minions.minion.fakeplayer;
import io.github.skippyall.minions.mixins.EntityAccessor; import io.github.skippyall.minions.mixins.EntityAccessor;
import net.minecraft.block.BlockState;
import net.minecraft.command.argument.EntityAnchorArgumentType;
import net.minecraft.entity.Entity;
import net.minecraft.entity.decoration.ItemFrameEntity;
import net.minecraft.entity.passive.AbstractHorseEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.vehicle.BoatEntity;
import net.minecraft.entity.vehicle.MinecartEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket;
import net.minecraft.network.packet.s2c.play.UpdateSelectedSlotS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.util.ActionResult;
import net.minecraft.util.Hand;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Direction;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec2f;
import net.minecraft.util.math.Vec3d;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import net.minecraft.commands.arguments.EntityAnchorArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.network.protocol.game.ClientboundSetHeldSlotPacket;
import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Mth;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.animal.horse.AbstractHorse;
import net.minecraft.world.entity.decoration.ItemFrame;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.world.entity.vehicle.Boat;
import net.minecraft.world.entity.vehicle.Minecart;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec2;
import net.minecraft.world.phys.Vec3;
public class EntityPlayerActionPack public class EntityPlayerActionPack
{ {
@@ -100,7 +99,7 @@ public class EntityPlayerActionPack
public EntityPlayerActionPack setSneaking(boolean doSneak) public EntityPlayerActionPack setSneaking(boolean doSneak)
{ {
sneaking = doSneak; sneaking = doSneak;
player.setSneaking(doSneak); player.setShiftKeyDown(doSneak);
if (sprinting && sneaking) if (sprinting && sneaking)
setSprinting(false); setSprinting(false);
return this; return this;
@@ -132,35 +131,35 @@ public class EntityPlayerActionPack
case SOUTH -> look(0, 0); case SOUTH -> look(0, 0);
case EAST -> look(-90, 0); case EAST -> look(-90, 0);
case WEST -> look(90, 0); case WEST -> look(90, 0);
case UP -> look(player.getYaw(), -90); case UP -> look(player.getYRot(), -90);
case DOWN -> look(player.getYaw(), 90); case DOWN -> look(player.getYRot(), 90);
}; };
} }
public EntityPlayerActionPack look(Vec2f rotation) public EntityPlayerActionPack look(Vec2 rotation)
{ {
return look(rotation.x, rotation.y); return look(rotation.x, rotation.y);
} }
public EntityPlayerActionPack look(float yaw, float pitch) public EntityPlayerActionPack look(float yaw, float pitch)
{ {
player.setYaw(yaw % 360); //setYaw player.setYRot(yaw % 360); //setYaw
player.setPitch(MathHelper.clamp(pitch, -90, 90)); // setPitch player.setXRot(Mth.clamp(pitch, -90, 90)); // setPitch
// maybe player.moveTo(player.getX(), player.getY(), player.getZ(), yaw, Mth.clamp(pitch,-90.0F, 90.0F)); // maybe player.moveTo(player.getX(), player.getY(), player.getZ(), yaw, Mth.clamp(pitch,-90.0F, 90.0F));
return this; return this;
} }
public EntityPlayerActionPack lookAt(Vec3d position) public EntityPlayerActionPack lookAt(Vec3 position)
{ {
player.lookAt(EntityAnchorArgumentType.EntityAnchor.EYES, position); player.lookAt(EntityAnchorArgument.Anchor.EYES, position);
return this; return this;
} }
public EntityPlayerActionPack turn(float yaw, float pitch) public EntityPlayerActionPack turn(float yaw, float pitch)
{ {
return look(player.getYaw() + yaw, player.getPitch() + pitch); return look(player.getYRot() + yaw, player.getXRot() + pitch);
} }
public EntityPlayerActionPack turn(Vec2f rotation) public EntityPlayerActionPack turn(Vec2 rotation)
{ {
return turn(rotation.x, rotation.y); return turn(rotation.x, rotation.y);
} }
@@ -189,12 +188,12 @@ public class EntityPlayerActionPack
List<Entity> entities; List<Entity> entities;
if (onlyRideables) if (onlyRideables)
{ {
entities = player.getWorld().getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D), entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D),
e -> (e instanceof MinecartEntity || e instanceof BoatEntity || e instanceof AbstractHorseEntity) && ((EntityAccessor)e).minions$canAddPassenger(player)); e -> (e instanceof Minecart || e instanceof Boat || e instanceof AbstractHorse) && ((EntityAccessor)e).minions$canAddPassenger(player));
} }
else else
{ {
entities = player.getWorld().getOtherEntities(player, player.getBoundingBox().expand(3.0D, 1.0D, 3.0D)); entities = player.level().getEntities(player, player.getBoundingBox().inflate(3.0D, 1.0D, 3.0D));
} }
if (entities.size()==0) if (entities.size()==0)
return this; return this;
@@ -205,7 +204,7 @@ public class EntityPlayerActionPack
{ {
if (e == player || (currentVehicle == e)) if (e == player || (currentVehicle == e))
continue; continue;
double dd = player.squaredDistanceTo(e); double dd = player.distanceToSqr(e);
if (dd<distance) if (dd<distance)
{ {
distance = dd; distance = dd;
@@ -213,8 +212,8 @@ public class EntityPlayerActionPack
} }
} }
if (closest == null) return this; if (closest == null) return this;
if (closest instanceof AbstractHorseEntity && onlyRideables) if (closest instanceof AbstractHorse && onlyRideables)
((AbstractHorseEntity) closest).interactMob(player, Hand.MAIN_HAND); ((AbstractHorse) closest).mobInteract(player, InteractionHand.MAIN_HAND);
else else
player.startRiding(closest, !onlyRideables); player.startRiding(closest, !onlyRideables);
return this; return this;
@@ -256,10 +255,10 @@ public class EntityPlayerActionPack
float vel = sneaking?0.3F:1.0F; float vel = sneaking?0.3F:1.0F;
// The != 0.0F checks are needed given else real players can't control minecarts, however it works with fakes and else they don't stop immediately // The != 0.0F checks are needed given else real players can't control minecarts, however it works with fakes and else they don't stop immediately
if (forward != 0.0F || player instanceof MinionFakePlayer) { if (forward != 0.0F || player instanceof MinionFakePlayer) {
player.forwardSpeed = forward * vel; player.zza = forward * vel;
} }
if (strafing != 0.0F || player instanceof MinionFakePlayer) { if (strafing != 0.0F || player instanceof MinionFakePlayer) {
player.sidewaysSpeed = strafing * vel; player.xxa = strafing * vel;
} }
if(blockHitDelay > 0) { if(blockHitDelay > 0) {
@@ -267,27 +266,27 @@ public class EntityPlayerActionPack
} }
} }
public static HitResult getTarget(ServerPlayerEntity player) public static HitResult getTarget(ServerPlayer player)
{ {
double reach = player.interactionManager.isCreative() ? 5 : 4.5f; double reach = player.gameMode.isCreative() ? 5 : 4.5f;
return Tracer.rayTrace(player, 1, reach, false); return Tracer.rayTrace(player, 1, reach, false);
} }
private void dropItemFromSlot(int slot, boolean dropAll) private void dropItemFromSlot(int slot, boolean dropAll)
{ {
PlayerInventory inv = player.getInventory(); // getInventory; Inventory inv = player.getInventory(); // getInventory;
if (!inv.getStack(slot).isEmpty()) if (!inv.getItem(slot).isEmpty())
player.dropItem(inv.removeStack(slot, player.drop(inv.removeItem(slot,
dropAll ? inv.getStack(slot).getCount() : 1 dropAll ? inv.getItem(slot).getCount() : 1
), false, true); // scatter, keep owner ), false, true); // scatter, keep owner
} }
public void drop(int selectedSlot, boolean dropAll) public void drop(int selectedSlot, boolean dropAll)
{ {
PlayerInventory inv = player.getInventory(); // getInventory; Inventory inv = player.getInventory(); // getInventory;
if (selectedSlot == -2) // all if (selectedSlot == -2) // all
{ {
for (int i = inv.size(); i >= 0; i--) for (int i = inv.getContainerSize(); i >= 0; i--)
dropItemFromSlot(i, dropAll); dropItemFromSlot(i, dropAll);
} }
else // one slot else // one slot
@@ -301,7 +300,7 @@ public class EntityPlayerActionPack
public void setSlot(int slot) public void setSlot(int slot)
{ {
player.getInventory().setSelectedSlot(slot-1); player.getInventory().setSelectedSlot(slot-1);
player.networkHandler.sendPacket(new UpdateSelectedSlotS2CPacket(slot-1)); player.connection.send(new ClientboundSetHeldSlotPacket(slot-1));
} }
public enum ActionType public enum ActionType
@@ -322,23 +321,23 @@ public class EntityPlayerActionPack
return true; return true;
} }
HitResult hit = getTarget(player); HitResult hit = getTarget(player);
for (Hand hand : Hand.values()) for (InteractionHand hand : InteractionHand.values())
{ {
switch (hit.getType()) switch (hit.getType())
{ {
case BLOCK: case BLOCK:
{ {
player.updateLastActionTime(); player.resetLastActionTime();
ServerWorld world = player.getWorld(); ServerLevel world = player.level();
BlockHitResult blockHit = (BlockHitResult) hit; BlockHitResult blockHit = (BlockHitResult) hit;
BlockPos pos = blockHit.getBlockPos(); BlockPos pos = blockHit.getBlockPos();
Direction side = blockHit.getSide(); Direction side = blockHit.getDirection();
if (pos.getY() < player.getWorld().getTopYInclusive() - (side == Direction.UP ? 1 : 0) && world.canEntityModifyAt(player, pos)) if (pos.getY() < player.level().getMaxY() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos))
{ {
ActionResult result = player.interactionManager.interactBlock(player, world, player.getStackInHand(hand), hand, blockHit); InteractionResult result = player.gameMode.useItemOn(player, world, player.getItemInHand(hand), hand, blockHit);
if (result instanceof ActionResult.Success success) if (result instanceof InteractionResult.Success success)
{ {
if (success.swingSource() == ActionResult.SwingSource.SERVER) player.swingHand(hand); if (success.swingSource() == InteractionResult.SwingSource.SERVER) player.swing(hand);
ap.itemUseCooldown = 3; ap.itemUseCooldown = 3;
return true; return true;
} }
@@ -347,19 +346,19 @@ public class EntityPlayerActionPack
} }
case ENTITY: case ENTITY:
{ {
player.updateLastActionTime(); player.resetLastActionTime();
EntityHitResult entityHit = (EntityHitResult) hit; EntityHitResult entityHit = (EntityHitResult) hit;
Entity entity = entityHit.getEntity(); Entity entity = entityHit.getEntity();
boolean handWasEmpty = player.getStackInHand(hand).isEmpty(); boolean handWasEmpty = player.getItemInHand(hand).isEmpty();
boolean itemFrameEmpty = (entity instanceof ItemFrameEntity) && ((ItemFrameEntity) entity).getHeldItemStack().isEmpty(); boolean itemFrameEmpty = (entity instanceof ItemFrame) && ((ItemFrame) entity).getItem().isEmpty();
Vec3d relativeHitPos = entityHit.getPos().subtract(entity.getX(), entity.getY(), entity.getZ()); Vec3 relativeHitPos = entityHit.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ());
if (entity.interactAt(player, relativeHitPos, hand).isAccepted()) if (entity.interactAt(player, relativeHitPos, hand).consumesAction())
{ {
ap.itemUseCooldown = 3; ap.itemUseCooldown = 3;
return true; return true;
} }
// fix for SS itemframe always returns CONSUME even if no action is performed // fix for SS itemframe always returns CONSUME even if no action is performed
if (player.interact(entity, hand).isAccepted() && !(handWasEmpty && itemFrameEmpty)) if (player.interactOn(entity, hand).consumesAction() && !(handWasEmpty && itemFrameEmpty))
{ {
ap.itemUseCooldown = 3; ap.itemUseCooldown = 3;
return true; return true;
@@ -367,8 +366,8 @@ public class EntityPlayerActionPack
break; break;
} }
} }
ItemStack handItem = player.getStackInHand(hand); ItemStack handItem = player.getItemInHand(hand);
if (player.interactionManager.interactItem(player, player.getWorld(), handItem, hand).isAccepted()) if (player.gameMode.useItem(player, player.level(), handItem, hand).consumesAction())
{ {
ap.itemUseCooldown = 3; ap.itemUseCooldown = 3;
return true; return true;
@@ -382,7 +381,7 @@ public class EntityPlayerActionPack
{ {
EntityPlayerActionPack ap = player.getMinionActionPack(); EntityPlayerActionPack ap = player.getMinionActionPack();
ap.itemUseCooldown = 0; ap.itemUseCooldown = 0;
player.stopUsingItem(); player.releaseUsingItem();
} }
}, },
ATTACK(true) { ATTACK(true) {
@@ -395,10 +394,10 @@ public class EntityPlayerActionPack
if (!action.isContinuous || action.first) if (!action.isContinuous || action.first)
{ {
player.attack(entityHit.getEntity()); player.attack(entityHit.getEntity());
player.swingHand(Hand.MAIN_HAND); player.swing(InteractionHand.MAIN_HAND);
} }
player.resetLastAttackedTicks(); player.resetAttackStrengthTicker();
player.updateLastActionTime(); player.resetLastActionTime();
return true; return true;
} }
case BLOCK: { case BLOCK: {
@@ -409,18 +408,18 @@ public class EntityPlayerActionPack
} }
BlockHitResult blockHit = (BlockHitResult) hit; BlockHitResult blockHit = (BlockHitResult) hit;
BlockPos pos = blockHit.getBlockPos(); BlockPos pos = blockHit.getBlockPos();
Direction side = blockHit.getSide(); Direction side = blockHit.getDirection();
if (player.isBlockBreakingRestricted(player.getWorld(), pos, player.interactionManager.getGameMode())) return false; if (player.blockActionRestricted(player.level(), pos, player.gameMode.getGameModeForPlayer())) return false;
if (ap.currentBlock != null && player.getWorld().getBlockState(ap.currentBlock).isAir()) if (ap.currentBlock != null && player.level().getBlockState(ap.currentBlock).isAir())
{ {
ap.currentBlock = null; ap.currentBlock = null;
return false; return false;
} }
BlockState state = player.getWorld().getBlockState(pos); BlockState state = player.level().getBlockState(pos);
boolean blockBroken = false; boolean blockBroken = false;
if (player.interactionManager.getGameMode().isCreative()) if (player.gameMode.getGameModeForPlayer().isCreative())
{ {
player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
ap.blockHitDelay = 5; ap.blockHitDelay = 5;
blockBroken = true; blockBroken = true;
} }
@@ -428,15 +427,15 @@ public class EntityPlayerActionPack
{ {
if (ap.currentBlock != null) if (ap.currentBlock != null)
{ {
player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
} }
player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
boolean notAir = !state.isAir(); boolean notAir = !state.isAir();
if (notAir && ap.curBlockDamageMP == 0) if (notAir && ap.curBlockDamageMP == 0)
{ {
state.onBlockBreakStart(player.getWorld(), pos, player); state.attack(player.level(), pos, player);
} }
if (notAir && state.calcBlockBreakingDelta(player, player.getWorld(), pos) >= 1) if (notAir && state.getDestroyProgress(player, player.level(), pos) >= 1)
{ {
ap.currentBlock = null; ap.currentBlock = null;
//instamine?? //instamine??
@@ -450,19 +449,19 @@ public class EntityPlayerActionPack
} }
else else
{ {
ap.curBlockDamageMP += state.calcBlockBreakingDelta(player, player.getWorld(), pos); ap.curBlockDamageMP += state.getDestroyProgress(player, player.level(), pos);
if (ap.curBlockDamageMP >= 1) if (ap.curBlockDamageMP >= 1)
{ {
player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, side, player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
ap.currentBlock = null; ap.currentBlock = null;
ap.blockHitDelay = 5; ap.blockHitDelay = 5;
blockBroken = true; blockBroken = true;
} }
player.getWorld().setBlockBreakingInfo(-1, pos, (int) (ap.curBlockDamageMP * 10)); player.level().destroyBlockProgress(-1, pos, (int) (ap.curBlockDamageMP * 10));
} }
player.updateLastActionTime(); player.resetLastActionTime();
player.swingHand(Hand.MAIN_HAND); player.swing(InteractionHand.MAIN_HAND);
return blockBroken; return blockBroken;
} }
} }
@@ -474,8 +473,8 @@ public class EntityPlayerActionPack
{ {
EntityPlayerActionPack ap = player.getMinionActionPack(); EntityPlayerActionPack ap = player.getMinionActionPack();
if (ap.currentBlock == null) return; if (ap.currentBlock == null) return;
player.getWorld().setBlockBreakingInfo(-1, ap.currentBlock, -1); player.level().destroyBlockProgress(-1, ap.currentBlock, -1);
player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.level().getMaxY(), -1);
ap.currentBlock = null; ap.currentBlock = null;
} }
}, },
@@ -486,7 +485,7 @@ public class EntityPlayerActionPack
{ {
if (action.limit == 1) if (action.limit == 1)
{ {
if (player.isOnGround()) player.jump(); // onGround if (player.onGround()) player.jumpFromGround(); // onGround
} }
else else
{ {
@@ -506,8 +505,8 @@ public class EntityPlayerActionPack
@Override @Override
boolean execute(MinionFakePlayer player, Action action) boolean execute(MinionFakePlayer player, Action action)
{ {
player.updateLastActionTime(); player.resetLastActionTime();
player.dropSelectedItem(false); // dropSelectedItem player.drop(false); // dropSelectedItem
return false; return false;
} }
}, },
@@ -516,8 +515,8 @@ public class EntityPlayerActionPack
@Override @Override
boolean execute(MinionFakePlayer player, Action action) boolean execute(MinionFakePlayer player, Action action)
{ {
player.updateLastActionTime(); player.resetLastActionTime();
player.dropSelectedItem(true); // dropSelectedItem player.drop(true); // dropSelectedItem
return false; return false;
} }
}, },
@@ -526,10 +525,10 @@ public class EntityPlayerActionPack
@Override @Override
boolean execute(MinionFakePlayer player, Action action) boolean execute(MinionFakePlayer player, Action action)
{ {
player.updateLastActionTime(); player.resetLastActionTime();
ItemStack itemStack_1 = player.getStackInHand(Hand.OFF_HAND); ItemStack itemStack_1 = player.getItemInHand(InteractionHand.OFF_HAND);
player.setStackInHand(Hand.OFF_HAND, player.getStackInHand(Hand.MAIN_HAND)); player.setItemInHand(InteractionHand.OFF_HAND, player.getItemInHand(InteractionHand.MAIN_HAND));
player.setStackInHand(Hand.MAIN_HAND, itemStack_1); player.setItemInHand(InteractionHand.MAIN_HAND, itemStack_1);
return false; return false;
} }
}; };
src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java
+9 -9
View File
@@ -2,13 +2,13 @@
package io.github.skippyall.minions.minion.fakeplayer; package io.github.skippyall.minions.minion.fakeplayer;
import io.netty.channel.embedded.EmbeddedChannel; import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.network.ClientConnection; import net.minecraft.network.Connection;
import net.minecraft.network.NetworkSide; import net.minecraft.network.PacketListener;
import net.minecraft.network.listener.PacketListener; import net.minecraft.network.ProtocolInfo;
import net.minecraft.network.state.NetworkState; import net.minecraft.network.protocol.PacketFlow;
public class FakeClientConnection extends ClientConnection { public class FakeClientConnection extends Connection {
public FakeClientConnection(NetworkSide p) public FakeClientConnection(PacketFlow p)
{ {
super(p); super(p);
// compat with adventure-platform-fabric. This does NOT trigger other vanilla handlers for establishing a channel // compat with adventure-platform-fabric. This does NOT trigger other vanilla handlers for establishing a channel
@@ -17,7 +17,7 @@ public class FakeClientConnection extends ClientConnection {
} }
@Override @Override
public void tryDisableAutoRead() public void setReadOnly()
{ {
} }
@@ -26,11 +26,11 @@ public class FakeClientConnection extends ClientConnection {
} }
@Override @Override
public void setInitialPacketListener(PacketListener packetListener) public void setListenerForServerboundHandshake(PacketListener packetListener)
{ {
} }
@Override @Override
public <T extends PacketListener> void transitionInbound(NetworkState<T> state, T packetListener) { public <T extends PacketListener> void setupInboundProtocol(ProtocolInfo<T> state, T packetListener) {
} }
} }
src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java
+102 -102
View File
@@ -15,44 +15,44 @@ import io.github.skippyall.minions.module.ModuleInventory;
import io.github.skippyall.minions.registration.MinionConfigOptions; import io.github.skippyall.minions.registration.MinionConfigOptions;
import io.github.skippyall.minions.registration.MinionItems; import io.github.skippyall.minions.registration.MinionItems;
import io.github.skippyall.minions.registration.SpecialAbilities; import io.github.skippyall.minions.registration.SpecialAbilities;
import net.minecraft.block.BlockState; import net.minecraft.core.BlockPos;
import net.minecraft.entity.Entity; import net.minecraft.network.DisconnectionDetails;
import net.minecraft.entity.EquipmentSlot; import net.minecraft.network.chat.Component;
import net.minecraft.entity.ItemEntity; import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.network.protocol.PacketFlow;
import net.minecraft.entity.damage.DamageSource; import net.minecraft.network.protocol.game.ClientboundEntityPositionSyncPacket;
import net.minecraft.entity.player.HungerManager; import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.network.protocol.game.ServerboundClientCommandPacket;
import net.minecraft.entity.vehicle.AbstractBoatEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.network.DisconnectionInfo;
import net.minecraft.network.NetworkSide;
import net.minecraft.network.packet.c2s.common.SyncedClientOptions;
import net.minecraft.network.packet.c2s.play.ClientStatusC2SPacket;
import net.minecraft.network.packet.s2c.play.EntityPositionSyncS2CPacket;
import net.minecraft.network.packet.s2c.play.EntitySetHeadYawS2CPacket;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.ServerTask; import net.minecraft.server.TickTask;
import net.minecraft.server.network.ConnectedClientData; import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.storage.ReadView; import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.storage.WriteView; import net.minecraft.world.InteractionHand;
import net.minecraft.text.Text; import net.minecraft.world.InteractionResult;
import net.minecraft.text.TranslatableTextContent; import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.util.ActionResult; import net.minecraft.world.entity.Entity;
import net.minecraft.util.Hand; import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.util.math.Vec2f; import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.util.math.Vec3d; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.GameMode; import net.minecraft.world.entity.vehicle.AbstractBoat;
import net.minecraft.world.TeleportTarget; import net.minecraft.world.food.FoodData;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.GameType;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.portal.TeleportTransition;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
import net.minecraft.world.phys.Vec2;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Set; import java.util.Set;
import java.util.function.Consumer; import java.util.function.Consumer;
public class MinionFakePlayer extends ServerPlayerEntity { public class MinionFakePlayer extends ServerPlayer {
public Runnable fixStartingPosition = () -> {}; public Runnable fixStartingPosition = () -> {};
private EntityPlayerActionPack actionPack; private EntityPlayerActionPack actionPack;
@@ -60,54 +60,54 @@ public class MinionFakePlayer extends ServerPlayerEntity {
private final ModuleInventory moduleInventory = new ModuleInventory(this); private final ModuleInventory moduleInventory = new ModuleInventory(this);
private final MinionRuntime instructionManager = new MinionRuntime(this); private final MinionRuntime instructionManager = new MinionRuntime(this);
public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) { public static void spawnMinion(MinionData data, ServerLevel level, @Nullable Vec3 pos, @Nullable Vec2 rot) {
spawnMinion(data, level, pos, rot, false); spawnMinion(data, level, pos, rot, false);
} }
public static void spawnMinion(MinionData data, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot, boolean force) { public static void spawnMinion(MinionData data, ServerLevel level, @Nullable Vec3 pos, @Nullable Vec2 rot, boolean force) {
if(!data.isSpawned() || force) { if(!data.isSpawned() || force) {
MinecraftServer server = level.getServer(); MinecraftServer server = level.getServer();
PropertyMap skin = data.skin().orElse(null); PropertyMap skin = data.skin().orElse(null);
GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skin); GameProfile profile = MinionProfileUtils.makeNewMinionProfile(data.uuid(), data.name(), skin);
server.send(server.createTask(() -> doSpawn(data, profile, server, level, pos, rot))); server.schedule(server.wrapRunnable(() -> doSpawn(data, profile, server, level, pos, rot)));
} }
} }
private static void doSpawn(MinionData data, GameProfile profile, MinecraftServer server, ServerWorld level, @Nullable Vec3d pos, @Nullable Vec2f rot) { private static void doSpawn(MinionData data, GameProfile profile, MinecraftServer server, ServerLevel level, @Nullable Vec3 pos, @Nullable Vec2 rot) {
MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, SyncedClientOptions.createDefault()); MinionFakePlayer instance = new MinionFakePlayer(server, level, profile, ClientInformation.createDefault());
MinionPersistentState.get(server).updateMinionData(data.withSpawned(true)); MinionPersistentState.get(server).updateMinionData(data.withSpawned(true));
if(pos != null && rot != null) { if(pos != null && rot != null) {
instance.fixStartingPosition = () -> instance.refreshPositionAndAngles(pos.x, pos.y, pos.z, rot.x, rot.y); instance.fixStartingPosition = () -> instance.snapTo(pos.x, pos.y, pos.z, rot.x, rot.y);
} }
server.getPlayerManager().onPlayerConnect(new FakeClientConnection(NetworkSide.SERVERBOUND), instance, new ConnectedClientData(profile, 0, instance.getClientOptions(), false)); server.getPlayerList().placeNewPlayer(new FakeClientConnection(PacketFlow.SERVERBOUND), instance, new CommonListenerCookie(profile, 0, instance.clientInformation(), false));
System.out.println(instance.getPos()); System.out.println(instance.position());
if(pos != null && rot != null) { if(pos != null && rot != null) {
instance.teleport(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true); instance.teleportTo(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true);
} }
instance.setVelocity(0,0,0); instance.setDeltaMovement(0,0,0);
instance.setHealth(20.0F); instance.setHealth(20.0F);
instance.unsetRemoved(); instance.unsetRemoved();
instance.getAttributeInstance(EntityAttributes.STEP_HEIGHT).setBaseValue(0.6F); instance.getAttribute(Attributes.STEP_HEIGHT).setBaseValue(0.6F);
instance.getAttributeInstance(EntityAttributes.WAYPOINT_TRANSMIT_RANGE).setBaseValue(0); instance.getAttribute(Attributes.WAYPOINT_TRANSMIT_RANGE).setBaseValue(0);
instance.interactionManager.changeGameMode(GameMode.SURVIVAL); instance.gameMode.changeGameModeForPlayer(GameType.SURVIVAL);
server.getPlayerManager().sendToDimension(new EntitySetHeadYawS2CPacket(instance, (byte) (instance.headYaw * 256 / 360)), level.getRegistryKey()); server.getPlayerList().broadcastAll(new ClientboundRotateHeadPacket(instance, (byte) (instance.yHeadRot * 256 / 360)), level.dimension());
server.getPlayerManager().sendToDimension(EntityPositionSyncS2CPacket.create(instance), level.getRegistryKey()); server.getPlayerList().broadcastAll(ClientboundEntityPositionSyncPacket.of(instance), level.dimension());
instance.getWorld().getChunkManager().updatePosition(instance); instance.level().getChunkSource().move(instance);
instance.dataTracker.set(PLAYER_MODEL_PARTS, (byte) 0x7f); // show all model layers (incl. capes) instance.entityData.set(DATA_PLAYER_MODE_CUSTOMISATION, (byte) 0x7f); // show all model layers (incl. capes)
instance.getAbilities().flying = false; instance.getAbilities().flying = false;
instance.listeners().forEach(listener -> listener.onMinionSpawn(instance)); instance.listeners().forEach(listener -> listener.onMinionSpawn(instance));
} }
public static MinionFakePlayer respawnFake(MinecraftServer server, ServerWorld level, GameProfile profile, SyncedClientOptions cli) public static MinionFakePlayer respawnFake(MinecraftServer server, ServerLevel level, GameProfile profile, ClientInformation cli)
{ {
return new MinionFakePlayer(server, level, profile, cli); return new MinionFakePlayer(server, level, profile, cli);
} }
private MinionFakePlayer(MinecraftServer server, ServerWorld worldIn, GameProfile profile, SyncedClientOptions cli) private MinionFakePlayer(MinecraftServer server, ServerLevel worldIn, GameProfile profile, ClientInformation cli)
{ {
super(server, worldIn, profile, cli); super(server, worldIn, profile, cli);
actionPack = new EntityPlayerActionPack(this); actionPack = new EntityPlayerActionPack(this);
@@ -126,7 +126,7 @@ public class MinionFakePlayer extends ServerPlayerEntity {
} }
public MinionData getData() { public MinionData getData() {
return MinionPersistentState.get(getServer()).getMinionData(getUuid()); return MinionPersistentState.get(getServer()).getMinionData(getUUID());
} }
public SerializableListenerManager<MinionListener> listeners() { public SerializableListenerManager<MinionListener> listeners() {
@@ -154,35 +154,35 @@ public class MinionFakePlayer extends ServerPlayerEntity {
} }
@Override @Override
public ActionResult interact(PlayerEntity player, Hand hand) { public InteractionResult interact(Player player, InteractionHand hand) {
if(player instanceof ServerPlayerEntity spe) { if(player instanceof ServerPlayer spe) {
new MinionGui(spe, this); new MinionGui(spe, this);
} }
return ActionResult.CONSUME; return InteractionResult.CONSUME;
} }
@Override @Override
public ActionResult interactAt(PlayerEntity player, Vec3d hitPos, Hand hand) { public InteractionResult interactAt(Player player, Vec3 hitPos, InteractionHand hand) {
return interact(player, hand); return interact(player, hand);
} }
@Override @Override
public void onEquipStack(final EquipmentSlot slot, final ItemStack previous, final ItemStack stack) public void onEquipItem(final EquipmentSlot slot, final ItemStack previous, final ItemStack stack)
{ {
if (!isUsingItem()) super.onEquipStack(slot, previous, stack); if (!isUsingItem()) super.onEquipItem(slot, previous, stack);
} }
public void kill(Text reason) public void kill(Component reason)
{ {
listeners().forEach(listener -> listener.onMinionRemove(this)); listeners().forEach(listener -> listener.onMinionRemove(this));
shakeOff(); shakeOff();
if (reason.getContent() instanceof TranslatableTextContent text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) { if (reason.getContents() instanceof TranslatableContents text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
this.networkHandler.onDisconnected(new DisconnectionInfo(reason)); this.connection.onDisconnect(new DisconnectionDetails(reason));
} else { } else {
this.getServer().send(new ServerTask(this.getServer().getTicks(), () -> { this.getServer().schedule(new TickTask(this.getServer().getTickCount(), () -> {
this.networkHandler.onDisconnected(new DisconnectionInfo(reason)); this.connection.onDisconnect(new DisconnectionDetails(reason));
})); }));
} }
@@ -193,15 +193,15 @@ public class MinionFakePlayer extends ServerPlayerEntity {
public void tick() public void tick()
{ {
actionPack.onUpdate(); actionPack.onUpdate();
if (this.getServer().getTicks() % 10 == 0) if (this.getServer().getTickCount() % 10 == 0)
{ {
this.networkHandler.syncWithPlayerPosition(); this.connection.resetPosition();
this.getWorld().getChunkManager().updatePosition(this); this.level().getChunkSource().move(this);
} }
try try
{ {
super.tick(); super.tick();
this.playerTick(); this.doTick();
instructionManager.tick(); instructionManager.tick();
} }
catch (NullPointerException ignored) catch (NullPointerException ignored)
@@ -216,10 +216,10 @@ public class MinionFakePlayer extends ServerPlayerEntity {
public boolean startRiding(Entity entityToRide, boolean force) { public boolean startRiding(Entity entityToRide, boolean force) {
if (super.startRiding(entityToRide, force)) { if (super.startRiding(entityToRide, force)) {
// from ClientPacketListener.handleSetEntityPassengersPacket // from ClientPacketListener.handleSetEntityPassengersPacket
if (entityToRide instanceof AbstractBoatEntity) { if (entityToRide instanceof AbstractBoat) {
this.lastYaw = entityToRide.getYaw(); this.yRotO = entityToRide.getYRot();
this.setYaw(entityToRide.getYaw()); this.setYRot(entityToRide.getYRot());
this.setHeadYaw(entityToRide.getHeadYaw()); this.setYHeadRot(entityToRide.getYHeadRot());
} }
return true; return true;
} else { } else {
@@ -229,62 +229,62 @@ public class MinionFakePlayer extends ServerPlayerEntity {
private void shakeOff() private void shakeOff()
{ {
if (getVehicle() instanceof PlayerEntity) stopRiding(); if (getVehicle() instanceof Player) stopRiding();
for (Entity passenger : getPassengersDeep()) for (Entity passenger : getIndirectPassengers())
{ {
if (passenger instanceof PlayerEntity) passenger.stopRiding(); if (passenger instanceof Player) passenger.stopRiding();
} }
} }
@Override @Override
public void onDeath(DamageSource cause) public void die(DamageSource cause)
{ {
shakeOff(); shakeOff();
super.onDeath(cause); super.die(cause);
setHealth(20); setHealth(20);
this.hungerManager = new HungerManager(); this.foodData = new FoodData();
kill(this.getDamageTracker().getDeathMessage()); kill(this.getCombatTracker().getDeathMessage());
} }
@Override @Override
public String getIp() public String getIpAddress()
{ {
return "127.0.0.1"; return "127.0.0.1";
} }
@Override @Override
public boolean allowsServerListing() { public boolean allowsListing() {
return false; return false;
} }
@Override @Override
protected void fall(double y, boolean onGround, BlockState state, BlockPos pos) { protected void checkFallDamage(double y, boolean onGround, BlockState state, BlockPos pos) {
handleFall(0.0, y, 0.0, onGround); doCheckFallDamage(0.0, y, 0.0, onGround);
} }
@Override @Override
public ServerPlayerEntity teleportTo(TeleportTarget target) public ServerPlayer teleport(TeleportTransition target)
{ {
super.teleportTo(target); super.teleport(target);
if (notInAnyWorld) { if (wonGame) {
ClientStatusC2SPacket p = new ClientStatusC2SPacket(ClientStatusC2SPacket.Mode.PERFORM_RESPAWN); ServerboundClientCommandPacket p = new ServerboundClientCommandPacket(ServerboundClientCommandPacket.Action.PERFORM_RESPAWN);
networkHandler.onClientStatus(p); connection.handleClientCommand(p);
} }
// If above branch was taken, *this* has been removed and replaced, the new instance has been set // If above branch was taken, *this* has been removed and replaced, the new instance has been set
// on 'our' connection (which is now theirs, but we still have a ref). // on 'our' connection (which is now theirs, but we still have a ref).
if (networkHandler.player.isInTeleportationState()) { if (connection.player.isChangingDimension()) {
networkHandler.player.onTeleportationDone(); connection.player.hasChangedDimension();
} }
return networkHandler.player; return connection.player;
} }
@Override @Override
public void drop(ServerWorld world, DamageSource damageSource) { public void dropAllDeathLoot(ServerLevel world, DamageSource damageSource) {
super.drop(world, damageSource); super.dropAllDeathLoot(world, damageSource);
ItemEntity entity = dropItem(toItemStack(world.getServer()), true, false); ItemEntity entity = drop(toItemStack(world.getServer()), true, false);
if (entity != null) { if (entity != null) {
entity.setNeverDespawn(); entity.setUnlimitedLifetime();
} }
} }
@@ -295,16 +295,16 @@ public class MinionFakePlayer extends ServerPlayerEntity {
} }
@Override @Override
public void writeCustomData(WriteView view) { public void addAdditionalSaveData(ValueOutput view) {
super.writeCustomData(view); super.addAdditionalSaveData(view);
moduleInventory.writeData(view.get("modules")); moduleInventory.writeData(view.child("modules"));
instructionManager.save(view.get("instructionManager")); instructionManager.save(view.child("instructionManager"));
} }
@Override @Override
public void readCustomData(ReadView view) { public void readAdditionalSaveData(ValueInput view) {
super.readCustomData(view); super.readAdditionalSaveData(view);
moduleInventory.readData(view.getReadView("modules")); moduleInventory.readData(view.childOrEmpty("modules"));
instructionManager.load(view.getReadView("instructionManager")); instructionManager.load(view.childOrEmpty("instructionManager"));
} }
} }
src/main/java/io/github/skippyall/minions/minion/fakeplayer/NetHandlerPlayServerFake.java
+19 -19
View File
@@ -1,46 +1,46 @@
//code from https://github.com/gnembon/fabric-carpet //code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer; package io.github.skippyall.minions.minion.fakeplayer;
import net.minecraft.entity.player.PlayerPosition; import net.minecraft.network.Connection;
import net.minecraft.network.ClientConnection; import net.minecraft.network.chat.Component;
import net.minecraft.network.packet.Packet; import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.network.packet.s2c.play.PositionFlag; import net.minecraft.network.protocol.Packet;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ConnectedClientData; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.text.Text; import net.minecraft.world.entity.PositionMoveRotation;
import net.minecraft.text.TranslatableTextContent; import net.minecraft.world.entity.Relative;
import java.util.Set; import java.util.Set;
public class NetHandlerPlayServerFake extends ServerPlayNetworkHandler public class NetHandlerPlayServerFake extends ServerGamePacketListenerImpl
{ {
public NetHandlerPlayServerFake(final MinecraftServer minecraftServer, final ClientConnection connection, final ServerPlayerEntity serverPlayer, final ConnectedClientData i) public NetHandlerPlayServerFake(final MinecraftServer minecraftServer, final Connection connection, final ServerPlayer serverPlayer, final CommonListenerCookie i)
{ {
super(minecraftServer, connection, serverPlayer, i); super(minecraftServer, connection, serverPlayer, i);
} }
@Override @Override
public void sendPacket(final Packet<?> packetIn) public void send(final Packet<?> packetIn)
{ {
} }
@Override @Override
public void disconnect(Text message) public void disconnect(Component message)
{ {
if (message.getContent() instanceof TranslatableTextContent text && (text.getKey().equals("multiplayer.disconnect.idling") || text.getKey().equals("multiplayer.disconnect.duplicate_login"))) if (message.getContents() instanceof TranslatableContents text && (text.getKey().equals("multiplayer.disconnect.idling") || text.getKey().equals("multiplayer.disconnect.duplicate_login")))
{ {
((MinionFakePlayer) player).kill(message); ((MinionFakePlayer) player).kill(message);
} }
} }
@Override @Override
public void requestTeleport(PlayerPosition pos, Set<PositionFlag> set) public void teleport(PositionMoveRotation pos, Set<Relative> set)
{ {
super.requestTeleport(pos, set); super.teleport(pos, set);
if (player.getWorld().getPlayerByUuid(player.getUuid()) != null) { if (player.level().getPlayerByUUID(player.getUUID()) != null) {
syncWithPlayerPosition(); resetPosition();
player.getWorld().getChunkManager().updatePosition(player); player.level().getChunkSource().move(player);
} }
} }
src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java
+26 -27
View File
@@ -1,17 +1,16 @@
//code from https://github.com/gnembon/fabric-carpet //code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer; package io.github.skippyall.minions.minion.fakeplayer;
import net.minecraft.entity.Entity;
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.hit.EntityHitResult;
import net.minecraft.util.hit.HitResult;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.Vec3d;
import net.minecraft.world.RaycastContext;
import net.minecraft.world.World;
import java.util.Optional; import java.util.Optional;
import java.util.function.Predicate; import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.ClipContext;
import net.minecraft.world.level.Level;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
public class Tracer public class Tracer
{ {
@@ -21,7 +20,7 @@ public class Tracer
double maxSqDist = reach * reach; double maxSqDist = reach * reach;
if (blockHit != null) if (blockHit != null)
{ {
maxSqDist = blockHit.getPos().squaredDistanceTo(source.getCameraPosVec(partialTicks)); maxSqDist = blockHit.getLocation().distanceToSqr(source.getEyePosition(partialTicks));
} }
EntityHitResult entityHit = rayTraceEntities(source, partialTicks, reach, maxSqDist); EntityHitResult entityHit = rayTraceEntities(source, partialTicks, reach, maxSqDist);
return entityHit == null ? blockHit : entityHit; return entityHit == null ? blockHit : entityHit;
@@ -29,31 +28,31 @@ public class Tracer
public static BlockHitResult rayTraceBlocks(Entity source, float partialTicks, double reach, boolean fluids) public static BlockHitResult rayTraceBlocks(Entity source, float partialTicks, double reach, boolean fluids)
{ {
Vec3d pos = source.getCameraPosVec(partialTicks); Vec3 pos = source.getEyePosition(partialTicks);
Vec3d rotation = source.getRotationVec(partialTicks); Vec3 rotation = source.getViewVector(partialTicks);
Vec3d reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach); Vec3 reachEnd = pos.add(rotation.x * reach, rotation.y * reach, rotation.z * reach);
return source.getWorld().raycast(new RaycastContext(pos, reachEnd, RaycastContext.ShapeType.OUTLINE, fluids ? return source.level().clip(new ClipContext(pos, reachEnd, ClipContext.Block.OUTLINE, fluids ?
RaycastContext.FluidHandling.ANY : RaycastContext.FluidHandling.NONE, source)); ClipContext.Fluid.ANY : ClipContext.Fluid.NONE, source));
} }
public static EntityHitResult rayTraceEntities(Entity source, float partialTicks, double reach, double maxSqDist) public static EntityHitResult rayTraceEntities(Entity source, float partialTicks, double reach, double maxSqDist)
{ {
Vec3d pos = source.getCameraPosVec(partialTicks); Vec3 pos = source.getEyePosition(partialTicks);
Vec3d reachVec = source.getRotationVec(partialTicks).multiply(reach); Vec3 reachVec = source.getViewVector(partialTicks).scale(reach);
Box box = source.getBoundingBox().stretch(reachVec).expand(1); AABB box = source.getBoundingBox().expandTowards(reachVec).inflate(1);
return rayTraceEntities(source, pos, pos.add(reachVec), box, e -> !e.isSpectator() && e.canHit(), maxSqDist); return rayTraceEntities(source, pos, pos.add(reachVec), box, e -> !e.isSpectator() && e.isPickable(), maxSqDist);
} }
public static EntityHitResult rayTraceEntities(Entity source, Vec3d start, Vec3d end, Box box, Predicate<Entity> predicate, double maxSqDistance) public static EntityHitResult rayTraceEntities(Entity source, Vec3 start, Vec3 end, AABB box, Predicate<Entity> predicate, double maxSqDistance)
{ {
World world = source.getWorld(); Level world = source.level();
double targetDistance = maxSqDistance; double targetDistance = maxSqDistance;
Entity target = null; Entity target = null;
Vec3d targetHitPos = null; Vec3 targetHitPos = null;
for (Entity current : world.getOtherEntities(source, box, predicate)) for (Entity current : world.getEntities(source, box, predicate))
{ {
Box currentBox = current.getBoundingBox().expand(current.getTargetingMargin()); AABB currentBox = current.getBoundingBox().inflate(current.getPickRadius());
Optional<Vec3d> currentHit = currentBox.raycast(start, end); Optional<Vec3> currentHit = currentBox.clip(start, end);
if (currentBox.contains(start)) if (currentBox.contains(start))
{ {
if (targetDistance >= 0) if (targetDistance >= 0)
@@ -65,8 +64,8 @@ public class Tracer
} }
else if (currentHit.isPresent()) else if (currentHit.isPresent())
{ {
Vec3d currentHitPos = currentHit.get(); Vec3 currentHitPos = currentHit.get();
double currentDistance = start.squaredDistanceTo(currentHitPos); double currentDistance = start.distanceToSqr(currentHitPos);
if (currentDistance < targetDistance || targetDistance == 0) if (currentDistance < targetDistance || targetDistance == 0)
{ {
if (current.getRootVehicle() == source.getRootVehicle()) if (current.getRootVehicle() == source.getRootVehicle())
src/main/java/io/github/skippyall/minions/minion/program/instruction/ActionExecution.java
+4 -4
View File
@@ -5,8 +5,8 @@ import io.github.skippyall.minions.minion.fakeplayer.EntityPlayerActionPack;
import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.program.consumer.ValueConsumerList;
import io.github.skippyall.minions.program.instruction.execution.ContinuousInstructionExecution; import io.github.skippyall.minions.program.instruction.execution.ContinuousInstructionExecution;
import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.program.supplier.ParameterValueList;
import net.minecraft.storage.ReadView; import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.storage.WriteView; import net.minecraft.world.level.storage.ValueOutput;
public class ActionExecution implements ContinuousInstructionExecution<MinionRuntime> { public class ActionExecution implements ContinuousInstructionExecution<MinionRuntime> {
private final EntityPlayerActionPack.ActionType action; private final EntityPlayerActionPack.ActionType action;
@@ -42,10 +42,10 @@ public class ActionExecution implements ContinuousInstructionExecution<MinionRun
public void readArguments(ParameterValueList parameters, MinionRuntime minion) {} public void readArguments(ParameterValueList parameters, MinionRuntime minion) {}
@Override @Override
public void save(WriteView view, MinionRuntime minion) {} public void save(ValueOutput view, MinionRuntime minion) {}
@Override @Override
public void load(ReadView view, MinionRuntime runtime) { public void load(ValueInput view, MinionRuntime runtime) {
runtime.getMinion().getMinionActionPack().start(action, EntityPlayerActionPack.Action.continuous()); runtime.getMinion().getMinionActionPack().start(action, EntityPlayerActionPack.Action.continuous());
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/MineBlockExecution.java
+26 -26
View File
@@ -7,15 +7,15 @@ import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.consumer.ValueConsumerList; import io.github.skippyall.minions.program.consumer.ValueConsumerList;
import io.github.skippyall.minions.program.instruction.InstructionExecution; import io.github.skippyall.minions.program.instruction.InstructionExecution;
import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.program.supplier.ParameterValueList;
import net.minecraft.block.BlockState; import net.minecraft.core.BlockPos;
import net.minecraft.network.packet.c2s.play.PlayerActionC2SPacket; import net.minecraft.core.Direction;
import net.minecraft.storage.ReadView; import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
import net.minecraft.storage.WriteView; import net.minecraft.world.InteractionHand;
import net.minecraft.util.Hand; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.util.hit.BlockHitResult; import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.util.hit.HitResult; import net.minecraft.world.level.storage.ValueOutput;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.util.math.Direction; import net.minecraft.world.phys.HitResult;
public class MineBlockExecution implements InstructionExecution<MinionRuntime> { public class MineBlockExecution implements InstructionExecution<MinionRuntime> {
private BlockPos currentBlock; private BlockPos currentBlock;
@@ -36,7 +36,7 @@ public class MineBlockExecution implements InstructionExecution<MinionRuntime> {
done = true; done = true;
return; return;
} }
if (player.isBlockBreakingRestricted(player.getWorld(), hit.getBlockPos(), player.interactionManager.getGameMode())) { if (player.blockActionRestricted(player.level(), hit.getBlockPos(), player.gameMode.getGameModeForPlayer())) {
done = true; done = true;
return; return;
} }
@@ -66,37 +66,37 @@ public class MineBlockExecution implements InstructionExecution<MinionRuntime> {
return; return;
} }
if (player.getWorld().getBlockState(currentBlock).isAir()) { if (player.level().getBlockState(currentBlock).isAir()) {
done = true; done = true;
return; return;
} }
BlockState state = player.getWorld().getBlockState(currentBlock); BlockState state = player.level().getBlockState(currentBlock);
boolean blockBroken = false; boolean blockBroken = false;
if (first) { if (first) {
first = false; first = false;
player.interactionManager.processBlockBreakingAction(currentBlock, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, newBlockHit.getSide(), player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(currentBlock, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, newBlockHit.getDirection(), player.level().getMaxY(), -1);
boolean notAir = !state.isAir(); boolean notAir = !state.isAir();
if (notAir) if (notAir)
{ {
state.onBlockBreakStart(player.getWorld(), currentBlock, player); state.attack(player.level(), currentBlock, player);
} }
if (notAir && state.calcBlockBreakingDelta(player, player.getWorld(), currentBlock) >= 1) if (notAir && state.getDestroyProgress(player, player.level(), currentBlock) >= 1)
{ {
//instamine?? //instamine??
blockBroken = true; blockBroken = true;
} }
} else { } else {
currentBlockDamage += state.calcBlockBreakingDelta(player, player.getWorld(), currentBlock); currentBlockDamage += state.getDestroyProgress(player, player.level(), currentBlock);
if (currentBlockDamage >= 1) { if (currentBlockDamage >= 1) {
player.interactionManager.processBlockBreakingAction(currentBlock, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, newBlockHit.getSide(), player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(currentBlock, ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, newBlockHit.getDirection(), player.level().getMaxY(), -1);
ap.blockHitDelay = 5; ap.blockHitDelay = 5;
blockBroken = true; blockBroken = true;
} }
player.getWorld().setBlockBreakingInfo(-1, currentBlock, (int) (currentBlockDamage * 10)); player.level().destroyBlockProgress(-1, currentBlock, (int) (currentBlockDamage * 10));
} }
player.updateLastActionTime(); player.resetLastActionTime();
player.swingHand(Hand.MAIN_HAND); player.swing(InteractionHand.MAIN_HAND);
if(blockBroken) { if(blockBroken) {
done = true; done = true;
@@ -115,8 +115,8 @@ public class MineBlockExecution implements InstructionExecution<MinionRuntime> {
EntityPlayerActionPack ap = player.getMinionActionPack(); EntityPlayerActionPack ap = player.getMinionActionPack();
if(currentBlock != null) { if(currentBlock != null) {
player.getWorld().setBlockBreakingInfo(-1, currentBlock, -1); player.level().destroyBlockProgress(-1, currentBlock, -1);
player.interactionManager.processBlockBreakingAction(currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getWorld().getTopYInclusive(), -1); player.gameMode.handleBlockBreakAction(currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.level().getMaxY(), -1);
} }
} }
@@ -126,15 +126,15 @@ public class MineBlockExecution implements InstructionExecution<MinionRuntime> {
} }
@Override @Override
public void save(WriteView view, MinionRuntime runtime) { public void save(ValueOutput view, MinionRuntime runtime) {
view.put("currentBlock", BlockPos.CODEC, currentBlock); view.store("currentBlock", BlockPos.CODEC, currentBlock);
view.putFloat("currentBlockDamage", currentBlockDamage); view.putFloat("currentBlockDamage", currentBlockDamage);
} }
@Override @Override
public void load(ReadView view, MinionRuntime runtime) { public void load(ValueInput view, MinionRuntime runtime) {
currentBlock = view.read("currentBlock", BlockPos.CODEC).orElse(null); currentBlock = view.read("currentBlock", BlockPos.CODEC).orElse(null);
currentBlockDamage = view.getFloat("currentBlockDamage", 0); currentBlockDamage = view.getFloatOr("currentBlockDamage", 0);
if(currentBlock == null) { if(currentBlock == null) {
done = true; done = true;
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/inventory/SwapItemExecution.java
+23 -23
View File
@@ -7,12 +7,12 @@ import io.github.skippyall.minions.program.instruction.InstructionExecution;
import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.Parameter;
import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.program.supplier.ParameterValueList;
import io.github.skippyall.minions.registration.ValueTypes; import io.github.skippyall.minions.registration.ValueTypes;
import net.minecraft.item.ItemStack; import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.screen.ScreenHandler; import net.minecraft.world.inventory.ClickType;
import net.minecraft.screen.slot.Slot; import net.minecraft.world.inventory.Slot;
import net.minecraft.screen.slot.SlotActionType; import net.minecraft.world.item.ItemStack;
import net.minecraft.storage.ReadView; import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.storage.WriteView; import net.minecraft.world.level.storage.ValueOutput;
public class SwapItemExecution implements InstructionExecution<MinionRuntime> { public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
public static final Parameter<Long> FROM_SLOT = new Parameter<>("from_slot", ValueTypes.LONG); public static final Parameter<Long> FROM_SLOT = new Parameter<>("from_slot", ValueTypes.LONG);
@@ -31,7 +31,7 @@ public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
public void start(MinionRuntime runtime) { public void start(MinionRuntime runtime) {
MinionFakePlayer minion = runtime.getMinion(); MinionFakePlayer minion = runtime.getMinion();
if((fromScreen || toScreen) && minion.currentScreenHandler == null) { if((fromScreen || toScreen) && minion.containerMenu == null) {
return; return;
} }
if(!(checkBounds(minion, fromSlot, fromScreen) && checkBounds(minion, toSlot, toScreen))) { if(!(checkBounds(minion, fromSlot, fromScreen) && checkBounds(minion, toSlot, toScreen))) {
@@ -48,14 +48,14 @@ public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
simulateClick(minion, fromSlot, fromScreen); simulateClick(minion, fromSlot, fromScreen);
simulateClick(minion, toSlot, toScreen); simulateClick(minion, toSlot, toScreen);
simulateClick(minion, fromSlot, fromScreen); simulateClick(minion, fromSlot, fromScreen);
minion.getInventory().offerOrDrop(cursor); minion.getInventory().placeItemBackInInventory(cursor);
} }
private ScreenHandler getScreen(MinionFakePlayer minion, boolean screen) { private AbstractContainerMenu getScreen(MinionFakePlayer minion, boolean screen) {
if(screen) { if(screen) {
return minion.currentScreenHandler; return minion.containerMenu;
} else { } else {
return minion.playerScreenHandler; return minion.inventoryMenu;
} }
} }
@@ -64,16 +64,16 @@ public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
} }
private ItemStack getStack(MinionFakePlayer minion, int slot, boolean screen) { private ItemStack getStack(MinionFakePlayer minion, int slot, boolean screen) {
return getScreen(minion, screen).getSlot(slot).getStack(); return getScreen(minion, screen).getSlot(slot).getItem();
} }
private boolean canExchange(MinionFakePlayer minion, int slotIndex, boolean screen, ItemStack newStack) { private boolean canExchange(MinionFakePlayer minion, int slotIndex, boolean screen, ItemStack newStack) {
ScreenHandler screenHandler = getScreen(minion, screen); AbstractContainerMenu screenHandler = getScreen(minion, screen);
Slot slot = screenHandler.getSlot(slotIndex); Slot slot = screenHandler.getSlot(slotIndex);
if(!slot.getStack().isEmpty() && !slot.canTakeItems(minion)) { if(!slot.getItem().isEmpty() && !slot.mayPickup(minion)) {
return false; return false;
} }
if(!newStack.isEmpty() && !slot.canInsert(newStack)) { if(!newStack.isEmpty() && !slot.mayPlace(newStack)) {
return false; return false;
} }
/*else { /*else {
@@ -90,12 +90,12 @@ public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
} }
private void simulateClick(MinionFakePlayer minion, int slotIndex, boolean screen) { private void simulateClick(MinionFakePlayer minion, int slotIndex, boolean screen) {
ScreenHandler screenHandler = getScreen(minion, screen); AbstractContainerMenu screenHandler = getScreen(minion, screen);
ItemStack previousCursor = screenHandler.getCursorStack(); ItemStack previousCursor = screenHandler.getCarried();
screenHandler.setCursorStack(cursor); screenHandler.setCarried(cursor);
screenHandler.onSlotClick(slotIndex, 0, SlotActionType.SWAP, minion); screenHandler.clicked(slotIndex, 0, ClickType.SWAP, minion);
cursor = screenHandler.getCursorStack(); cursor = screenHandler.getCarried();
screenHandler.setCursorStack(previousCursor); screenHandler.setCarried(previousCursor);
} }
@Override @Override
@@ -122,12 +122,12 @@ public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
} }
@Override @Override
public void save(WriteView view, MinionRuntime runtime) { public void save(ValueOutput view, MinionRuntime runtime) {
} }
@Override @Override
public void load(ReadView view, MinionRuntime runtime) { public void load(ValueInput view, MinionRuntime runtime) {
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/AbstractTurnExecution.java
+9 -9
View File
@@ -2,8 +2,8 @@ package io.github.skippyall.minions.minion.program.instruction.move;
import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.program.instruction.InstructionExecution; import io.github.skippyall.minions.program.instruction.InstructionExecution;
import net.minecraft.storage.ReadView; import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.storage.WriteView; import net.minecraft.world.level.storage.ValueOutput;
public abstract class AbstractTurnExecution implements InstructionExecution<MinionRuntime> { public abstract class AbstractTurnExecution implements InstructionExecution<MinionRuntime> {
protected float targetYaw; protected float targetYaw;
@@ -13,26 +13,26 @@ public abstract class AbstractTurnExecution implements InstructionExecution<Mini
@Override @Override
public void tick(MinionRuntime minion) { public void tick(MinionRuntime minion) {
float rotateYaw = targetYaw - minion.getMinion().getYaw(); float rotateYaw = targetYaw - minion.getMinion().getYRot();
float rotatePitch = targetPitch - minion.getMinion().getPitch(); float rotatePitch = targetPitch - minion.getMinion().getXRot();
minion.getMinion().getMinionActionPack().turn(Math.min(rotateYaw, anglePerTick), Math.min(rotatePitch, anglePerTick)); minion.getMinion().getMinionActionPack().turn(Math.min(rotateYaw, anglePerTick), Math.min(rotatePitch, anglePerTick));
} }
@Override @Override
public boolean isDone(MinionRuntime minion) { public boolean isDone(MinionRuntime minion) {
return Math.abs(targetYaw - minion.getMinion().getYaw()) < 0.001F && Math.abs(targetPitch - minion.getMinion().getPitch()) < 0.001F; return Math.abs(targetYaw - minion.getMinion().getYRot()) < 0.001F && Math.abs(targetPitch - minion.getMinion().getXRot()) < 0.001F;
} }
@Override @Override
public void save(WriteView view, MinionRuntime runtime) { public void save(ValueOutput view, MinionRuntime runtime) {
view.putFloat("targetYaw", targetYaw); view.putFloat("targetYaw", targetYaw);
view.putFloat("targetPitch", targetPitch); view.putFloat("targetPitch", targetPitch);
} }
@Override @Override
public void load(ReadView view, MinionRuntime runtime) { public void load(ValueInput view, MinionRuntime runtime) {
targetYaw = view.getFloat("targetYaw", 0); targetYaw = view.getFloatOr("targetYaw", 0);
targetPitch = view.getFloat("targetPitch", 0); targetPitch = view.getFloatOr("targetPitch", 0);
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/ContinuousWalkExecution.java
+2 -2
View File
@@ -3,11 +3,11 @@ package io.github.skippyall.minions.minion.program.instruction.move;
import io.github.skippyall.minions.minion.MinionRuntime; import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.program.instruction.InstructionExecution; import io.github.skippyall.minions.program.instruction.InstructionExecution;
import io.github.skippyall.minions.program.instruction.execution.ContinuousInstructionExecution; import io.github.skippyall.minions.program.instruction.execution.ContinuousInstructionExecution;
import net.minecraft.entity.MovementType; import net.minecraft.world.entity.MoverType;
public class ContinuousWalkExecution implements ContinuousInstructionExecution<MinionRuntime>, InstructionExecution.Stateless<MinionRuntime> { public class ContinuousWalkExecution implements ContinuousInstructionExecution<MinionRuntime>, InstructionExecution.Stateless<MinionRuntime> {
@Override @Override
public void tick(MinionRuntime minion) { public void tick(MinionRuntime minion) {
minion.getMinion().move(MovementType.SELF, minion.getMinion().getHorizontalFacing().getDoubleVector().normalize().multiply(minion.getMinion().getMovementSpeed())); minion.getMinion().move(MoverType.SELF, minion.getMinion().getDirection().getUnitVec3().normalize().scale(minion.getMinion().getSpeed()));
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnDirection.java
+4 -5
View File
@@ -3,17 +3,16 @@ package io.github.skippyall.minions.minion.program.instruction.move;
import com.mojang.serialization.Codec; import com.mojang.serialization.Codec;
import io.github.skippyall.minions.gui.Displayable; import io.github.skippyall.minions.gui.Displayable;
import io.github.skippyall.minions.gui.GuiDisplay; import io.github.skippyall.minions.gui.GuiDisplay;
import net.minecraft.util.StringIdentifiable;
import java.util.UUID; import java.util.UUID;
import net.minecraft.util.StringRepresentable;
public enum TurnDirection implements StringIdentifiable, Displayable { public enum TurnDirection implements StringRepresentable, Displayable {
LEFT("left", -1, 0), LEFT("left", -1, 0),
UP("up", 0, -1), UP("up", 0, -1),
RIGHT("right", 1, 0), RIGHT("right", 1, 0),
DOWN("down", 0, 1); DOWN("down", 0, 1);
public static final Codec<TurnDirection> CODEC = StringIdentifiable.createCodec(TurnDirection::values); public static final Codec<TurnDirection> CODEC = StringRepresentable.fromEnum(TurnDirection::values);
private static final UUID MHF_ArrowLeft = UUID.fromString("a68f0b64-8d14-4000-a95f-4b9ba14f8df9"); private static final UUID MHF_ArrowLeft = UUID.fromString("a68f0b64-8d14-4000-a95f-4b9ba14f8df9");
private static final UUID MHF_ArrowUp = UUID.fromString("fef039ef-e6cd-4987-9c84-26a3e6134277"); private static final UUID MHF_ArrowUp = UUID.fromString("fef039ef-e6cd-4987-9c84-26a3e6134277");
@@ -31,7 +30,7 @@ public enum TurnDirection implements StringIdentifiable, Displayable {
} }
@Override @Override
public String asString() { public String getSerializedName() {
return name; return name;
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnExecution.java
+2 -2
View File
@@ -17,7 +17,7 @@ public class TurnExecution extends AbstractTurnExecution {
float turnYaw = maxAngle * direction.xFactor; float turnYaw = maxAngle * direction.xFactor;
float turnPitch = maxAngle * direction.yFactor; float turnPitch = maxAngle * direction.yFactor;
targetYaw = minion.getMinion().getYaw() + turnYaw; targetYaw = minion.getMinion().getYRot() + turnYaw;
targetPitch = minion.getMinion().getPitch() + turnPitch; targetPitch = minion.getMinion().getXRot() + turnPitch;
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnVectorExecution.java
+9 -9
View File
@@ -4,9 +4,9 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.Parameter;
import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.program.supplier.ParameterValueList;
import io.github.skippyall.minions.registration.ValueTypes; import io.github.skippyall.minions.registration.ValueTypes;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.Mth;
import net.minecraft.util.math.Vec2f; import net.minecraft.world.phys.Vec2;
import net.minecraft.util.math.Vec3d; import net.minecraft.world.phys.Vec3;
public class TurnVectorExecution extends AbstractTurnExecution { public class TurnVectorExecution extends AbstractTurnExecution {
public static final Parameter<Double> X = new Parameter<>("x", ValueTypes.DOUBLE); public static final Parameter<Double> X = new Parameter<>("x", ValueTypes.DOUBLE);
@@ -19,18 +19,18 @@ public class TurnVectorExecution extends AbstractTurnExecution {
double y = arguments.getValue(Y); double y = arguments.getValue(Y);
double z = arguments.getValue(Z); double z = arguments.getValue(Z);
Vec3d vector = new Vec3d(x, y, z); Vec3 vector = new Vec3(x, y, z);
Vec2f rotation = vectorToRotation(vector); Vec2 rotation = vectorToRotation(vector);
targetYaw = rotation.x; targetYaw = rotation.x;
targetPitch = rotation.y; targetPitch = rotation.y;
} }
//copied from Entity#lookAt (why no helper, Mojang?) //copied from Entity#lookAt (why no helper, Mojang?)
public static Vec2f vectorToRotation(Vec3d vector) { public static Vec2 vectorToRotation(Vec3 vector) {
double g = Math.sqrt(vector.x * vector.x + vector.z * vector.z); double g = Math.sqrt(vector.x * vector.x + vector.z * vector.z);
float pitch = MathHelper.wrapDegrees((float)(-(MathHelper.atan2(vector.y, g) * 180.0F / (float)Math.PI))); float pitch = Mth.wrapDegrees((float)(-(Mth.atan2(vector.y, g) * 180.0F / (float)Math.PI)));
float yaw = MathHelper.wrapDegrees((float)(MathHelper.atan2(vector.z, vector.x) * 180.0F / (float)Math.PI) - 90.0F); float yaw = Mth.wrapDegrees((float)(Mth.atan2(vector.z, vector.x) * 180.0F / (float)Math.PI) - 90.0F);
return new Vec2f(yaw, pitch); return new Vec2(yaw, pitch);
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/WalkExecution.java
+9 -9
View File
@@ -5,9 +5,9 @@ import io.github.skippyall.minions.program.instruction.InstructionExecution;
import io.github.skippyall.minions.program.supplier.Parameter; import io.github.skippyall.minions.program.supplier.Parameter;
import io.github.skippyall.minions.program.supplier.ParameterValueList; import io.github.skippyall.minions.program.supplier.ParameterValueList;
import io.github.skippyall.minions.registration.ValueTypes; import io.github.skippyall.minions.registration.ValueTypes;
import net.minecraft.entity.MovementType; import net.minecraft.world.entity.MoverType;
import net.minecraft.storage.ReadView; import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.storage.WriteView; import net.minecraft.world.level.storage.ValueOutput;
public class WalkExecution implements InstructionExecution<MinionRuntime> { public class WalkExecution implements InstructionExecution<MinionRuntime> {
public static final Parameter<Double> blocksToMoveParam = new Parameter<>("blocksToMove", ValueTypes.DOUBLE); public static final Parameter<Double> blocksToMoveParam = new Parameter<>("blocksToMove", ValueTypes.DOUBLE);
@@ -18,8 +18,8 @@ public class WalkExecution implements InstructionExecution<MinionRuntime> {
@Override @Override
public void tick(MinionRuntime minion) { public void tick(MinionRuntime minion) {
double speed = Math.min(minion.getMinion().getMovementSpeed(), totalBlocksToMove - blocksMoved); double speed = Math.min(minion.getMinion().getSpeed(), totalBlocksToMove - blocksMoved);
minion.getMinion().move(MovementType.SELF, minion.getMinion().getHorizontalFacing().getDoubleVector().normalize().multiply(speed)); minion.getMinion().move(MoverType.SELF, minion.getMinion().getDirection().getUnitVec3().normalize().scale(speed));
blocksMoved += speed; blocksMoved += speed;
} }
@@ -35,14 +35,14 @@ public class WalkExecution implements InstructionExecution<MinionRuntime> {
} }
@Override @Override
public void save(WriteView view, MinionRuntime minion) { public void save(ValueOutput view, MinionRuntime minion) {
view.putDouble("totalBlocksToMove", totalBlocksToMove); view.putDouble("totalBlocksToMove", totalBlocksToMove);
view.putDouble("blocksMoved", blocksMoved); view.putDouble("blocksMoved", blocksMoved);
} }
@Override @Override
public void load(ReadView view, MinionRuntime minion) { public void load(ValueInput view, MinionRuntime minion) {
totalBlocksToMove = view.getDouble("totalBlocksToMove", 0F); totalBlocksToMove = view.getDoubleOr("totalBlocksToMove", 0F);
blocksMoved = view.getDouble("blocksMoved", 0F); blocksMoved = view.getDoubleOr("blocksMoved", 0F);
} }
} }
src/main/java/io/github/skippyall/minions/minion/program/supplier/AnalogInputSupplier.java
+19 -19
View File
@@ -16,36 +16,36 @@ import io.github.skippyall.minions.registration.MinionComponentTypes;
import io.github.skippyall.minions.registration.MinionItems; import io.github.skippyall.minions.registration.MinionItems;
import io.github.skippyall.minions.registration.ValueSuppliers; import io.github.skippyall.minions.registration.ValueSuppliers;
import io.github.skippyall.minions.registration.ValueTypes; import io.github.skippyall.minions.registration.ValueTypes;
import net.minecraft.item.ItemStack;
import net.minecraft.registry.RegistryKey;
import net.minecraft.screen.ScreenHandlerType;
import net.minecraft.text.Text;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> { public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> {
public static final Codec<AnalogInputSupplier> CODEC = RecordCodecBuilder.create(instance -> public static final Codec<AnalogInputSupplier> CODEC = RecordCodecBuilder.create(instance ->
instance.group( instance.group(
World.CODEC.fieldOf("analogInputWorld").forGetter(s -> s.analogInputWorld), Level.RESOURCE_KEY_CODEC.fieldOf("analogInputWorld").forGetter(s -> s.analogInputWorld),
BlockPos.CODEC.fieldOf("analogInputPos").forGetter(s -> s.analogInputPos) BlockPos.CODEC.fieldOf("analogInputPos").forGetter(s -> s.analogInputPos)
).apply(instance, AnalogInputSupplier::new)); ).apply(instance, AnalogInputSupplier::new));
private final RegistryKey<World> analogInputWorld; private final ResourceKey<Level> analogInputWorld;
private final BlockPos analogInputPos; private final BlockPos analogInputPos;
public AnalogInputSupplier(RegistryKey<World> analogInputWorld, BlockPos analogInputPos) { public AnalogInputSupplier(ResourceKey<Level> analogInputWorld, BlockPos analogInputPos) {
this.analogInputWorld = analogInputWorld; this.analogInputWorld = analogInputWorld;
this.analogInputPos = analogInputPos; this.analogInputPos = analogInputPos;
} }
@Override @Override
public Long resolve(MinionRuntime minion) { public Long resolve(MinionRuntime minion) {
World world = minion.getMinion().getServer().getWorld(analogInputWorld); Level world = minion.getMinion().getServer().getLevel(analogInputWorld);
if(world != null && world.isPosLoaded(analogInputPos) && world.getBlockState(analogInputPos).isOf(MinionBlocks.ANALOG_INPUT_BLOCK)) { if(world != null && world.isLoaded(analogInputPos) && world.getBlockState(analogInputPos).is(MinionBlocks.ANALOG_INPUT_BLOCK)) {
return (long) world.getReceivedRedstonePower(analogInputPos); return (long) world.getBestNeighborSignal(analogInputPos);
} else { } else {
return 0L; return 0L;
} }
@@ -62,8 +62,8 @@ public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> {
} }
@Override @Override
public Text getDisplayText() { public Component getDisplayText() {
return Text.translatable("value_supplier.minions.analog_input.display", analogInputPos.toShortString(), analogInputWorld.getValue().toString()); return Component.translatable("value_supplier.minions.analog_input.display", analogInputPos.toShortString(), analogInputWorld.location().toString());
} }
public static class AnalogInputSupplierType extends ValueSupplierType<MinionRuntime> { public static class AnalogInputSupplierType extends ValueSupplierType<MinionRuntime> {
@@ -79,22 +79,22 @@ public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> {
public <T> CompletableFuture<ValueSupplier<?, MinionRuntime>> openConfiguration(MinionsGui parent, ValueType<T> valueType, @Nullable ValueSupplier<?, MinionRuntime> previous) { public <T> CompletableFuture<ValueSupplier<?, MinionRuntime>> openConfiguration(MinionsGui parent, ValueType<T> valueType, @Nullable ValueSupplier<?, MinionRuntime> previous) {
CompletableFuture<ValueSupplier<?, MinionRuntime>> future = new CompletableFuture<>(); CompletableFuture<ValueSupplier<?, MinionRuntime>> future = new CompletableFuture<>();
new SimpleMinionsGui(parent, (onClose, me) -> { new SimpleMinionsGui(parent, (onClose, me) -> {
SimpleGui gui = new SimpleGui(ScreenHandlerType.GENERIC_3X3, parent.getViewer(), false) { SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, parent.getViewer(), false) {
@Override @Override
public void onClose() { public void onClose() {
onClose.run(); onClose.run();
} }
}; };
gui.setTitle(Text.translatable("value_supplier.minions.analog_input")); gui.setTitle(Component.translatable("value_supplier.minions.analog_input"));
gui.setSlot(4, new GuiElementBuilder(MinionItems.REFERENCE_ITEM) gui.setSlot(4, new GuiElementBuilder(MinionItems.REFERENCE_ITEM)
.setCallback(() -> { .setCallback(() -> {
ItemStack cursor = parent.getViewer().currentScreenHandler.getCursorStack(); ItemStack cursor = parent.getViewer().containerMenu.getCarried();
if (cursor.isOf(MinionItems.REFERENCE_ITEM) && cursor.get(MinionComponentTypes.REFERENCE) instanceof BlockPosClipboard pos) { if (cursor.is(MinionItems.REFERENCE_ITEM) && cursor.get(MinionComponentTypes.REFERENCE) instanceof BlockPosClipboard pos) {
future.complete(new AnalogInputSupplier(pos.world(), pos.pos())); future.complete(new AnalogInputSupplier(pos.world(), pos.pos()));
} }
}) })
.setItemName(Text.translatable("value_supplier.minions.analog_input.config.click_with_reference")) .setItemName(Component.translatable("value_supplier.minions.analog_input.config.click_with_reference"))
); );
gui.open(); gui.open();
return gui; return gui;
src/main/java/io/github/skippyall/minions/minion/skin/Base64SkinProvider.java
+36 -37
View File
@@ -3,39 +3,38 @@ package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.properties.Property; import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap; import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.Minions; import io.github.skippyall.minions.Minions;
import net.minecraft.dialog.AfterAction;
import net.minecraft.dialog.DialogActionButtonData;
import net.minecraft.dialog.DialogButtonData;
import net.minecraft.dialog.DialogCommonData;
import net.minecraft.dialog.action.DynamicCustomDialogAction;
import net.minecraft.dialog.input.TextInputControl;
import net.minecraft.dialog.type.Dialog;
import net.minecraft.dialog.type.DialogInput;
import net.minecraft.dialog.type.NoticeDialog;
import net.minecraft.nbt.NbtCompound;
import net.minecraft.nbt.NbtElement;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import net.minecraft.util.Identifier;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.core.Holder;
import net.minecraft.core.registries.Registries;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.Tag;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.dialog.ActionButton;
import net.minecraft.server.dialog.CommonButtonData;
import net.minecraft.server.dialog.CommonDialogData;
import net.minecraft.server.dialog.Dialog;
import net.minecraft.server.dialog.DialogAction;
import net.minecraft.server.dialog.Input;
import net.minecraft.server.dialog.NoticeDialog;
import net.minecraft.server.dialog.action.CustomAll;
import net.minecraft.server.dialog.input.TextInput;
import net.minecraft.server.level.ServerPlayer;
public class Base64SkinProvider implements SkinProvider { public class Base64SkinProvider implements SkinProvider {
public static final RegistryKey<Dialog> DIALOG = RegistryKey.of(RegistryKeys.DIALOG, Identifier.of(Minions.MOD_ID, "base_64_input")); public static final ResourceKey<Dialog> DIALOG = ResourceKey.create(Registries.DIALOG, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "base_64_input"));
public static final Identifier CUSTOM_DIALOG_ACTION = Identifier.of(Minions.MOD_ID, "base_64_submit"); public static final ResourceLocation CUSTOM_DIALOG_ACTION = ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "base_64_submit");
private static long dialogIdCounter = 0; private static long dialogIdCounter = 0;
private static Map<Long, CompletableFuture<Optional<PropertyMap>>> futures = new HashMap<>(); private static Map<Long, CompletableFuture<Optional<PropertyMap>>> futures = new HashMap<>();
@Override @Override
public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player) { public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player) {
dialogIdCounter++; dialogIdCounter++;
player.openDialog(getDialog()); player.openDialog(getDialog());
CompletableFuture<Optional<PropertyMap>> future = new CompletableFuture<>(); CompletableFuture<Optional<PropertyMap>> future = new CompletableFuture<>();
@@ -43,8 +42,8 @@ public class Base64SkinProvider implements SkinProvider {
return future; return future;
} }
public static void onCustomDialogAction(Optional<NbtElement> element) { public static void onCustomDialogAction(Optional<Tag> element) {
if(element.isPresent() && element.get() instanceof NbtCompound compound) { if(element.isPresent() && element.get() instanceof CompoundTag compound) {
Optional<Long> id = compound.getLong("dialog_id"); Optional<Long> id = compound.getLong("dialog_id");
Optional<String> base64 = compound.getString("base_64"); Optional<String> base64 = compound.getString("base_64");
if(id.isPresent() && base64.isPresent() && !base64.get().isBlank()) { if(id.isPresent() && base64.isPresent() && !base64.get().isBlank()) {
@@ -59,22 +58,22 @@ public class Base64SkinProvider implements SkinProvider {
} }
} }
private static RegistryEntry<Dialog> getDialog() { private static Holder<Dialog> getDialog() {
NbtCompound additionalData = new NbtCompound(); CompoundTag additionalData = new CompoundTag();
additionalData.putLong("dialog_id", dialogIdCounter); additionalData.putLong("dialog_id", dialogIdCounter);
return RegistryEntry.of( return Holder.direct(
new NoticeDialog( new NoticeDialog(
new DialogCommonData( new CommonDialogData(
Text.translatable("minions.gui.look.skin.base64.title"), Component.translatable("minions.gui.look.skin.base64.title"),
Optional.empty(), Optional.empty(),
true, true,
false, false,
AfterAction.CLOSE, DialogAction.CLOSE,
List.of(), List.of(),
List.of( List.of(
new DialogInput("base_64", new TextInputControl( new Input("base_64", new TextInput(
200, 200,
Text.empty(), Component.empty(),
false, false,
"", "",
2000, 2000,
@@ -82,13 +81,13 @@ public class Base64SkinProvider implements SkinProvider {
)) ))
) )
), ),
new DialogActionButtonData( new ActionButton(
new DialogButtonData( new CommonButtonData(
Text.translatable("gui.ok"), Component.translatable("gui.ok"),
150 150
), ),
Optional.of( Optional.of(
new DynamicCustomDialogAction( new CustomAll(
CUSTOM_DIALOG_ACTION, CUSTOM_DIALOG_ACTION,
Optional.of( Optional.of(
additionalData additionalData
@@ -101,7 +100,7 @@ public class Base64SkinProvider implements SkinProvider {
} }
@Override @Override
public Text getDisplayName() { public Component getDisplayName() {
return Text.translatable("minions.gui.look.skin.base64"); return Component.translatable("minions.gui.look.skin.base64");
} }
} }
src/main/java/io/github/skippyall/minions/minion/skin/NameSkinProvider.java
+8 -9
View File
@@ -3,23 +3,22 @@ package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.PropertyMap; import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.gui.input.TextInput; import io.github.skippyall.minions.gui.input.TextInput;
import net.minecraft.block.entity.SkullBlockEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.block.entity.SkullBlockEntity;
public class NameSkinProvider implements SkinProvider { public class NameSkinProvider implements SkinProvider {
@Override @Override
public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player) { public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player) {
return TextInput.inputString(player, Text.translatable("minions.gui.look.skin.name.title"), "") return TextInput.inputString(player, Component.translatable("minions.gui.look.skin.name.title"), "")
.thenCompose(SkullBlockEntity::fetchProfileByName) .thenCompose(SkullBlockEntity::fetchGameProfile)
.thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties)); .thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties));
} }
@Override @Override
public Text getDisplayName() { public Component getDisplayName() {
return Text.translatable("minions.gui.look.skin.name"); return Component.translatable("minions.gui.look.skin.name");
} }
} }
src/main/java/io/github/skippyall/minions/minion/skin/SkinProvider.java
+4 -5
View File
@@ -1,14 +1,13 @@
package io.github.skippyall.minions.minion.skin; package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.properties.PropertyMap; import com.mojang.authlib.properties.PropertyMap;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
public interface SkinProvider { public interface SkinProvider {
CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player); CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player);
Text getDisplayName(); Component getDisplayName();
} }
src/main/java/io/github/skippyall/minions/minion/skin/UUIDSkinProvider.java
+8 -9
View File
@@ -3,24 +3,23 @@ package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.PropertyMap; import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.gui.input.TextInput; import io.github.skippyall.minions.gui.input.TextInput;
import net.minecraft.block.entity.SkullBlockEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.text.Text;
import java.util.Optional; import java.util.Optional;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.block.entity.SkullBlockEntity;
public class UUIDSkinProvider implements SkinProvider { public class UUIDSkinProvider implements SkinProvider {
@Override @Override
public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayerEntity player) { public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player) {
return TextInput.inputString(player, Text.translatable("minions.gui.look.skin.uuid.title"), "") return TextInput.inputString(player, Component.translatable("minions.gui.look.skin.uuid.title"), "")
.thenCompose(uuidString -> SkullBlockEntity.fetchProfileByUuid(UUID.fromString(uuidString))) .thenCompose(uuidString -> SkullBlockEntity.fetchGameProfile(UUID.fromString(uuidString)))
.thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties)); .thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties));
} }
@Override @Override
public Text getDisplayName() { public Component getDisplayName() {
return Text.translatable("minions.gui.look.skin.uuid"); return Component.translatable("minions.gui.look.skin.uuid");
} }
} }
src/main/java/io/github/skippyall/minions/mixinhelper/EntityViewMixinHelper.java
+1 -2
View File
@@ -1,8 +1,7 @@
package io.github.skippyall.minions.mixinhelper; package io.github.skippyall.minions.mixinhelper;
import net.minecraft.entity.Entity;
import java.util.function.Predicate; import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
public class EntityViewMixinHelper { public class EntityViewMixinHelper {
public static final ThreadLocal<Predicate<Entity>> ADDITIONAL_PREDICATE = ThreadLocal.withInitial(() -> entity -> true); public static final ThreadLocal<Predicate<Entity>> ADDITIONAL_PREDICATE = ThreadLocal.withInitial(() -> entity -> true);
src/main/java/io/github/skippyall/minions/mixinhelper/antimobcap/ChunkLevelManagerAccessor.java
+4 -4
View File
@@ -1,11 +1,11 @@
package io.github.skippyall.minions.mixinhelper.antimobcap; package io.github.skippyall.minions.mixinhelper.antimobcap;
import it.unimi.dsi.fastutil.objects.ObjectSet; import it.unimi.dsi.fastutil.objects.ObjectSet;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.DistanceManager;
import net.minecraft.server.world.ChunkLevelManager; import net.minecraft.server.level.ServerPlayer;
public interface ChunkLevelManagerAccessor { public interface ChunkLevelManagerAccessor {
ObjectSet<ServerPlayerEntity> minions$getPlayers(long chunkpos); ObjectSet<ServerPlayer> minions$getPlayers(long chunkpos);
ChunkLevelManager.DistanceFromNearestPlayerTracker minions$getMinionless(); DistanceManager.FixedPlayerDistanceChunkTracker minions$getMinionless();
} }
src/main/java/io/github/skippyall/minions/mixins/ChunkTicketManagerFixMixin.java
+4 -4
View File
@@ -3,20 +3,20 @@ package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import it.unimi.dsi.fastutil.objects.ObjectSet; import it.unimi.dsi.fastutil.objects.ObjectSet;
import net.minecraft.server.world.ChunkLevelManager; import net.minecraft.server.level.DistanceManager;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(value = ChunkLevelManager.class) @Mixin(value = DistanceManager.class)
public class ChunkTicketManagerFixMixin { public class ChunkTicketManagerFixMixin {
@Shadow @Shadow
@Final @Final
private static Logger LOGGER; private static Logger LOGGER;
@WrapOperation(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z", remap = false)) @WrapOperation(method = "removePlayer", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z", remap = false))
public boolean filterIfNull(ObjectSet instance, Object o, Operation<Boolean> original) { public boolean filterIfNull(ObjectSet instance, Object o, Operation<Boolean> original) {
if (instance != null) { if (instance != null) {
return original.call(instance, o); return original.call(instance, o);
@@ -27,7 +27,7 @@ public class ChunkTicketManagerFixMixin {
return false;//Unused return false;//Unused
} }
@WrapOperation(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;isEmpty()Z", remap = false)) @WrapOperation(method = "removePlayer", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;isEmpty()Z", remap = false))
public boolean filterIfNull(ObjectSet instance, Operation<Boolean> original) { public boolean filterIfNull(ObjectSet instance, Operation<Boolean> original) {
if (instance != null) { if (instance != null) {
return original.call(instance); return original.call(instance);
src/main/java/io/github/skippyall/minions/mixins/ClientboundPlayerInfoUpdatePacket$EntryMixin.java
+22
View File
@@ -0,0 +1,22 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.network.protocol.game.ClientboundPlayerInfoUpdatePacket;
import net.minecraft.server.level.ServerPlayer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(ClientboundPlayerInfoUpdatePacket.Entry.class)
public class ClientboundPlayerInfoUpdatePacket$EntryMixin {
@ModifyArg(method = "<init>(Lnet/minecraft/server/level/ServerPlayer;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/game/ClientboundPlayerInfoUpdatePacket$Entry;<init>(Ljava/util/UUID;Lcom/mojang/authlib/GameProfile;ZILnet/minecraft/world/level/GameType;Lnet/minecraft/network/chat/Component;ZILnet/minecraft/network/chat/RemoteChatSession$Data;)V"), index = 2)
private static boolean removeMinionFromTabList(boolean original, @Local(argsOnly = true) ServerPlayer player) {
if(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.showInTabList)) {
return false;
}
return original;
}
}
src/main/java/io/github/skippyall/minions/mixins/ConnectionMixin.java
+2 -2
View File
@@ -3,11 +3,11 @@ package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.minion.fakeplayer.ClientConnectionInterface; import io.github.skippyall.minions.minion.fakeplayer.ClientConnectionInterface;
import io.netty.channel.Channel; import io.netty.channel.Channel;
import net.minecraft.network.ClientConnection; import net.minecraft.network.Connection;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor; import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ClientConnection.class) @Mixin(Connection.class)
public abstract class ConnectionMixin implements ClientConnectionInterface { public abstract class ConnectionMixin implements ClientConnectionInterface {
@Override @Override
@Accessor //Compat with adventure-platform-fabric @Accessor //Compat with adventure-platform-fabric
src/main/java/io/github/skippyall/minions/mixins/EntityAccessor.java
+2 -2
View File
@@ -1,16 +1,16 @@
package io.github.skippyall.minions.mixins; package io.github.skippyall.minions.mixins;
import net.minecraft.entity.Entity;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker; import org.spongepowered.asm.mixin.gen.Invoker;
import java.util.stream.Stream; import java.util.stream.Stream;
import net.minecraft.world.entity.Entity;
@Mixin(Entity.class) @Mixin(Entity.class)
public interface EntityAccessor { public interface EntityAccessor {
@Invoker("canAddPassenger") @Invoker("canAddPassenger")
boolean minions$canAddPassenger(Entity other); boolean minions$canAddPassenger(Entity other);
@Invoker("streamIntoPassengers") @Invoker("getIndirectPassengersStream")
Stream<Entity> minions$streamIntoPassengers(); Stream<Entity> minions$streamIntoPassengers();
} }
src/main/java/io/github/skippyall/minions/mixins/EntityViewMixin.java → src/main/java/io/github/skippyall/minions/mixins/EntityGetterMixin.java
+5 -5
View File
@@ -1,18 +1,18 @@
package io.github.skippyall.minions.mixins; package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper; import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
import net.minecraft.entity.Entity;
import net.minecraft.world.EntityView;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyArg;
import java.util.function.Predicate; import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.EntityGetter;
@Mixin(EntityView.class) @Mixin(EntityGetter.class)
public interface EntityViewMixin { public interface EntityGetterMixin {
@ModifyArg(method = "getClosestPlayer(DDDDZ)Lnet/minecraft/entity/player/PlayerEntity;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/EntityView;getClosestPlayer(DDDDLjava/util/function/Predicate;)Lnet/minecraft/entity/player/PlayerEntity;")) @ModifyArg(method = "getNearestPlayer(DDDDZ)Lnet/minecraft/world/entity/player/Player;", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/EntityGetter;getNearestPlayer(DDDDLjava/util/function/Predicate;)Lnet/minecraft/world/entity/player/Player;"))
private @Nullable Predicate<Entity> addMinionPredicate(@Nullable Predicate<Entity> targetPredicate) { private @Nullable Predicate<Entity> addMinionPredicate(@Nullable Predicate<Entity> targetPredicate) {
Predicate<Entity> predicate = EntityViewMixinHelper.ADDITIONAL_PREDICATE.get(); Predicate<Entity> predicate = EntityViewMixinHelper.ADDITIONAL_PREDICATE.get();
if(targetPredicate != null) { if(targetPredicate != null) {
src/main/java/io/github/skippyall/minions/mixins/EntityMixin.java
+6 -6
View File
@@ -1,9 +1,9 @@
package io.github.skippyall.minions.mixins; package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.entity.LivingEntity; import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.World; import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@@ -17,11 +17,11 @@ public abstract class EntityMixin {
public abstract @Nullable LivingEntity getControllingPassenger(); public abstract @Nullable LivingEntity getControllingPassenger();
@Shadow @Shadow
private World world; private Level level;
@Inject(method = "isLogicalSideForUpdatingMovement", at = @At("HEAD"), cancellable = true) @Inject(method = "isLocalInstanceAuthoritative", at = @At("HEAD"), cancellable = true)
private void isFakePlayer(CallbackInfoReturnable<Boolean> cir) private void isFakePlayer(CallbackInfoReturnable<Boolean> cir)
{ {
if (getControllingPassenger() instanceof MinionFakePlayer) cir.setReturnValue(!world.isClient); if (getControllingPassenger() instanceof MinionFakePlayer) cir.setReturnValue(!level.isClientSide);
} }
} }
src/main/java/io/github/skippyall/minions/mixins/MinecraftServerMixin.java
+6 -7
View File
@@ -4,10 +4,10 @@ import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.skin.Base64SkinProvider; import io.github.skippyall.minions.minion.skin.Base64SkinProvider;
import io.github.skippyall.minions.registration.MinionConfigOptions; import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.nbt.NbtElement; import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.util.Identifier;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,9 +20,8 @@ import java.util.stream.Collectors;
@Mixin(MinecraftServer.class) @Mixin(MinecraftServer.class)
public class MinecraftServerMixin { public class MinecraftServerMixin {
@ModifyExpressionValue(method = "buildPlayerStatus", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;getPlayers()Ljava/util/List;"))
@ModifyExpressionValue(method = "createMetadataPlayers", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;getPlayerList()Ljava/util/List;")) public List<ServerPlayer> ignoreFakePlayers(List<ServerPlayer> original) {
public List<ServerPlayerEntity> ignoreFakePlayers(List<ServerPlayerEntity> original) {
return original.stream() return original.stream()
.filter(player -> !(player instanceof MinionFakePlayer minion .filter(player -> !(player instanceof MinionFakePlayer minion
&& !minion.getData().config().getOption(MinionConfigOptions.showInServerList))) && !minion.getData().config().getOption(MinionConfigOptions.showInServerList)))
@@ -30,7 +29,7 @@ public class MinecraftServerMixin {
} }
@Inject(method = "handleCustomClickAction", at = @At("HEAD"), cancellable = true) @Inject(method = "handleCustomClickAction", at = @At("HEAD"), cancellable = true)
private void onCustomClickAction(Identifier id, Optional<NbtElement> payload, CallbackInfo ci) { private void onCustomClickAction(ResourceLocation id, Optional<Tag> payload, CallbackInfo ci) {
if(id.equals(Base64SkinProvider.CUSTOM_DIALOG_ACTION)) { if(id.equals(Base64SkinProvider.CUSTOM_DIALOG_ACTION)) {
Base64SkinProvider.onCustomDialogAction(payload); Base64SkinProvider.onCustomDialogAction(payload);
ci.cancel(); ci.cancel();
src/main/java/io/github/skippyall/minions/mixins/MobEntityMixin.java → src/main/java/io/github/skippyall/minions/mixins/MobMixin.java
+9 -9
View File
@@ -4,17 +4,17 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper; import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
import net.minecraft.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.entity.mob.MobEntity; import net.minecraft.world.entity.Mob;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.World; import net.minecraft.world.level.Level;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(MobEntity.class) @Mixin(Mob.class)
public abstract class MobEntityMixin { public abstract class MobMixin {
@WrapOperation(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getClosestPlayer(Lnet/minecraft/entity/Entity;D)Lnet/minecraft/entity/player/PlayerEntity;")) @WrapOperation(method = "checkDespawn", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/Level;getNearestPlayer(Lnet/minecraft/world/entity/Entity;D)Lnet/minecraft/world/entity/player/Player;"))
public PlayerEntity checkMobDespawningMinion(World instance, Entity entity, double maxDistance, Operation<PlayerEntity> original) { public Player checkMobDespawningMinion(Level instance, Entity entity, double maxDistance, Operation<Player> original) {
EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity2 -> { EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity2 -> {
if(entity2 instanceof MinionFakePlayer minion) { if(entity2 instanceof MinionFakePlayer minion) {
return minion.canDespawnMobs(); return minion.canDespawnMobs();
@@ -22,7 +22,7 @@ public abstract class MobEntityMixin {
return true; return true;
} }
}); });
PlayerEntity player = original.call(instance, entity, maxDistance); Player player = original.call(instance, entity, maxDistance);
EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove(); EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove();
return player; return player;
} }
src/main/java/io/github/skippyall/minions/mixins/NaturalSpawnerMixin.java
+31
View File
@@ -0,0 +1,31 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.level.NaturalSpawner;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@Mixin(NaturalSpawner.class)
public class NaturalSpawnerMixin {
@WrapOperation(method = "spawnCategoryForPosition(Lnet/minecraft/world/entity/MobCategory;Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/NaturalSpawner$SpawnPredicate;Lnet/minecraft/world/level/NaturalSpawner$AfterSpawnCallback;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerLevel;getNearestPlayer(DDDDZ)Lnet/minecraft/world/entity/player/Player;"))
private static Player checkMobSpawningMinion(ServerLevel world, double x, double y, double z, double maxDistance, boolean ignoreCreative, Operation<Player> original) {
EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity -> {
if(entity instanceof ServerPlayer player) {
if(player instanceof MinionFakePlayer minion) {
return minion.canSpawnMobs();
}
return true;
}
return false;
});
Player player = original.call(world, x, y, z, maxDistance, ignoreCreative);
EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove();
return player;
}
}
src/main/java/io/github/skippyall/minions/mixins/PistonMovingBlockEntityMixin.java
+18 -18
View File
@@ -3,39 +3,39 @@ package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.block.Blocks; import net.minecraft.core.BlockPos;
import net.minecraft.block.entity.PistonBlockEntity; import net.minecraft.core.Direction;
import net.minecraft.block.piston.PistonBehavior; import net.minecraft.world.entity.Entity;
import net.minecraft.entity.Entity; import net.minecraft.world.level.Level;
import net.minecraft.util.math.BlockPos; import net.minecraft.world.level.block.Blocks;
import net.minecraft.util.math.Direction; import net.minecraft.world.level.block.piston.PistonMovingBlockEntity;
import net.minecraft.util.math.Vec3d; import net.minecraft.world.level.material.PushReaction;
import net.minecraft.world.World; import net.minecraft.world.phys.Vec3;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(PistonBlockEntity.class) @Mixin(PistonMovingBlockEntity.class)
public abstract class PistonMovingBlockEntityMixin { public abstract class PistonMovingBlockEntityMixin {
@WrapOperation(method = "pushEntities", at = @At( @WrapOperation(method = "moveCollidedEntities", at = @At(
value = "INVOKE", value = "INVOKE",
target = "Lnet/minecraft/entity/Entity;getPistonBehavior()Lnet/minecraft/block/piston/PistonBehavior;" target = "Lnet/minecraft/world/entity/Entity;getPistonPushReaction()Lnet/minecraft/world/level/material/PushReaction;"
)) ))
private static PistonBehavior moveFakePlayers(Entity entity, Operation<PistonBehavior> original, World world, BlockPos pos, float f, PistonBlockEntity pistonBlockEntity) private static PushReaction moveFakePlayers(Entity entity, Operation<PushReaction> original, Level world, BlockPos pos, float f, PistonMovingBlockEntity pistonBlockEntity)
{ {
if (entity instanceof MinionFakePlayer && pistonBlockEntity.getPushedBlock().isOf(Blocks.SLIME_BLOCK)) if (entity instanceof MinionFakePlayer && pistonBlockEntity.getMovedState().is(Blocks.SLIME_BLOCK))
{ {
Vec3d vec3d = entity.getVelocity(); Vec3 vec3d = entity.getDeltaMovement();
double x = vec3d.x; double x = vec3d.x;
double y = vec3d.y; double y = vec3d.y;
double z = vec3d.z; double z = vec3d.z;
Direction direction = pistonBlockEntity.getMovementDirection(); Direction direction = pistonBlockEntity.getMovementDirection();
switch (direction.getAxis()) { switch (direction.getAxis()) {
case X -> x = direction.getOffsetX(); case X -> x = direction.getStepX();
case Y -> y = direction.getOffsetY(); case Y -> y = direction.getStepY();
case Z -> z = direction.getOffsetZ(); case Z -> z = direction.getStepZ();
} }
entity.setVelocity(x, y, z); entity.setDeltaMovement(x, y, z);
} }
return original.call(entity); return original.call(entity);
} }
src/main/java/io/github/skippyall/minions/mixins/PlayerListEntryS2CPacket$EntryMixin.java
-22
View File
@@ -1,22 +0,0 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.network.packet.s2c.play.PlayerListS2CPacket;
import net.minecraft.server.network.ServerPlayerEntity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(PlayerListS2CPacket.Entry.class)
public class PlayerListEntryS2CPacket$EntryMixin {
@ModifyArg(method = "<init>(Lnet/minecraft/server/network/ServerPlayerEntity;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/packet/s2c/play/PlayerListS2CPacket$Entry;<init>(Ljava/util/UUID;Lcom/mojang/authlib/GameProfile;ZILnet/minecraft/world/GameMode;Lnet/minecraft/text/Text;ZILnet/minecraft/network/encryption/PublicPlayerSession$Serialized;)V"), index = 2)
private static boolean removeMinionFromTabList(boolean original, @Local(argsOnly = true) ServerPlayerEntity player) {
if(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.showInTabList)) {
return false;
}
return original;
}
}
src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java
+21 -21
View File
@@ -9,17 +9,17 @@ import com.mojang.authlib.GameProfile;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.fakeplayer.NetHandlerPlayServerFake; import io.github.skippyall.minions.minion.fakeplayer.NetHandlerPlayServerFake;
import io.github.skippyall.minions.registration.MinionConfigOptions; import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.network.ClientConnection; import net.minecraft.network.Connection;
import net.minecraft.network.packet.c2s.common.SyncedClientOptions; import net.minecraft.network.chat.Component;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.server.PlayerManager; import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.network.ConnectedClientData; import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.world.ServerWorld; import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.storage.ReadView; import net.minecraft.server.players.PlayerList;
import net.minecraft.text.Text; import net.minecraft.util.ProblemReporter;
import net.minecraft.util.ErrorReporter; import net.minecraft.world.level.storage.ValueInput;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
@@ -30,11 +30,11 @@ import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Mixin(PlayerManager.class) @Mixin(PlayerList.class)
public class PlayerListMixin { public class PlayerListMixin {
@Inject(method = "loadPlayerData", at = @At(value = "RETURN", shift = At.Shift.BEFORE)) @Inject(method = "load", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
private void fixStartingPos(ServerPlayerEntity player, ErrorReporter errorReporter, CallbackInfoReturnable<Optional<ReadView>> cir) private void fixStartingPos(ServerPlayer player, ProblemReporter errorReporter, CallbackInfoReturnable<Optional<ValueInput>> cir)
{ {
if (player instanceof MinionFakePlayer) if (player instanceof MinionFakePlayer)
{ {
@@ -42,8 +42,8 @@ public class PlayerListMixin {
} }
} }
@WrapOperation(method = "onPlayerConnect", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/ClientConnection;Lnet/minecraft/server/network/ServerPlayerEntity;Lnet/minecraft/server/network/ConnectedClientData;)Lnet/minecraft/server/network/ServerPlayNetworkHandler;")) @WrapOperation(method = "placeNewPlayer", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/network/Connection;Lnet/minecraft/server/level/ServerPlayer;Lnet/minecraft/server/network/CommonListenerCookie;)Lnet/minecraft/server/network/ServerGamePacketListenerImpl;"))
private ServerPlayNetworkHandler replaceNetworkHandler(MinecraftServer server, ClientConnection connection, ServerPlayerEntity serverPlayer, ConnectedClientData commonListenerCookie, Operation<ServerPlayNetworkHandler> original) private ServerGamePacketListenerImpl replaceNetworkHandler(MinecraftServer server, Connection connection, ServerPlayer serverPlayer, CommonListenerCookie commonListenerCookie, Operation<ServerGamePacketListenerImpl> original)
{ {
if (serverPlayer instanceof MinionFakePlayer fake) { if (serverPlayer instanceof MinionFakePlayer fake) {
return new NetHandlerPlayServerFake(server, connection, fake, commonListenerCookie); return new NetHandlerPlayServerFake(server, connection, fake, commonListenerCookie);
@@ -52,23 +52,23 @@ public class PlayerListMixin {
} }
} }
@WrapOperation(method = "respawnPlayer", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/world/ServerWorld;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)Lnet/minecraft/server/network/ServerPlayerEntity;")) @WrapOperation(method = "respawn", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/level/ServerLevel;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/server/level/ClientInformation;)Lnet/minecraft/server/level/ServerPlayer;"))
public ServerPlayerEntity makePlayerForRespawn(MinecraftServer minecraftServer, ServerWorld serverLevel, GameProfile gameProfile, SyncedClientOptions clientInformation, Operation<ServerPlayerEntity> original, ServerPlayerEntity serverPlayer, boolean bl) { public ServerPlayer makePlayerForRespawn(MinecraftServer minecraftServer, ServerLevel serverLevel, GameProfile gameProfile, ClientInformation clientInformation, Operation<ServerPlayer> original, ServerPlayer serverPlayer, boolean bl) {
if (serverPlayer instanceof MinionFakePlayer minion) { if (serverPlayer instanceof MinionFakePlayer minion) {
return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation); return MinionFakePlayer.respawnFake(minecraftServer, serverLevel, gameProfile, clientInformation);
} }
return original.call(minecraftServer, serverLevel, gameProfile, clientInformation); return original.call(minecraftServer, serverLevel, gameProfile, clientInformation);
} }
@WrapOperation(method = "onPlayerConnect", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V")) @WrapOperation(method = "placeNewPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;broadcastSystemMessage(Lnet/minecraft/network/chat/Component;Z)V"))
public void noLoginMessage(PlayerManager instance, Text message, boolean overlay, Operation<Void> original, @Local(argsOnly = true) ServerPlayerEntity player) { public void noLoginMessage(PlayerList instance, Component message, boolean overlay, Operation<Void> original, @Local(argsOnly = true) ServerPlayer player) {
if(!(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.sendLoginMessage))) { if(!(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.sendLoginMessage))) {
original.call(instance, message, overlay); original.call(instance, message, overlay);
} }
} }
@ModifyReceiver(method = "checkCanJoin", at = @At(value = "INVOKE", target = "Ljava/util/List;size()I")) @ModifyReceiver(method = "canPlayerLogin", at = @At(value = "INVOKE", target = "Ljava/util/List;size()I"))
public List<ServerPlayerEntity> noMinionCounting(List<ServerPlayerEntity> instance) { public List<ServerPlayer> noMinionCounting(List<ServerPlayer> instance) {
return instance.stream() return instance.stream()
.filter(player -> !(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.countForPlayerLimit))) .filter(player -> !(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.countForPlayerLimit)))
.collect(Collectors.toCollection(ArrayList::new)); .collect(Collectors.toCollection(ArrayList::new));
src/main/java/io/github/skippyall/minions/mixins/PlayerMixin.java
+7 -5
View File
@@ -4,12 +4,13 @@ package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue; import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.entity.Entity; import net.minecraft.world.entity.Entity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.entity.player.Player;
import org.objectweb.asm.Opcodes;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(PlayerEntity.class) @Mixin(Player.class)
public abstract class PlayerMixin { public abstract class PlayerMixin {
/** /**
* To make sure player attacks are able to knockback fake players * To make sure player attacks are able to knockback fake players
@@ -18,8 +19,9 @@ public abstract class PlayerMixin {
method = "attack", method = "attack",
at = @At( at = @At(
value = "FIELD", value = "FIELD",
target = "Lnet/minecraft/entity/Entity;velocityModified:Z", target = "Lnet/minecraft/world/entity/Entity;hurtMarked:Z",
ordinal = 0 ordinal = 0,
opcode = Opcodes.GETFIELD
) )
) )
private boolean velocityModifiedAndNotCarpetFakePlayer(boolean value, @Local(argsOnly = true) Entity entity) { private boolean velocityModifiedAndNotCarpetFakePlayer(boolean value, @Local(argsOnly = true) Entity entity) {
src/main/java/io/github/skippyall/minions/mixins/ServerPlayNetworkHandlerMixin.java → src/main/java/io/github/skippyall/minions/mixins/ServerGamePacketListenerImplMixin.java
+9 -9
View File
@@ -4,21 +4,21 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionConfigOptions; import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.server.PlayerManager; import net.minecraft.network.chat.Component;
import net.minecraft.server.network.ServerPlayNetworkHandler; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.text.Text; import net.minecraft.server.players.PlayerList;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(ServerPlayNetworkHandler.class) @Mixin(ServerGamePacketListenerImpl.class)
public class ServerPlayNetworkHandlerMixin { public class ServerGamePacketListenerImplMixin {
@Shadow @Shadow
public ServerPlayerEntity player; public ServerPlayer player;
@WrapOperation(method = "cleanUp", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;broadcast(Lnet/minecraft/text/Text;Z)V")) @WrapOperation(method = "removePlayerFromWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;broadcastSystemMessage(Lnet/minecraft/network/chat/Component;Z)V"))
public void noLogoutMessage(PlayerManager instance, Text message, boolean overlay, Operation<Void> original) { public void noLogoutMessage(PlayerList instance, Component message, boolean overlay, Operation<Void> original) {
if(!(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.sendLogoutMessage))) { if(!(player instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.sendLogoutMessage))) {
original.call(instance, message, overlay); original.call(instance, message, overlay);
} }
src/main/java/io/github/skippyall/minions/mixins/SleepManagerMixin.java → src/main/java/io/github/skippyall/minions/mixins/SleepStatusMixin.java
+6 -6
View File
@@ -4,15 +4,15 @@ import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation; import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionConfigOptions; import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.world.SleepManager; import net.minecraft.server.players.SleepStatus;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(SleepManager.class) @Mixin(SleepStatus.class)
public class SleepManagerMixin { public class SleepStatusMixin {
@WrapOperation(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/network/ServerPlayerEntity;isSpectator()Z")) @WrapOperation(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;isSpectator()Z"))
public boolean excludeMinions(ServerPlayerEntity instance, Operation<Boolean> original) { public boolean excludeMinions(ServerPlayer instance, Operation<Boolean> original) {
if (instance instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.countForSleeping)) { if (instance instanceof MinionFakePlayer minion && !minion.getData().config().getOption(MinionConfigOptions.countForSleeping)) {
return true; return true;
} else { } else {
src/main/java/io/github/skippyall/minions/mixins/SpawnHelperMixin.java
-31
View File
@@ -1,31 +0,0 @@
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.SpawnHelper;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
@Mixin(SpawnHelper.class)
public class SpawnHelperMixin {
@WrapOperation(method = "spawnEntitiesInChunk(Lnet/minecraft/entity/SpawnGroup;Lnet/minecraft/server/world/ServerWorld;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/SpawnHelper$Checker;Lnet/minecraft/world/SpawnHelper$Runner;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerWorld;getClosestPlayer(DDDDZ)Lnet/minecraft/entity/player/PlayerEntity;"))
private static PlayerEntity checkMobSpawningMinion(ServerWorld world, double x, double y, double z, double maxDistance, boolean ignoreCreative, Operation<PlayerEntity> original) {
EntityViewMixinHelper.ADDITIONAL_PREDICATE.set(entity -> {
if(entity instanceof ServerPlayerEntity player) {
if(player instanceof MinionFakePlayer minion) {
return minion.canSpawnMobs();
}
return true;
}
return false;
});
PlayerEntity player = original.call(world, x, y, z, maxDistance, ignoreCreative);
EntityViewMixinHelper.ADDITIONAL_PREDICATE.remove();
return player;
}
}
src/main/java/io/github/skippyall/minions/mixins/TickRateManagerMixin.java
+8 -8
View File
@@ -2,23 +2,23 @@ package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.ModifyReturnValue; import com.llamalad7.mixinextras.injector.ModifyReturnValue;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.entity.Entity; import net.minecraft.world.TickRateManager;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.world.entity.Entity;
import net.minecraft.world.tick.TickManager; import net.minecraft.world.entity.player.Player;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
@Mixin(TickManager.class) @Mixin(TickRateManager.class)
public abstract class TickRateManagerMixin { public abstract class TickRateManagerMixin {
@Shadow @Shadow
public abstract boolean shouldTick(); public abstract boolean runsNormally();
@ModifyReturnValue(method = "shouldSkipTick", at = @At("TAIL")) @ModifyReturnValue(method = "isEntityFrozen", at = @At("TAIL"))
private boolean handler(boolean alreadyFrozen, Entity entity) { private boolean handler(boolean alreadyFrozen, Entity entity) {
if (alreadyFrozen) return true; if (alreadyFrozen) return true;
if (shouldTick()) return false; if (runsNormally()) return false;
return !isActualPlayer(entity) && // not carrying players return !isActualPlayer(entity) && // not carrying players
((EntityAccessor) entity) ((EntityAccessor) entity)
@@ -28,6 +28,6 @@ public abstract class TickRateManagerMixin {
@Unique @Unique
private static boolean isActualPlayer(Entity e) { private static boolean isActualPlayer(Entity e) {
return e instanceof PlayerEntity && !(e instanceof MinionFakePlayer); return e instanceof Player && !(e instanceof MinionFakePlayer);
} }
} }
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkLevelManagerMixin.java
-52
View File
@@ -1,52 +0,0 @@
package io.github.skippyall.minions.mixins.antimobcap;
import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.objects.ObjectSet;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.server.world.ChunkLevelManager;
import net.minecraft.server.world.ChunkTicketManager;
import net.minecraft.util.math.ChunkSectionPos;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.concurrent.Executor;
@Mixin(ChunkLevelManager.class)
public class ChunkLevelManagerMixin implements ChunkLevelManagerAccessor {
@Shadow @Final Long2ObjectMap<ObjectSet<ServerPlayerEntity>> playersByChunkPos;
@Shadow @Final private ChunkLevelManager.DistanceFromNearestPlayerTracker distanceFromNearestPlayerTracker;
@Unique
ChunkLevelManager.DistanceFromNearestPlayerTracker minionless;
@Inject(method = "<init>", at = @At("RETURN"))
public void createMinionlessClone(ChunkTicketManager ticketManager, Executor executor, Executor mainThreadExecutor, CallbackInfo ci) {
ChunkLevelManager manager = ((ChunkLevelManager)(Object)this);
minionless = manager.new DistanceFromNearestPlayerTracker(8);
((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$markAsMinionless();
((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)distanceFromNearestPlayerTracker).minions$markAsTarget();
}
public ObjectSet<ServerPlayerEntity> minions$getPlayers(long chunkpos) {
return playersByChunkPos.get(chunkpos);
}
@Override
public ChunkLevelManager.DistanceFromNearestPlayerTracker minions$getMinionless() {
return minionless;
}
@Inject(method = "handleChunkLeave", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z", shift = At.Shift.AFTER, remap = false))
public void minion$updateMinionlessIfNoMinionInChunk(ChunkSectionPos pos, ServerPlayerEntity player, CallbackInfo ci, @Local long chunk) {
if (!((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$isRealPlayerInChunk(chunk)) {
minionless.updateLevel(chunk, Integer.MAX_VALUE, false);
}
}
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkPosDistanceLevelPropagatorMixin.java → src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkTrackerMixin.java
+4 -4
View File
@@ -1,14 +1,14 @@
package io.github.skippyall.minions.mixins.antimobcap; package io.github.skippyall.minions.mixins.antimobcap;
import net.minecraft.server.world.ChunkPosDistanceLevelPropagator; import net.minecraft.server.level.ChunkTracker;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ChunkPosDistanceLevelPropagator.class) @Mixin(ChunkTracker.class)
public class ChunkPosDistanceLevelPropagatorMixin { public class ChunkTrackerMixin {
@Inject(method = "updateLevel", at = @At("HEAD")) @Inject(method = "update", at = @At("HEAD"))
public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) { public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) {
} }
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin.java → src/main/java/io/github/skippyall/minions/mixins/antimobcap/DistanceManager$FixedPlayerDistanceChunkTrackerMixin.java
+13 -13
View File
@@ -5,8 +5,8 @@ import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$Dist
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor; import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
import it.unimi.dsi.fastutil.longs.Long2ByteMap; import it.unimi.dsi.fastutil.longs.Long2ByteMap;
import it.unimi.dsi.fastutil.objects.ObjectSet; import it.unimi.dsi.fastutil.objects.ObjectSet;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.DistanceManager;
import net.minecraft.server.world.ChunkLevelManager; import net.minecraft.server.level.ServerPlayer;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@@ -16,22 +16,22 @@ import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(value = ChunkLevelManager.DistanceFromNearestPlayerTracker.class) @Mixin(value = DistanceManager.FixedPlayerDistanceChunkTracker.class)
public abstract class ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin extends ChunkPosDistanceLevelPropagatorMixin implements ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor { public abstract class DistanceManager$FixedPlayerDistanceChunkTrackerMixin extends ChunkTrackerMixin implements ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor {
@Final @Final
@Shadow @Shadow
ChunkLevelManager field_17462; DistanceManager field_17462;
@Shadow @Shadow
@Final @Final
protected Long2ByteMap distanceFromNearestPlayer; protected Long2ByteMap chunks;
@Shadow protected abstract boolean isPlayerInChunk(long chunkPos); @Shadow protected abstract boolean havePlayer(long chunkPos);
@Unique @Unique
boolean minions$minionless, minions$target; boolean minions$minionless, minions$target;
@Inject(method = "isPlayerInChunk", at = @At("RETURN"), cancellable = true) @Inject(method = "havePlayer", at = @At("RETURN"), cancellable = true)
public void minions$filterMinions(long chunkPos, CallbackInfoReturnable<Boolean> cir) { public void minions$filterMinions(long chunkPos, CallbackInfoReturnable<Boolean> cir) {
if (minions$minionless) { if (minions$minionless) {
cir.setReturnValue(minions$isRealPlayerInChunk(chunkPos)); cir.setReturnValue(minions$isRealPlayerInChunk(chunkPos));
@@ -40,7 +40,7 @@ public abstract class ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin ex
@Override @Override
public boolean minions$isRealPlayerInChunk(long chunkPos) { public boolean minions$isRealPlayerInChunk(long chunkPos) {
ObjectSet<ServerPlayerEntity> players = ((ChunkLevelManagerAccessor)field_17462).minions$getPlayers(chunkPos); ObjectSet<ServerPlayer> players = ((ChunkLevelManagerAccessor)field_17462).minions$getPlayers(chunkPos);
boolean contains = false; boolean contains = false;
if(players != null) { if(players != null) {
contains = players.stream().anyMatch(player -> { contains = players.stream().anyMatch(player -> {
@@ -53,17 +53,17 @@ public abstract class ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin ex
return contains; return contains;
} }
@Inject(method = "updateLevels", at = @At("HEAD")) @Inject(method = "runAllUpdates", at = @At("HEAD"))
public void minions$sync(CallbackInfo info) { public void minions$sync(CallbackInfo info) {
if (minions$target) { if (minions$target) {
((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().updateLevels(); ((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().runAllUpdates();
} }
} }
@Override @Override
public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) { public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) {
if (minions$target && (distance == Integer.MAX_VALUE || minions$isRealPlayerInChunk(chunkPos))) { if (minions$target && (distance == Integer.MAX_VALUE || minions$isRealPlayerInChunk(chunkPos))) {
((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().updateLevel(chunkPos, distance, decrease); ((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().update(chunkPos, distance, decrease);
} }
} }
@@ -79,6 +79,6 @@ public abstract class ChunkLevelManager$DistanceFromNearestPlayerTrackerMixin ex
@Override @Override
public int minions$getTickedChunkCount() { public int minions$getTickedChunkCount() {
return distanceFromNearestPlayer.size(); return chunks.size();
} }
} }
src/main/java/io/github/skippyall/minions/mixins/antimobcap/DistanceManagerMixin.java
+52
View File
@@ -0,0 +1,52 @@
package io.github.skippyall.minions.mixins.antimobcap;
import com.llamalad7.mixinextras.sugar.Local;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
import it.unimi.dsi.fastutil.objects.ObjectSet;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.concurrent.Executor;
import net.minecraft.core.SectionPos;
import net.minecraft.server.level.DistanceManager;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.TicketStorage;
@Mixin(DistanceManager.class)
public class DistanceManagerMixin implements ChunkLevelManagerAccessor {
@Shadow @Final Long2ObjectMap<ObjectSet<ServerPlayer>> playersPerChunk;
@Shadow @Final private DistanceManager.FixedPlayerDistanceChunkTracker naturalSpawnChunkCounter;
@Unique
DistanceManager.FixedPlayerDistanceChunkTracker minionless;
@Inject(method = "<init>", at = @At("RETURN"))
public void createMinionlessClone(TicketStorage ticketManager, Executor executor, Executor mainThreadExecutor, CallbackInfo ci) {
DistanceManager manager = ((DistanceManager)(Object)this);
minionless = manager.new FixedPlayerDistanceChunkTracker(8);
((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$markAsMinionless();
((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)naturalSpawnChunkCounter).minions$markAsTarget();
}
public ObjectSet<ServerPlayer> minions$getPlayers(long chunkpos) {
return playersPerChunk.get(chunkpos);
}
@Override
public DistanceManager.FixedPlayerDistanceChunkTracker minions$getMinionless() {
return minionless;
}
@Inject(method = "removePlayer", at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectSet;remove(Ljava/lang/Object;)Z", shift = At.Shift.AFTER, remap = false))
public void minion$updateMinionlessIfNoMinionInChunk(SectionPos pos, ServerPlayer player, CallbackInfo ci, @Local long chunk) {
if (!((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)minionless).minions$isRealPlayerInChunk(chunk)) {
minionless.update(chunk, Integer.MAX_VALUE, false);
}
}
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ServerChunkCacheAccessor.java
+12
View File
@@ -0,0 +1,12 @@
package io.github.skippyall.minions.mixins.antimobcap;
import net.minecraft.server.level.DistanceManager;
import net.minecraft.server.level.ServerChunkCache;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ServerChunkCache.class)
public interface ServerChunkCacheAccessor {
@Accessor
DistanceManager getDistanceManager();
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ServerChunkCacheMixin.java
+23
View File
@@ -0,0 +1,23 @@
package io.github.skippyall.minions.mixins.antimobcap;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
import net.minecraft.server.level.DistanceManager;
import net.minecraft.server.level.ServerChunkCache;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(ServerChunkCache.class)
public class ServerChunkCacheMixin {
@Shadow
@Final
private DistanceManager distanceManager;
@ModifyArg(method = "tickChunks(Lnet/minecraft/util/profiling/ProfilerFiller;J)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/NaturalSpawner;createState(ILjava/lang/Iterable;Lnet/minecraft/world/level/NaturalSpawner$ChunkGetter;Lnet/minecraft/world/level/LocalMobCapCalculator;)Lnet/minecraft/world/level/NaturalSpawner$SpawnState;"))
public int useMinionless(int spawningChunkCount) {
return ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)distanceManager).minions$getMinionless()).minions$getTickedChunkCount();
}
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ServerChunkManagerAccessor.java
-12
View File
@@ -1,12 +0,0 @@
package io.github.skippyall.minions.mixins.antimobcap;
import net.minecraft.server.world.ChunkLevelManager;
import net.minecraft.server.world.ServerChunkManager;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(ServerChunkManager.class)
public interface ServerChunkManagerAccessor {
@Accessor
ChunkLevelManager getLevelManager();
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/ServerChunkManagerMixin.java
-23
View File
@@ -1,23 +0,0 @@
package io.github.skippyall.minions.mixins.antimobcap;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor;
import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManagerAccessor;
import net.minecraft.server.world.ChunkLevelManager;
import net.minecraft.server.world.ServerChunkManager;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(ServerChunkManager.class)
public class ServerChunkManagerMixin {
@Shadow
@Final
private ChunkLevelManager levelManager;
@ModifyArg(method = "tickChunks(Lnet/minecraft/util/profiler/Profiler;J)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/SpawnHelper;setupSpawn(ILjava/lang/Iterable;Lnet/minecraft/world/SpawnHelper$ChunkSource;Lnet/minecraft/world/SpawnDensityCapper;)Lnet/minecraft/world/SpawnHelper$Info;"))
public int useMinionless(int spawningChunkCount) {
return ((ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor)((ChunkLevelManagerAccessor)levelManager).minions$getMinionless()).minions$getTickedChunkCount();
}
}
src/main/java/io/github/skippyall/minions/mixins/compat/universal_graves/GraveMixin.java
+3 -3
View File
@@ -3,15 +3,15 @@ package io.github.skippyall.minions.mixins.compat.universal_graves;
import com.llamalad7.mixinextras.sugar.Local; import com.llamalad7.mixinextras.sugar.Local;
import eu.pb4.graves.grave.Grave; import eu.pb4.graves.grave.Grave;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.server.network.ServerPlayerEntity; import net.minecraft.server.level.ServerPlayer;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(Grave.class) @Mixin(Grave.class)
public class GraveMixin { public class GraveMixin {
@ModifyArg(method = "createBlock", at = @At(value = "INVOKE", target = "Leu/pb4/graves/grave/Grave;<init>(JLcom/mojang/authlib/GameProfile;BLnet/minecraft/util/Arm;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Identifier;Leu/pb4/graves/grave/GraveType;JJILnet/minecraft/text/Text;Ljava/util/Collection;Ljava/util/Collection;ZI)V")) @ModifyArg(method = "createBlock", at = @At(value = "INVOKE", target = "Leu/pb4/graves/grave/Grave;<init>(JLcom/mojang/authlib/GameProfile;BLnet/minecraft/world/entity/HumanoidArm;Lnet/minecraft/core/BlockPos;Lnet/minecraft/resources/ResourceLocation;Leu/pb4/graves/grave/GraveType;JJILnet/minecraft/network/chat/Component;Ljava/util/Collection;Ljava/util/Collection;ZI)V"))
private static boolean createGrave(boolean profile, @Local(argsOnly = true) ServerPlayerEntity player) { private static boolean createGrave(boolean profile, @Local(argsOnly = true) ServerPlayer player) {
if(player instanceof MinionFakePlayer) { if(player instanceof MinionFakePlayer) {
return false; return false;
} }
src/main/java/io/github/skippyall/minions/module/MinionModule.java
+2 -2
View File
@@ -11,8 +11,8 @@ import java.util.List;
public record MinionModule(List<InstructionType<MinionRuntime>> instructions, List<SpecialAbility> specialAbilities) { public record MinionModule(List<InstructionType<MinionRuntime>> instructions, List<SpecialAbility> specialAbilities) {
public static final Codec<MinionModule> CODEC = RecordCodecBuilder.create(instance -> public static final Codec<MinionModule> CODEC = RecordCodecBuilder.create(instance ->
instance.group( instance.group(
MinionRegistries.INSTRUCTION_TYPES.getCodec().listOf().fieldOf("instructions").forGetter(MinionModule::instructions), MinionRegistries.INSTRUCTION_TYPES.byNameCodec().listOf().fieldOf("instructions").forGetter(MinionModule::instructions),
MinionRegistries.SPECIAL_ABILITIES.getCodec().listOf().fieldOf("specialAbilities").forGetter(MinionModule::specialAbilities) MinionRegistries.SPECIAL_ABILITIES.byNameCodec().listOf().fieldOf("specialAbilities").forGetter(MinionModule::specialAbilities)
).apply(instance, MinionModule::new) ).apply(instance, MinionModule::new)
); );
src/main/java/io/github/skippyall/minions/module/ModuleInventory.java
+21 -22
View File
@@ -4,20 +4,19 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer; import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.InstructionType; import io.github.skippyall.minions.program.instruction.InstructionType;
import io.github.skippyall.minions.registration.MinionComponentTypes; import io.github.skippyall.minions.registration.MinionComponentTypes;
import net.minecraft.inventory.Inventories;
import net.minecraft.inventory.SimpleInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.screen.SimpleNamedScreenHandlerFactory;
import net.minecraft.server.network.ServerPlayerEntity;
import net.minecraft.storage.ReadView;
import net.minecraft.storage.WriteView;
import net.minecraft.text.Text;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.ContainerHelper;
import net.minecraft.world.SimpleContainer;
import net.minecraft.world.SimpleMenuProvider;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
public class ModuleInventory extends SimpleInventory { public class ModuleInventory extends SimpleContainer {
private final Set<MinionModule> modules = new HashSet<>(); private final Set<MinionModule> modules = new HashSet<>();
private final Set<InstructionType<MinionRuntime>> instructions = new HashSet<>(); private final Set<InstructionType<MinionRuntime>> instructions = new HashSet<>();
private final Set<SpecialAbility> specialAbilities = new HashSet<>(); private final Set<SpecialAbility> specialAbilities = new HashSet<>();
@@ -29,23 +28,23 @@ public class ModuleInventory extends SimpleInventory {
this.minion = minion; this.minion = minion;
} }
public static void openModuleInventory(ServerPlayerEntity player, MinionFakePlayer minion) { public static void openModuleInventory(ServerPlayer player, MinionFakePlayer minion) {
player.openHandledScreen(new SimpleNamedScreenHandlerFactory((syncId, playerInventory, player2) -> new ModuleInventoryScreenHandler(syncId, playerInventory, minion.getModuleInventory()), Text.translatable("minions.gui.modules.title", minion.getName()))); player.openMenu(new SimpleMenuProvider((syncId, playerInventory, player2) -> new ModuleInventoryScreenHandler(syncId, playerInventory, minion.getModuleInventory()), Component.translatable("minions.gui.modules.title", minion.getName())));
} }
@Override @Override
public int getMaxCountPerStack() { public int getMaxStackSize() {
return 1; return 1;
} }
@Override @Override
public boolean isValid(int slot, ItemStack stack) { public boolean canPlaceItem(int slot, ItemStack stack) {
return (stack.getCount() <= getMaxCountPerStack()) && stack.contains(MinionComponentTypes.MODULE); return (stack.getCount() <= getMaxStackSize()) && stack.has(MinionComponentTypes.MODULE);
} }
@Override @Override
public void markDirty() { public void setChanged() {
super.markDirty(); super.setChanged();
updateModules(); updateModules();
} }
@@ -57,7 +56,7 @@ public class ModuleInventory extends SimpleInventory {
modules.clear(); modules.clear();
instructions.clear(); instructions.clear();
specialAbilities.clear(); specialAbilities.clear();
for (ItemStack heldStack : heldStacks) { for (ItemStack heldStack : items) {
MinionModule module = heldStack.get(MinionComponentTypes.MODULE); MinionModule module = heldStack.get(MinionComponentTypes.MODULE);
if(module != null) { if(module != null) {
modules.add(module); modules.add(module);
@@ -91,13 +90,13 @@ public class ModuleInventory extends SimpleInventory {
} }
} }
public void readData(ReadView view) { public void readData(ValueInput view) {
Inventories.readData(view, heldStacks); ContainerHelper.loadAllItems(view, items);
updateModules(); updateModules();
} }
public void writeData(WriteView view) { public void writeData(ValueOutput view) {
Inventories.writeData(view, heldStacks); ContainerHelper.saveAllItems(view, items);
} }
public Collection<MinionModule> getModules() { public Collection<MinionModule> getModules() {

Some files were not shown because too many files have changed in this diff Show More