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

Port to 26.1

Browse Source
This commit is contained in:
skippyall
2026-04-29 17:20:13 +02:00
parent f5202a4264
commit e117139a63
100 changed files with 609 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.gradle
-138
View File
@@ -1,138 +0,0 @@
plugins {
id 'net.fabricmc.fabric-loom-remap' version '1.16-SNAPSHOT'
id 'maven-publish'
}
version = project.mod_version
group = project.maven_group
base {
archivesName = project.archives_base_name
}
loom {
accessWidenerPath = file("src/main/resources/minions.accesswidener")
splitEnvironmentSourceSets()
mods {
minions {
sourceSet sourceSets.main
sourceSet sourceSets.client
}
}
runs.forEach {
it.vmArg("-XX:+AllowEnhancedClassRedefinition")
}
}
repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
maven { url 'https://maven.nucleoid.xyz' }
exclusiveContent {
forRepository {
maven {
name = "Modrinth"
url = "https://api.modrinth.com/maven"
}
}
filter {
includeGroup "maven.modrinth"
}
}
}
dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings loom.officialMojangMappings()
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "eu.pb4:polymer-core:${project.polymer_version}"
modImplementation "eu.pb4:polymer-virtual-entity:${project.polymer_version}"
modImplementation "eu.pb4:polymer-resource-pack:${project.polymer_version}"
modLocalRuntime "eu.pb4:polymer-autohost:${project.polymer_version}"
modImplementation include("eu.pb4:sgui:${project.sgui_version}")
modImplementation include("xyz.nucleoid:server-translations-api:${project.server_translations_version}")
implementation include("com.electronwill.night-config:toml:${project.night_config_version}")
modCompileOnly "maven.modrinth:universal-graves:${project.universal_graves_version}"
}
processResources {
inputs.property "version", project.version
inputs.property "minecraft_version", project.minecraft_version
inputs.property "loader_version", project.loader_version
filteringCharset "UTF-8"
filesMatching("fabric.mod.json") {
expand "version": project.version,
"minecraft_version": project.minecraft_version,
"loader_version": project.loader_version
}
}
def targetJavaVersion = 21
tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"
if (targetJavaVersion >= 10 || JavaVersion.current().isJava10Compatible()) {
it.options.release.set(targetJavaVersion)
}
}
java {
def javaVersion = JavaVersion.toVersion(targetJavaVersion)
if (JavaVersion.current() < javaVersion) {
toolchain.languageVersion = JavaLanguageVersion.of(targetJavaVersion)
}
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
}
jar {
from("LICENSE") {
rename { "${it}_${project.archives_base_name}"}
}
from("src/main/resoures/assets/minions/lang") {
include("*")
into("data/minions/lang/")
}
}
// configure the maven publication
publishing {
publications {
maven (MavenPublication) {
from components.java
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
maven {
name = "foxgalaxy"
url = "https://maven.foxgalaxy.de/private"
credentials(PasswordCredentials)
}
}
}
build.gradle.kts
+128
View File
@@ -0,0 +1,128 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
plugins {
id("net.fabricmc.fabric-loom")
`maven-publish`
id("org.jetbrains.kotlin.jvm") version "2.3.21"
}
version = providers.gradleProperty("mod_version").get()
group = providers.gradleProperty("maven_group").get()
repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
maven("https://maven.nucleoid.xyz")
exclusiveContent {
forRepository {
maven ("https://api.modrinth.com/maven")
}
filter {
includeGroup("maven.modrinth")
}
}
}
loom {
splitEnvironmentSourceSets()
mods {
register("minions") {
sourceSet(sourceSets.main.get())
sourceSet(sourceSets.getByName("client"))
}
}
for (settings in runs) {
settings.vmArg("-XX:+AllowEnhancedClassRedefinition")
}
accessWidenerPath = file("src/main/resources/minions.classtweaker")
}
dependencies {
// To change the versions see the gradle.properties file
minecraft("com.mojang:minecraft:${providers.gradleProperty("minecraft_version").get()}")
implementation("net.fabricmc:fabric-loader:${providers.gradleProperty("loader_version").get()}")
// Fabric API. This is technically optional, but you probably want it anyway.
implementation("net.fabricmc.fabric-api:fabric-api:${providers.gradleProperty("fabric_api_version").get()}")
implementation("net.fabricmc:fabric-language-kotlin:${providers.gradleProperty("fabric_kotlin_version").get()}")
val polymer_version = providers.gradleProperty("polymer_version").get()
implementation("eu.pb4:polymer-core:${polymer_version}")
implementation("eu.pb4:polymer-virtual-entity:${polymer_version}")
implementation("eu.pb4:polymer-resource-pack:${polymer_version}")
localRuntime("eu.pb4:polymer-autohost:${polymer_version}")
implementation("eu.pb4:sgui:${providers.gradleProperty("sgui_version").get()}")
implementation("xyz.nucleoid:server-translations-api:${providers.gradleProperty("server_translations_version").get()}")
implementation("com.electronwill.night-config:toml:${providers.gradleProperty("night_config_version").get()}")
compileOnly("maven.modrinth:universal-graves:${providers.gradleProperty("universal_graves_version").get()}")
}
tasks.processResources {
val version = version
inputs.property("version", version)
filesMatching("fabric.mod.json") {
expand("version" to version)
}
}
tasks.withType<JavaCompile>().configureEach {
options.release = 25
}
kotlin {
compilerOptions {
jvmTarget = JvmTarget.JVM_25
}
}
java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
sourceCompatibility = JavaVersion.VERSION_25
targetCompatibility = JavaVersion.VERSION_25
}
tasks.jar {
val projectName = project.name
inputs.property("projectName", projectName)
from("LICENSE") {
rename { "${it}_$projectName" }
}
}
// configure the maven publication
publishing {
publications {
register<MavenPublication>("mavenJava") {
from(components["java"])
}
}
// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
maven("https://maven.foxgalaxy.de/private") {
name = "foxgalaxy"
credentials(PasswordCredentials::class.java)
}
}
}
gradle.properties
+9 -8
View File
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties
# check these on https://modmuss50.me/fabric.html
minecraft_version=1.21.7
loader_version=0.16.14
yarn_mappings=1.21.7+build.2
loom_version=1.16-SNAPSHOT
minecraft_version=26.1.2
loader_version=0.19.2
# Mod Properties
mod_version = 1.0.0-TEST-1
@@ -14,12 +14,13 @@ org.gradle.jvmargs=-Xmx1G
# Dependencies
# check this on https://modmuss50.me/fabric.html
fabric_version=0.128.1+1.21.7
fabric_api_version=0.147.0+26.1.2
fabric_kotlin_version=1.13.11+kotlin.2.3.21
polymer_version=0.13.3+1.21.6
sgui_version=1.10.0+1.21.6
server_translations_version=2.5.1+1.21.5
polymer_version=0.16.3+26.1.2
sgui_version=2.0.0+26.1
server_translations_version=3.0.3+26.1
night_config_version=3.8.3
universal_graves_version=3.8.0+1.21.6
universal_graves_version=3.11.0+26.1.2
settings.gradle
-9
View File
@@ -1,9 +0,0 @@
pluginManagement {
repositories {
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}
gradlePluginPortal()
}
}
settings.gradle.kts
+17
View File
@@ -0,0 +1,17 @@
pluginManagement {
repositories {
maven {
name = "Fabric"
url = uri("https://maven.fabricmc.net/")
}
mavenCentral()
gradlePluginPortal()
}
plugins {
id("net.fabricmc.fabric-loom") version providers.gradleProperty("loom_version")
}
}
// Should match your modid
rootProject.name = "minions"
src/client/java/io/github/skippyall/minions/client/MinionsClient.java
-5
View File
@@ -2,16 +2,11 @@ package io.github.skippyall.minions.client;
import eu.pb4.polymer.networking.api.client.PolymerClientNetworking;
import io.github.skippyall.minions.polymer.VersionSync;
import io.github.skippyall.minions.registration.MinionBlocks;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
import net.minecraft.client.renderer.chunk.ChunkSectionLayer;
public class MinionsClient implements ClientModInitializer {
@Override
public void onInitializeClient() {
BlockRenderLayerMap.putBlock(MinionBlocks.MINION_TRIGGER_BLOCK, ChunkSectionLayer.TRANSLUCENT);
PolymerClientNetworking.registerCommonHandler(VersionSync.VersionSyncPayload.class, (client, handler, payload) -> {});
}
}
src/main/java/io/github/skippyall/minions/block/input/AnalogInputBlock.java
+1 -1
View File
@@ -16,7 +16,7 @@ public class AnalogInputBlock extends Block {
@Override
protected InteractionResult useWithoutItem(BlockState state, Level world, BlockPos pos, Player player, BlockHitResult hit) {
if(!world.isClientSide) {
if(!world.isClientSide()) {
player.getInventory().placeItemBackInInventory(ClipboardItem.createBlockPosReference(world, pos), true);
}
return InteractionResult.SUCCESS;
src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlock.java
+5 -3
View File
@@ -7,7 +7,9 @@ import io.github.skippyall.minions.registration.MinionBlocks;
import io.github.skippyall.minions.registration.MinionComponentTypes;
import net.minecraft.core.BlockPos;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ClientboundSoundPacket;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.InteractionHand;
@@ -30,10 +32,10 @@ public abstract class InstructionBoundBlock extends Block implements EntityBlock
@Override
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 && player instanceof ServerPlayer serverPlayer) {
world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> {
be.setInstruction(instruction.selectedMinion(), instruction.selectedInstruction());
player.playNotifySound(SoundEvents.NOTE_BLOCK_CHIME.value(), SoundSource.BLOCKS, 1, 1);
serverPlayer.connection.send(new ClientboundSoundPacket(SoundEvents.NOTE_BLOCK_CHIME, SoundSource.BLOCKS, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 0));
stack.shrink(1);
});
return InteractionResult.SUCCESS;
@@ -50,7 +52,7 @@ public abstract class InstructionBoundBlock extends Block implements EntityBlock
world.getBlockEntity(pos, getBlockEntityType()).ifPresent(be -> {
String name = MinionPersistentState.get(world.getServer()).getMinionData(be.getMinionUuid()).name();
player.displayClientMessage(Component.translatable("minions.reference.instruction.tooltip", name, be.getInstructionName()), true);
player.sendSystemMessage(Component.translatable("minions.reference.instruction.tooltip", name, be.getInstructionName()));
});
return InteractionResult.SUCCESS;
}
src/main/java/io/github/skippyall/minions/block/instruction_bound/InstructionBoundBlockEntity.java
+3 -2
View File
@@ -4,14 +4,15 @@ import io.github.skippyall.minions.listener.BlockEntityMinionListener;
import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import java.util.Optional;
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;
import java.util.Optional;
import java.util.UUID;
public abstract class InstructionBoundBlockEntity<L extends BlockEntityMinionListener<?>> extends BlockEntity {
protected UUID minionUuid;
protected String instructionName = "";
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlock.java
+5 -6
View File
@@ -3,7 +3,6 @@ package io.github.skippyall.minions.block.miniontrigger;
import com.mojang.serialization.MapCodec;
import eu.pb4.polymer.core.api.block.PolymerBlock;
import eu.pb4.polymer.core.api.utils.PolymerClientDecoded;
import eu.pb4.polymer.core.api.utils.PolymerKeepModel;
import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils;
import eu.pb4.polymer.virtualentity.api.BlockWithElementHolder;
import eu.pb4.polymer.virtualentity.api.ElementHolder;
@@ -12,10 +11,11 @@ import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.block.instruction_bound.InstructionBoundBlock;
import io.github.skippyall.minions.polymer.VersionSync;
import io.github.skippyall.minions.registration.MinionBlocks;
import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.component.DataComponents;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
@@ -37,9 +37,8 @@ import net.minecraft.world.level.redstone.Orientation;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext;
public class MinionTriggerBlock extends InstructionBoundBlock implements PolymerBlock, PolymerKeepModel, PolymerClientDecoded, BlockWithElementHolder {
public class MinionTriggerBlock extends InstructionBoundBlock implements PolymerBlock, PolymerClientDecoded, BlockWithElementHolder {
public static final MapCodec<MinionTriggerBlock> CODEC = simpleCodec(MinionTriggerBlock::new);
public static final BooleanProperty POWERED = BooleanProperty.create("powered");
@@ -91,7 +90,7 @@ public class MinionTriggerBlock extends InstructionBoundBlock implements Polymer
}
@Override
protected int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
protected int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos, Direction direction) {
return world.getBlockEntity(pos, MinionBlocks.MINION_TRIGGER_BE_TYPE).map(MinionTriggerBlockEntity::getComparatorOutput).orElse(0);
}
@@ -128,7 +127,7 @@ public class MinionTriggerBlock extends InstructionBoundBlock implements Polymer
}
};
ItemStack stack = new ItemStack(Items.BARRIER);
stack.set(DataComponents.ITEM_MODEL, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger_no_plate_" + (initialBlockState.getValue(MinionTriggerBlock.POWERED) ? "active" : "inactive")));
stack.set(DataComponents.ITEM_MODEL, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger_no_plate_" + (initialBlockState.getValue(MinionTriggerBlock.POWERED) ? "active" : "inactive")));
ItemDisplayElement element = new ItemDisplayElement(stack);
element.setItemDisplayContext(ItemDisplayContext.NONE);
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerBlockItem.java
+5 -4
View File
@@ -2,12 +2,13 @@ package io.github.skippyall.minions.block.miniontrigger;
import eu.pb4.polymer.core.api.item.PolymerBlockItem;
import eu.pb4.polymer.resourcepack.api.PolymerResourcePackUtils;
import net.minecraft.resources.ResourceLocation;
import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
import net.minecraft.core.HolderLookup;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block;
import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext;
public class MinionTriggerBlockItem extends PolymerBlockItem {
public MinionTriggerBlockItem(Block block, Properties settings, Item polymerItem) {
@@ -15,9 +16,9 @@ public class MinionTriggerBlockItem extends PolymerBlockItem {
}
@Override
public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context, HolderLookup.Provider lookup) {
if(PolymerResourcePackUtils.hasMainPack(context)) {
return super.getPolymerItemModel(stack, context);
return super.getPolymerItemModel(stack, context, lookup);
} else {
return null;
}
src/main/java/io/github/skippyall/minions/block/miniontrigger/MinionTriggerMinionListener.java
+4 -3
View File
@@ -11,10 +11,11 @@ import io.github.skippyall.minions.program.instruction.ConfiguredInstructionList
import io.github.skippyall.minions.registration.MinionBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.core.UUIDUtil;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.Level;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -82,8 +83,8 @@ public class MinionTriggerMinionListener extends BlockEntityMinionInstructionLis
}
@Override
public Optional<ResourceLocation> getCodecId() {
return Optional.of(ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger"));
public Optional<Identifier> getCodecId() {
return Optional.of(Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger"));
}
public void updateComparatorsIfLoaded(MinecraftServer server) {
src/main/java/io/github/skippyall/minions/clipboard/BlockPosClipboard.java
+2 -1
View File
@@ -2,7 +2,6 @@ package io.github.skippyall.minions.clipboard;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import java.util.function.Consumer;
import net.minecraft.core.BlockPos;
import net.minecraft.core.component.DataComponentGetter;
import net.minecraft.network.chat.Component;
@@ -11,6 +10,8 @@ import net.minecraft.world.item.Item;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import java.util.function.Consumer;
public record BlockPosClipboard(ResourceKey<Level> world, BlockPos pos) implements Clipboard {
public static final MapCodec<BlockPosClipboard> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group(
src/main/java/io/github/skippyall/minions/clipboard/Clipboard.java
+2 -1
View File
@@ -3,9 +3,10 @@ package io.github.skippyall.minions.clipboard;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import io.github.skippyall.minions.registration.MinionRegistries;
import java.util.function.Function;
import net.minecraft.world.item.component.TooltipProvider;
import java.util.function.Function;
public interface Clipboard extends TooltipProvider {
Codec<Clipboard> CODEC = MinionRegistries.CLIPBOARD_TYPES.byNameCodec().dispatch(Clipboard::getCodec, Function.identity());
src/main/java/io/github/skippyall/minions/clipboard/ClipboardItem.java
+7 -6
View File
@@ -4,16 +4,17 @@ import eu.pb4.polymer.core.api.item.PolymerItem;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionComponentTypes;
import io.github.skippyall.minions.registration.MinionItems;
import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
import net.minecraft.core.BlockPos;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.component.DataComponents;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.level.Level;
import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.packettweaker.PacketContext;
public class ClipboardItem extends Item implements PolymerItem {
public ClipboardItem(Properties settings) {
@@ -26,20 +27,20 @@ public class ClipboardItem extends Item implements PolymerItem {
}
@Override
public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context, HolderLookup.Provider lookup) {
return null;
}
@Override
public ItemStack getPolymerItemStack(ItemStack itemStack, TooltipFlag tooltipType, PacketContext context) {
ItemStack stack = PolymerItem.super.getPolymerItemStack(itemStack, tooltipType, context);
public ItemStack getPolymerItemStack(ItemStack itemStack, TooltipFlag tooltipType, PacketContext context, HolderLookup.Provider lookup) {
ItemStack stack = PolymerItem.super.getPolymerItemStack(itemStack, tooltipType, context, lookup);
stack.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true);
return stack;
}
public static ItemStack createInstructionReference(MinionFakePlayer minion, String instructionName) {
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().name()));
return stack;
}
src/main/java/io/github/skippyall/minions/clipboard/InstructionClipboard.java
+3 -2
View File
@@ -3,14 +3,15 @@ package io.github.skippyall.minions.clipboard;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import java.util.UUID;
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;
import java.util.UUID;
import java.util.function.Consumer;
public record InstructionClipboard(UUID selectedMinion, String selectedInstruction, String visualMinionName) implements Clipboard {
public static final MapCodec<InstructionClipboard> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group(
src/main/java/io/github/skippyall/minions/command/DocsSubcommand.java
+6 -5
View File
@@ -6,10 +6,11 @@ import com.mojang.brigadier.exceptions.CommandSyntaxException;
import com.mojang.brigadier.suggestion.Suggestions;
import com.mojang.brigadier.suggestion.SuggestionsBuilder;
import io.github.skippyall.minions.docs.DocsManager;
import java.util.concurrent.CompletableFuture;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.arguments.ResourceLocationArgument;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.commands.arguments.IdentifierArgument;
import net.minecraft.resources.Identifier;
import java.util.concurrent.CompletableFuture;
import static net.minecraft.commands.Commands.argument;
import static net.minecraft.commands.Commands.literal;
@@ -17,7 +18,7 @@ import static net.minecraft.commands.Commands.literal;
public class DocsSubcommand {
public static final LiteralArgumentBuilder<CommandSourceStack> DOCS = literal("docs")
.then(
argument("docName", ResourceLocationArgument.id())
argument("docName", IdentifierArgument.id())
.suggests(DocsSubcommand::getSuggestions)
.executes(DocsSubcommand::execute)
);
@@ -28,7 +29,7 @@ public class DocsSubcommand {
}
public static int execute(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
ResourceLocation id = ResourceLocationArgument.getId(context, "docName");
Identifier id = IdentifierArgument.getId(context, "docName");
DocsManager.showDocsEntry(context.getSource().getPlayerOrException(), id);
return 1;
}
src/main/java/io/github/skippyall/minions/command/ListSubcommand.java
+2 -1
View File
@@ -4,10 +4,11 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import io.github.skippyall.minions.minion.MinionData;
import io.github.skippyall.minions.minion.MinionPersistentState;
import java.util.Collection;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.chat.Component;
import java.util.Collection;
import static net.minecraft.commands.Commands.literal;
public class ListSubcommand {
src/main/java/io/github/skippyall/minions/command/SpawnSubcommand.java
+2 -1
View File
@@ -9,13 +9,14 @@ import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.arguments.coordinates.Coordinates;
import net.minecraft.commands.arguments.coordinates.Vec3Argument;
import net.minecraft.server.permissions.Permissions;
import static net.minecraft.commands.Commands.argument;
import static net.minecraft.commands.Commands.literal;
public class SpawnSubcommand {
public static final LiteralArgumentBuilder<CommandSourceStack> SPAWN = literal("spawn")
.requires(source -> source.hasPermission(2))
.requires(source -> source.permissions().hasPermission(Permissions.COMMANDS_GAMEMASTER))
.then(argument("minion", StringArgumentType.word())
.suggests(MinionArgument.SUGGESTION_PROVIDER)
.then(argument("pos", Vec3Argument.vec3())
src/main/java/io/github/skippyall/minions/command/TestSubcommand.java
+3 -2
View File
@@ -3,8 +3,6 @@ package io.github.skippyall.minions.command;
import com.mojang.brigadier.builder.LiteralArgumentBuilder;
import com.mojang.brigadier.context.CommandContext;
import io.github.skippyall.minions.Minions;
import java.util.Collection;
import java.util.HashSet;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.commands.arguments.coordinates.BlockPosArgument;
import net.minecraft.core.BlockPos;
@@ -13,6 +11,9 @@ import net.minecraft.network.chat.Component;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import java.util.Collection;
import java.util.HashSet;
import static net.minecraft.commands.Commands.argument;
import static net.minecraft.commands.Commands.literal;
src/main/java/io/github/skippyall/minions/docs/DocsEntry.java
+3 -2
View File
@@ -4,11 +4,12 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.github.skippyall.minions.registration.MinionRegistries;
import java.util.List;
import java.util.function.Function;
import net.minecraft.core.RegistryAccess;
import net.minecraft.server.dialog.body.DialogBody;
import java.util.List;
import java.util.function.Function;
public interface DocsEntry {
Codec<DocsEntry> CODEC = MinionRegistries.DOCS_ENTRY_TYPES.byNameCodec().dispatch(DocsEntry::getCodec, Function.identity());
src/main/java/io/github/skippyall/minions/docs/DocsManager.java
+15 -15
View File
@@ -7,7 +7,7 @@ import net.fabricmc.fabric.api.resource.SimpleResourceReloadListener;
import net.minecraft.core.Holder;
import net.minecraft.network.chat.ClickEvent;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.server.dialog.ActionButton;
import net.minecraft.server.dialog.CommonButtonData;
import net.minecraft.server.dialog.CommonDialogData;
@@ -30,15 +30,15 @@ import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<ResourceLocation, DocsEntry>, DocsTree>> {
private static Map<ResourceLocation, DocsEntry> docs;
public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<Identifier, DocsEntry>, DocsTree>> {
private static Map<Identifier, DocsEntry> docs;
private static DocsTree tree;
public static DocsTree getTree() {
return tree;
}
public static void showDocsEntry(ServerPlayer player, ResourceLocation id) {
public static void showDocsEntry(ServerPlayer player, Identifier id) {
DocsEntry entry = getDocsEntry(id);
if(entry == null) {
return;
@@ -48,11 +48,11 @@ public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<Resou
if(tree != null) {
DocsTree.DocElement element = tree.getElement(id);
if (element.previous() != null) {
ResourceLocation previousId = element.previous().getId();
Identifier previousId = element.previous().getId();
buttons.add(getDialogButton(Component.literal("<- ").append(Component.translatable(getDocsEntry(previousId).getMetadata().titleKey())), previousId.toString()));
}
if (element.next() != null) {
ResourceLocation nextId = element.next().getId();
Identifier nextId = element.next().getId();
buttons.add(getDialogButton(Component.translatable(getDocsEntry(nextId).getMetadata().titleKey()).append(Component.literal(" ->")), nextId.toString()));
}
}
@@ -87,21 +87,21 @@ public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<Resou
);
}
public static DocsEntry getDocsEntry(ResourceLocation id) {
public static DocsEntry getDocsEntry(Identifier id) {
return docs.get(id);
}
public static Collection<ResourceLocation> getDocsEntryIds() {
public static Collection<Identifier> getDocsEntryIds() {
return docs.keySet();
}
@Override
public CompletableFuture<Tuple<Map<ResourceLocation, DocsEntry>, DocsTree>> load(ResourceManager resourceManager, Executor executor) {
public CompletableFuture<Tuple<Map<Identifier, DocsEntry>, DocsTree>> load(ResourceManager resourceManager, Executor executor) {
return CompletableFuture.supplyAsync(() -> {
Map<ResourceLocation, Resource> resources = resourceManager.listResources("docs", id -> id.getNamespace().equals(Minions.MOD_ID) && id.getPath().endsWith(".json"));
Map<Identifier, Resource> resources = resourceManager.listResources("docs", id -> id.getNamespace().equals(Minions.MOD_ID) && id.getPath().endsWith(".json"));
final DocsTree.BranchElement[] root = {null};
Map<ResourceLocation, DocsEntry> docsEntries = new HashMap<>();
Map<Identifier, DocsEntry> docsEntries = new HashMap<>();
resources.forEach((id, resource) -> {
try(Reader reader = resource.openAsReader()) {
if(id.getPath().equals("docs/tree.json")) {
@@ -109,7 +109,7 @@ public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<Resou
.ifSuccess(entry -> root[0] = entry.getFirst())
.ifError(error -> Minions.LOGGER.warn("Could not parse docs tree {}: {}", id, error.message()));
} else {
ResourceLocation docId = ResourceLocation.fromNamespaceAndPath(id.getNamespace(), id.getPath().substring("docs/".length(), id.getPath().length() - ".json".length()));
Identifier docId = Identifier.fromNamespaceAndPath(id.getNamespace(), id.getPath().substring("docs/".length(), id.getPath().length() - ".json".length()));
DocsEntry.CODEC.decode(JsonOps.INSTANCE, StrictJsonParser.parse(reader))
.ifSuccess(entry -> docsEntries.put(docId, entry.getFirst()))
.ifError(error -> Minions.LOGGER.warn("Could not parse docs entry {}: {}", id, error.message()));
@@ -128,7 +128,7 @@ public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<Resou
}
@Override
public CompletableFuture<Void> apply(Tuple<Map<ResourceLocation, DocsEntry>, DocsTree> o, ResourceManager resourceManager, Executor executor) {
public CompletableFuture<Void> apply(Tuple<Map<Identifier, DocsEntry>, DocsTree> o, ResourceManager resourceManager, Executor executor) {
return CompletableFuture.supplyAsync(() -> {
docs = o.getA();
tree = o.getB();
@@ -137,7 +137,7 @@ public class DocsManager implements SimpleResourceReloadListener<Tuple<Map<Resou
}
@Override
public ResourceLocation getFabricId() {
return ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "docs");
public Identifier getFabricId() {
return Identifier.fromNamespaceAndPath(Minions.MOD_ID, "docs");
}
}
src/main/java/io/github/skippyall/minions/docs/DocsTree.java
+8 -7
View File
@@ -2,15 +2,16 @@ package io.github.skippyall.minions.docs;
import com.mojang.datafixers.util.Either;
import com.mojang.serialization.Codec;
import net.minecraft.resources.Identifier;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import net.minecraft.resources.ResourceLocation;
public class DocsTree {
private final BranchElement root;
private final Map<ResourceLocation, DocElement> entries = new HashMap<>();
private final Map<Identifier, DocElement> entries = new HashMap<>();
public DocsTree(BranchElement root) {
this.root = root;
@@ -29,7 +30,7 @@ public class DocsTree {
return root;
}
public DocElement getElement(ResourceLocation id) {
public DocElement getElement(Identifier id) {
return entries.get(id);
}
@@ -54,15 +55,15 @@ public class DocsTree {
}
public static final class DocElement extends Element {
public static final Codec<DocElement> CODEC = ResourceLocation.CODEC.xmap(DocElement::new, DocElement::getId);
public static final Codec<DocElement> CODEC = Identifier.CODEC.xmap(DocElement::new, DocElement::getId);
private final ResourceLocation id;
private final Identifier id;
public DocElement(ResourceLocation element) {
public DocElement(Identifier element) {
this.id = element;
}
public ResourceLocation getId() {
public Identifier getId() {
return id;
}
}
src/main/java/io/github/skippyall/minions/docs/ReferenceEntry.java
+12 -11
View File
@@ -4,26 +4,27 @@ import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import io.github.skippyall.minions.gui.GuiDisplay;
import java.util.ArrayList;
import java.util.List;
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.Identifier;
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;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
public record ReferenceEntry(Metadata metadata, ResourceKey<?> object, Component shortDescription, Component longDescription) implements DocsEntry {
private static final Codec<ResourceKey<?>> REGISTRY_KEY_CODEC = RecordCodecBuilder.create(instance ->
instance.group(
ResourceLocation.CODEC.fieldOf("registry").forGetter(ResourceKey::registry),
ResourceLocation.CODEC.fieldOf("value").forGetter(ResourceKey::location)
Identifier.CODEC.fieldOf("registry").forGetter(ResourceKey::registry),
Identifier.CODEC.fieldOf("value").forGetter(ResourceKey::identifier)
).apply(instance, (registry, value) -> ResourceKey.create(ResourceKey.createRegistryKey(registry), value))
);
@@ -46,9 +47,9 @@ public record ReferenceEntry(Metadata metadata, ResourceKey<?> object, Component
GuiDisplay display = getObjectDisplay(manager);
if(display != null) {
bodyElements.add(new ItemBody(display.createItemStack(), Optional.empty(), false, false, 16, 16));
bodyElements.add(new ItemBody(display.createItemStackTemplate(), Optional.empty(), false, false, 16, 16));
}
bodyElements.add(new PlainMessage(Component.translatable(object.location().toLanguageKey(object.registry().getPath())), 200));
bodyElements.add(new PlainMessage(Component.translatable(object.identifier().toLanguageKey(object.registry().getPath())), 200));
bodyElements.add(new PlainMessage(longDescription, 200));
return bodyElements;
@@ -59,15 +60,15 @@ public record ReferenceEntry(Metadata metadata, ResourceKey<?> object, Component
if(object.isFor(Registries.ITEM) || object.isFor(Registries.BLOCK)) {
Item item;
if(object.isFor(Registries.ITEM)) {
item = BuiltInRegistries.ITEM.getValue(object.location());
item = BuiltInRegistries.ITEM.getValue(object.identifier());
} else {
item = BuiltInRegistries.BLOCK.getValue(object.location()).asItem();
item = BuiltInRegistries.BLOCK.getValue(object.identifier()).asItem();
}
if(item != null) {
display = new GuiDisplay.ItemBased(item);
}
} else {
ResourceLocation displayId = object.location().withPrefix(object.registry().getPath() + "/");
Identifier displayId = object.identifier().withPrefix(object.registry().getPath() + "/");
display = GuiDisplay.getGuiDisplay(displayId, manager);
}
return display;
src/main/java/io/github/skippyall/minions/gui/GuiDisplay.java
+37 -30
View File
@@ -1,41 +1,42 @@
package io.github.skippyall.minions.gui;
import com.mojang.authlib.properties.PropertyMap;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.util.TranslationUtil;
import it.unimi.dsi.fastutil.objects.ReferenceSortedSets;
import java.util.Optional;
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.DataComponentPatch;
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.resources.Identifier;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ItemStackTemplate;
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;
import java.util.UUID;
public interface GuiDisplay {
Codec<GuiDisplay> CODEC = MinionRegistries.GUI_DISPLAY_TYPE.byNameCodec().dispatch(GuiDisplay::getCodec, codec -> codec.fieldOf("data"));
GuiDisplay DEFAULT_DISPLAY = new ItemBased(Items.BARRIER);
static GuiDisplay getGuiDisplay(ResourceLocation id, RegistryAccess manager) {
static GuiDisplay getGuiDisplay(Identifier id, RegistryAccess manager) {
return manager.lookup(MinionRegistries.GUI_DISPLAY).map(registry -> registry.getValue(id)).orElse(DEFAULT_DISPLAY);
}
static <T> GuiDisplay getGuiDisplayFor(Registry<T> registry, T element, RegistryAccess manager) {
ResourceLocation elementId = registry.getKey(element);
Identifier elementId = registry.getKey(element);
if(elementId == null) {
return DEFAULT_DISPLAY;
}
ResourceLocation displayId = elementId.withPrefix(registry.key().location().getPath() + "/");
Identifier displayId = elementId.withPrefix(registry.key().identifier().getPath() + "/");
return getGuiDisplay(displayId, manager);
}
@@ -50,24 +51,29 @@ public interface GuiDisplay {
return stack;
}
ItemStack createItemStack();
ItemStackTemplate createItemStackTemplate();
default ItemStack createItemStack() {
return createItemStackTemplate().create();
}
Codec<? extends GuiDisplay> getCodec();
class ModelBased implements GuiDisplay {
public static final Codec<ModelBased> CODEC = ResourceLocation.CODEC.xmap(ModelBased::new, display -> display.model);
public static final Codec<ModelBased> CODEC = Identifier.CODEC.xmap(ModelBased::new, display -> display.model);
private final ResourceLocation model;
private final Identifier model;
public ModelBased(ResourceLocation model) {
public ModelBased(Identifier model) {
this.model = model;
}
@Override
public ItemStack createItemStack() {
ItemStack stack = new ItemStack(Items.BARRIER);
stack.set(DataComponents.ITEM_MODEL, model);
return stack;
public ItemStackTemplate createItemStackTemplate() {
return new ItemStackTemplate(Items.BARRIER, DataComponentPatch.builder()
.set(DataComponents.ITEM_MODEL, model)
.build()
);
}
@Override
@@ -86,11 +92,11 @@ public interface GuiDisplay {
}
@Override
public ItemStack createItemStack() {
ItemStack stack = new ItemStack(item);
stack.set(DataComponents.TOOLTIP_DISPLAY, new TooltipDisplay(true, ReferenceSortedSets.emptySet()));
stack.set(DataComponents.RARITY, Rarity.COMMON);
return stack;
public ItemStackTemplate createItemStackTemplate() {
return new ItemStackTemplate(item, DataComponentPatch.builder()
.set(DataComponents.TOOLTIP_DISPLAY, new TooltipDisplay(true, ReferenceSortedSets.emptySet()))
.set(DataComponents.RARITY, Rarity.COMMON)
.build());
}
@Override
@@ -109,10 +115,11 @@ public interface GuiDisplay {
}
@Override
public ItemStack createItemStack() {
ItemStack stack = new ItemStack(Items.PLAYER_HEAD);
stack.set(DataComponents.PROFILE, new ResolvableProfile(Optional.empty(), Optional.of(uuid), new PropertyMap()));
return stack;
public ItemStackTemplate createItemStackTemplate() {
return new ItemStackTemplate(Items.PLAYER_HEAD, DataComponentPatch.builder()
.set(DataComponents.PROFILE, ResolvableProfile.createUnresolved(uuid))
.build()
);
}
@Override
@@ -122,17 +129,17 @@ public interface GuiDisplay {
}
class StackBased implements GuiDisplay {
public static final Codec<StackBased> CODEC = ItemStack.CODEC.xmap(StackBased::new, StackBased::createItemStack);
public static final Codec<StackBased> CODEC = ItemStackTemplate.CODEC.xmap(StackBased::new, StackBased::createItemStackTemplate);
private final ItemStack stack;
private final ItemStackTemplate template;
public StackBased(ItemStack stack) {
this.stack = stack;
public StackBased(ItemStackTemplate template) {
this.template = template;
}
@Override
public ItemStack createItemStack() {
return stack;
public ItemStackTemplate createItemStackTemplate() {
return template;
}
@Override
src/main/java/io/github/skippyall/minions/gui/MinionLookGui.java
+12 -9
View File
@@ -1,5 +1,6 @@
package io.github.skippyall.minions.gui;
import com.mojang.authlib.GameProfile;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui;
import io.github.skippyall.minions.gui.input.TextInput;
@@ -9,7 +10,7 @@ import io.github.skippyall.minions.minion.MinionProfileUtils;
import io.github.skippyall.minions.minion.skin.SkinProvider;
import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.registration.SkinProviders;
import java.util.Optional;
import net.fabricmc.fabric.api.entity.FakePlayer;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
@@ -18,6 +19,8 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.component.ResolvableProfile;
import java.util.Optional;
public class MinionLookGui extends SimpleGui {
private ItemStack minionItem;
private SkinProvider currentSkinProvider;
@@ -47,11 +50,11 @@ public class MinionLookGui extends SimpleGui {
private void updateSkin() {
GuiElementBuilder builder = new GuiElementBuilder()
.setItem(Items.PLAYER_HEAD)
.setCallback(() -> currentSkinProvider.openSkinMenu(player).thenAccept(skin -> {
MinionItem.setData(player.getServer(), getData().withSkin(skin), minionItem);
}));
if(MinionItem.getData(player.getServer(), minionItem) != null && MinionItem.getData(player.getServer(), minionItem).skin().isPresent()) {
builder.setComponent(DataComponents.PROFILE, new ResolvableProfile(Optional.empty(), Optional.empty(), getData().skin().get()));
.setCallback(() -> currentSkinProvider.openSkinMenu(player)
.thenCompose(profile -> profile.resolveProfile(player.level().getServer().services().profileResolver()))
.thenAccept(skin -> MinionItem.setData(player.level().getServer(), getData().withSkin(Optional.of(skin.properties())), minionItem)));
if(MinionItem.getData(player.level().getServer(), minionItem) != null && MinionItem.getData(player.level().getServer(), minionItem).skin().isPresent()) {
builder.setComponent(DataComponents.PROFILE, ResolvableProfile.createResolved(new GameProfile(FakePlayer.DEFAULT_UUID, "", getData().skin().get())));
}
setSlot(16, builder);
}
@@ -76,7 +79,7 @@ public class MinionLookGui extends SimpleGui {
}
private MinionData getData() {
return MinionItem.getDataOrDefault(player.getServer(), minionItem);
return MinionItem.getDataOrDefault(player.level().getServer(), minionItem);
}
public static void open(ServerPlayer player, ItemStack minionItem) {
@@ -86,9 +89,9 @@ public class MinionLookGui extends SimpleGui {
}
public void openRenameGui(ServerPlayer player, ItemStack minionItem) {
TextInput.inputSync(player, Component.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.level().getServer(), name))
.thenAccept(name -> {
MinionItem.setData(player.getServer(), getData().withName(MinionProfileUtils.getPrefix() + name), minionItem);
MinionItem.setData(player.level().getServer(), getData().withName(MinionProfileUtils.getPrefix() + name), minionItem);
open();
});
}
src/main/java/io/github/skippyall/minions/gui/MinionsGui.java
+11 -6
View File
@@ -35,30 +35,35 @@ public abstract class MinionsGui {
return;
}
close();
close(true);
}
public void close() {
close(false);
}
public void close(boolean alreadyClosed) {
if(open) {
if(parent != null) {
parent.child = null;
parent.reopen();
//parent.reopen();
}
closeNoOpen(parent == null);
closeNoOpen(alreadyClosed);
}
}
private void closeNoOpen(boolean closeBacking) {
if(child != null) {
open = false;
boolean hasChild = child != null;
if(hasChild) {
child.closeNoOpen(closeBacking);
}
if(parent != null) {
parent.child = null;
}
if(closeBacking) {
if(closeBacking && !hasChild) {
closeBacking();
}
open = false;
}
protected abstract void closeBacking();
src/main/java/io/github/skippyall/minions/gui/PaginatedList.java
+4 -3
View File
@@ -2,13 +2,14 @@ package io.github.skippyall.minions.gui;
import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.SimpleGui;
import java.util.List;
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;
import java.util.List;
import java.util.function.BiFunction;
public class PaginatedList extends MinionsGui {
private int page = 0;
private SimpleGui gui;
@@ -28,7 +29,7 @@ public class PaginatedList extends MinionsGui {
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_9x4, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
src/main/java/io/github/skippyall/minions/gui/input/ChoiceInput.java
+7 -7
View File
@@ -6,15 +6,15 @@ import io.github.skippyall.minions.gui.Displayable;
import io.github.skippyall.minions.gui.GuiDisplay;
import io.github.skippyall.minions.gui.MinionsGui;
import io.github.skippyall.minions.gui.minion.SimpleMinionsGui;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.Items;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction;
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 static <T> BiFunction<ServerPlayer, T, CompletableFuture<T>> createDialogOpener(MenuType<?> screen, Component title, Function<T, GuiDisplay> displayFunction, T[] values, @Nullable T fallback) {
@@ -23,7 +23,7 @@ public class ChoiceInput {
SimpleGui gui = new SimpleGui(screen, player, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
if(fallback == null) {
future.cancel(false);
} else {
@@ -53,7 +53,7 @@ public class ChoiceInput {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, player, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
future.cancel(false);
}
};
@@ -80,7 +80,7 @@ public class ChoiceInput {
new SimpleMinionsGui(parent, (onClose, me) -> {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, parent.getViewer(), false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
future.cancel(false);
onClose.run();
}
src/main/java/io/github/skippyall/minions/gui/input/TextInput.java
+4 -3
View File
@@ -4,13 +4,14 @@ import eu.pb4.sgui.api.elements.GuiElementBuilder;
import eu.pb4.sgui.api.gui.AnvilInputGui;
import io.github.skippyall.minions.gui.MinionsGui;
import io.github.skippyall.minions.gui.minion.SimpleMinionsGui;
import java.util.concurrent.CompletableFuture;
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;
import java.util.concurrent.CompletableFuture;
import java.util.function.Function;
public class TextInput<T> extends AnvilInputGui {
private final GuiElementBuilder valid = new GuiElementBuilder()
.setItem(Items.EMERALD_BLOCK)
@@ -104,7 +105,7 @@ public class TextInput<T> extends AnvilInputGui {
}
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
if(!future.isDone() && !isConfirm) {
future.cancel(false);
}
src/main/java/io/github/skippyall/minions/gui/instruction/ArgumentGui.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class ArgumentGui extends MinionsGui {
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
src/main/java/io/github/skippyall/minions/gui/instruction/ConfigureInstructionGui.java
+3 -2
View File
@@ -13,6 +13,7 @@ import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.instruction.ConfiguredInstructionListener;
import io.github.skippyall.minions.program.supplier.Parameter;
import net.minecraft.network.chat.Component;
import net.minecraft.network.protocol.game.ClientboundSoundEntityPacket;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
import net.minecraft.world.inventory.MenuType;
@@ -42,7 +43,7 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
@@ -75,7 +76,7 @@ public class ConfigureInstructionGui extends MinionsGui implements ConfiguredIns
.addLoreLine(Component.translatable("minions.gui.instruction.configure.copy.description"))
.setCallback(() -> {
viewer.getInventory().placeItemBackInInventory(ClipboardItem.createInstructionReference(minion, name), true);
viewer.playNotifySound(SoundEvents.NOTE_BLOCK_CHIME.value(), SoundSource.BLOCKS, 1, 1);
viewer.connection.send(new ClientboundSoundEntityPacket(SoundEvents.NOTE_BLOCK_CHIME, SoundSource.BLOCKS, viewer, 1, 1, 0));
})
);
src/main/java/io/github/skippyall/minions/gui/instruction/ConverterGui.java
+1 -6
View File
@@ -44,7 +44,7 @@ public class ConverterGui extends MinionsGui {
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
@@ -57,11 +57,6 @@ public class ConverterGui extends MinionsGui {
gui.open();
}
@Override
protected void reopen() {
gui.open();
}
private void updateTypeDisplay() {
gui.setSlot(3, new GuiElementBuilder(GuiDisplay.getDisplayStackWithName(MinionRegistries.VALUE_CONVERTER_TYPES, valueConverterType, viewer.registryAccess()))
.setCallback(this::configureType)
src/main/java/io/github/skippyall/minions/gui/instruction/ConverterListGui.java
+1 -1
View File
@@ -34,7 +34,7 @@ public class ConverterListGui extends MinionsGui {
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
src/main/java/io/github/skippyall/minions/gui/instruction/InstructionGui.java
+7 -7
View File
@@ -18,16 +18,16 @@ import io.github.skippyall.minions.program.supplier.ValueSupplier;
import io.github.skippyall.minions.registration.MinionComponentTypes;
import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.util.TranslationUtil;
import org.jetbrains.annotations.Nullable;
import java.util.NoSuchElementException;
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;
import org.jetbrains.annotations.Nullable;
import java.util.NoSuchElementException;
import java.util.concurrent.CompletableFuture;
public class InstructionGui {
public static MinionsGui openInstructionMainMenu(MinionsGui parent, GuiContext.Minion context) {
@@ -36,7 +36,7 @@ public class InstructionGui {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, player, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onClose.run();
}
};
@@ -103,7 +103,7 @@ public class InstructionGui {
new SimpleMinionsGui(parent, (closeHandler, me) -> {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
if (!future.isDone()) {
future.cancel(false);
}
@@ -136,7 +136,7 @@ public class InstructionGui {
new SimpleMinionsGui(parent, (closeHandler, me) -> {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_9x3, parent.getViewer(), false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
if (!future.isDone()) {
future.cancel(false);
}
src/main/java/io/github/skippyall/minions/gui/instruction/InstructionListGui.java
+1 -6
View File
@@ -35,7 +35,7 @@ public class InstructionListGui extends MinionsGui implements MinionListener {
minion.addMinionListener(this);
gui = new SimpleGui(MenuType.GENERIC_9x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
@@ -44,11 +44,6 @@ public class InstructionListGui extends MinionsGui implements MinionListener {
gui.open();
}
@Override
protected void reopen() {
gui.open();
}
@Override
protected void closeBacking() {
minion.removeMinionListener(this);
src/main/java/io/github/skippyall/minions/gui/minion/MinionGui.java
+1 -6
View File
@@ -31,7 +31,7 @@ public class MinionGui extends MinionsGui implements MinionListener {
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_3x3, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
@@ -65,11 +65,6 @@ public class MinionGui extends MinionsGui implements MinionListener {
gui.open();
}
@Override
protected void reopen() {
gui.open();
}
@Override
protected void closeBacking() {
gui.close();
src/main/java/io/github/skippyall/minions/gui/minion/MinionInventoryGui.java
+8 -8
View File
@@ -29,7 +29,7 @@ public class MinionInventoryGui extends MinionsGui {
protected void open() {
gui = new SimpleGui(MenuType.GENERIC_9x6, viewer, false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onBackingClosed();
}
};
@@ -45,18 +45,18 @@ public class MinionInventoryGui extends MinionsGui {
gui.setSlot(5, new ItemStack(Items.LEATHER_BOOTS));
gui.setSlot(6, new ItemStack(Items.SHIELD));
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.getIndex(Inventory.INVENTORY_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.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlotRedirect(6 + 9, new Slot(minion.getInventory(), Inventory.SLOT_OFFHAND, 0, 0));
gui.setSlot(2 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.HEAD, EquipmentSlot.HEAD.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlot(3 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.CHEST, EquipmentSlot.CHEST.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlot(4 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.LEGS, EquipmentSlot.LEGS.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlot(5 + 9, new ArmorSlot(minion.getInventory(), minion, EquipmentSlot.FEET, EquipmentSlot.FEET.getIndex(Inventory.INVENTORY_SIZE), 0, 0, null));
gui.setSlot(6 + 9, new Slot(minion.getInventory(), Inventory.SLOT_OFFHAND, 0, 0));
for (int i = Inventory.SELECTION_SIZE; i < Inventory.INVENTORY_SIZE; i++) {
gui.setSlotRedirect(i + 9, new Slot(minion.getInventory(), i, 0, 0));
gui.setSlot(i + 9, new Slot(minion.getInventory(), i, 0, 0));
}
for (int i = 0; i < Inventory.SELECTION_SIZE; i++) {
gui.setSlotRedirect(i + 45, new Slot(minion.getInventory(), i, 0, 0));
gui.setSlot(i + 45, new Slot(minion.getInventory(), i, 0, 0));
}
gui.open();
}
src/main/java/io/github/skippyall/minions/gui/minion/SimpleMinionsGui.java
+4 -4
View File
@@ -1,15 +1,15 @@
package io.github.skippyall.minions.gui.minion;
import eu.pb4.sgui.api.gui.GuiInterface;
import eu.pb4.sgui.api.gui.GuiLike;
import io.github.skippyall.minions.gui.MinionsGui;
import java.util.function.BiFunction;
public class SimpleMinionsGui extends MinionsGui {
private GuiInterface gui;
private final BiFunction<Runnable, SimpleMinionsGui, GuiInterface> guiFactory;
private GuiLike gui;
private final BiFunction<Runnable, SimpleMinionsGui, GuiLike> guiFactory;
public SimpleMinionsGui(MinionsGui parent, BiFunction<Runnable, SimpleMinionsGui, GuiInterface> guiFactory) {
public SimpleMinionsGui(MinionsGui parent, BiFunction<Runnable, SimpleMinionsGui, GuiLike> guiFactory) {
super(parent);
this.guiFactory = guiFactory;
open();
src/main/java/io/github/skippyall/minions/listener/SerializableListenerManager.java
+6 -4
View File
@@ -1,13 +1,15 @@
package io.github.skippyall.minions.listener;
import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import net.minecraft.core.Registry;
import net.minecraft.resources.Identifier;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.Set;
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 SerializableListenerManager() {
@@ -20,7 +22,7 @@ public class SerializableListenerManager<T extends SerializableListenerManager.S
public static <T extends SerializableListener> Codec<SerializableListenerManager<T>> getCodec(Registry<Codec<? extends T>> registry) {
return registry.byNameCodec().<T>dispatch(
listener -> listener.getCodecId().map(registry::getValue).orElse(Codec.unit(null)),
listener -> listener.getCodecId().map(registry::getValue).orElse(MapCodec.unitCodec(null)),
codec -> codec.fieldOf("data")
).listOf().xmap(
list -> new SerializableListenerManager<>(new CopyOnWriteArraySet<>(list)),
@@ -37,7 +39,7 @@ public class SerializableListenerManager<T extends SerializableListenerManager.S
}
public interface SerializableListener {
default Optional<ResourceLocation> getCodecId() {
default Optional<Identifier> getCodecId() {
return Optional.empty();
}
}
src/main/java/io/github/skippyall/minions/minion/MinionConfig.java
+4 -3
View File
@@ -2,10 +2,11 @@ package io.github.skippyall.minions.minion;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.resources.Identifier;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import net.minecraft.resources.ResourceLocation;
public class MinionConfig {
public static final Codec<MinionConfig> CODEC = Codec.<Option<?>, Object>dispatchedMap(
@@ -43,11 +44,11 @@ public class MinionConfig {
return Objects.hashCode(values);
}
public static Option<Boolean> booleanOption(ResourceLocation key, boolean defaultValue) {
public static Option<Boolean> booleanOption(Identifier key, boolean defaultValue) {
return new Option<>(key, defaultValue, Codec.BOOL);
}
public record Option<T>(ResourceLocation key, T defaultValue, Codec<T> codec) {
public record Option<T>(Identifier key, T defaultValue, Codec<T> codec) {
@Override
public boolean equals(Object o) {
if (!(o instanceof Option<?> option)) return false;
src/main/java/io/github/skippyall/minions/minion/MinionItem.java
+7 -7
View File
@@ -1,13 +1,14 @@
package io.github.skippyall.minions.minion;
import eu.pb4.polymer.core.api.item.PolymerItem;
import eu.pb4.polymer.core.api.item.PolymerItemUtils;
import io.github.skippyall.minions.gui.MinionLookGui;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.registration.MinionComponentTypes;
import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
import net.minecraft.core.HolderLookup;
import net.minecraft.core.component.DataComponents;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
@@ -23,7 +24,6 @@ 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 xyz.nucleoid.packettweaker.PacketContext;
import java.util.function.Consumer;
@@ -33,7 +33,7 @@ public class MinionItem extends Item implements PolymerItem {
}
@Override
public @Nullable ResourceLocation getPolymerItemModel(ItemStack stack, PacketContext context) {
public @Nullable Identifier getPolymerItemModel(ItemStack stack, PacketContext context, HolderLookup.Provider lookup) {
return null;
}
@@ -43,8 +43,8 @@ public class MinionItem extends Item implements PolymerItem {
}
@Override
public ItemStack getPolymerItemStack(ItemStack stack, TooltipFlag tooltipType, PacketContext player) {
ItemStack out = PolymerItemUtils.createItemStack(stack, tooltipType, player);
public ItemStack getPolymerItemStack(ItemStack stack, TooltipFlag tooltipType, PacketContext player, HolderLookup.Provider lookup) {
ItemStack out = PolymerItem.super.getPolymerItemStack(stack, tooltipType, player, lookup);
out.set(DataComponents.ENCHANTMENT_GLINT_OVERRIDE, true);
return out;
}
@@ -70,7 +70,7 @@ public class MinionItem extends Item implements PolymerItem {
@Override
public InteractionResult useOn(UseOnContext context) {
if(!context.getLevel().isClientSide) {
if(!context.getLevel().isClientSide()) {
MinionData data = getDataOrDefault(context.getLevel().getServer(), context.getItemInHand());
MinionFakePlayer.spawnMinion(data, (ServerLevel) context.getLevel(), context.getClickedPos().getCenter().add(0,0.5,0), new Vec2(0, 0));
}
src/main/java/io/github/skippyall/minions/minion/MinionPersistentState.java
+8 -1
View File
@@ -1,6 +1,8 @@
package io.github.skippyall.minions.minion;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.Minions;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.saveddata.SavedData;
@@ -14,7 +16,12 @@ import java.util.UUID;
public class MinionPersistentState extends SavedData {
public static final Codec<MinionPersistentState> CODEC = MinionData.CODEC.listOf().xmap(MinionPersistentState::new, MinionPersistentState::getMinionDataList);
public static SavedDataType<MinionPersistentState> TYPE = new SavedDataType<>("minion", MinionPersistentState::new, MinionPersistentState.CODEC, null);
public static SavedDataType<MinionPersistentState> TYPE = new SavedDataType<>(
Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion"),
MinionPersistentState::new,
MinionPersistentState.CODEC,
null
);
private final Map<UUID, MinionData> minionData = new HashMap<>();
src/main/java/io/github/skippyall/minions/minion/MinionProfileUtils.java
+1 -4
View File
@@ -22,10 +22,7 @@ public class MinionProfileUtils {
uuidMinion = UUID.randomUUID();
}
GameProfile newProfile = new GameProfile(uuidMinion, username);
if (skin != null) {
newProfile.getProperties().putAll(skin);
}
GameProfile newProfile = new GameProfile(uuidMinion, username, skin != null ? skin : PropertyMap.EMPTY);
LOGGER.info("Minion Profile: {}", newProfile);
return newProfile;
}
src/main/java/io/github/skippyall/minions/minion/MinionRuntime.java
+6 -5
View File
@@ -8,13 +8,14 @@ import io.github.skippyall.minions.program.instruction.ConfiguredInstruction;
import io.github.skippyall.minions.program.instruction.InstructionType;
import io.github.skippyall.minions.program.supplier.ValueSupplierType;
import io.github.skippyall.minions.registration.MinionRegistries;
import net.minecraft.core.Registry;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
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> {
private final MinionFakePlayer minion;
@@ -115,7 +116,7 @@ public class MinionRuntime implements InstructionRuntime<MinionRuntime> {
for (ValueInput inner : list) {
Optional<String> name = inner.getString("name");
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().name());
continue;
}
@@ -123,7 +124,7 @@ public class MinionRuntime implements InstructionRuntime<MinionRuntime> {
ConfiguredInstruction<MinionRuntime> instruction = ConfiguredInstruction.load(inner, this);
configuredInstructions.put(name.get(), instruction);
} catch (Exception e) {
Minions.LOGGER.error("Could not deserialize configured instruction \"{}\" of minion \"{}\":", name.get(), minion.getGameProfile().getName(), e);
Minions.LOGGER.error("Could not deserialize configured instruction \"{}\" of minion \"{}\":", name.get(), minion.getGameProfile().name(), e);
}
}
}
src/main/java/io/github/skippyall/minions/minion/fakeplayer/EntityPlayerActionPack.java
+13 -11
View File
@@ -3,10 +3,6 @@ package io.github.skippyall.minions.minion.fakeplayer;
import io.github.skippyall.minions.mixins.EntityAccessor;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.commands.arguments.EntityAnchorArgument;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
@@ -18,11 +14,11 @@ 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.animal.equine.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.entity.vehicle.boat.Boat;
import net.minecraft.world.entity.vehicle.minecart.Minecart;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.BlockHitResult;
@@ -31,6 +27,11 @@ import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec2;
import net.minecraft.world.phys.Vec3;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class EntityPlayerActionPack
{
private final MinionFakePlayer player;
@@ -215,7 +216,7 @@ public class EntityPlayerActionPack
if (closest instanceof AbstractHorse && onlyRideables)
((AbstractHorse) closest).mobInteract(player, InteractionHand.MAIN_HAND);
else
player.startRiding(closest, !onlyRideables);
player.startRiding(closest, !onlyRideables, true);
return this;
}
public EntityPlayerActionPack dismount()
@@ -352,13 +353,13 @@ public class EntityPlayerActionPack
boolean handWasEmpty = player.getItemInHand(hand).isEmpty();
boolean itemFrameEmpty = (entity instanceof ItemFrame) && ((ItemFrame) entity).getItem().isEmpty();
Vec3 relativeHitPos = entityHit.getLocation().subtract(entity.getX(), entity.getY(), entity.getZ());
if (entity.interactAt(player, relativeHitPos, hand).consumesAction())
if (entity.interact(player, hand, relativeHitPos).consumesAction())
{
ap.itemUseCooldown = 3;
return true;
}
// fix for SS itemframe always returns CONSUME even if no action is performed
if (player.interactOn(entity, hand).consumesAction() && !(handWasEmpty && itemFrameEmpty))
if (player.interactOn(entity, hand, relativeHitPos).consumesAction() && !(handWasEmpty && itemFrameEmpty))
{
ap.itemUseCooldown = 3;
return true;
@@ -485,7 +486,8 @@ public class EntityPlayerActionPack
{
if (action.limit == 1)
{
if (player.onGround()) player.jumpFromGround(); // onGround
if (player.onGround()) player.jumpFromGround();
else if (!player.onClimbable()) player.tryToStartFallFlying();
}
else
{
src/main/java/io/github/skippyall/minions/minion/fakeplayer/FakeClientConnection.java
+8
View File
@@ -1,11 +1,14 @@
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import io.netty.channel.ChannelFutureListener;
import io.netty.channel.embedded.EmbeddedChannel;
import net.minecraft.network.Connection;
import net.minecraft.network.PacketListener;
import net.minecraft.network.ProtocolInfo;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.PacketFlow;
import org.jspecify.annotations.Nullable;
public class FakeClientConnection extends Connection {
public FakeClientConnection(PacketFlow p)
@@ -16,6 +19,11 @@ public class FakeClientConnection extends Connection {
((ClientConnectionInterface)this).setChannel(new EmbeddedChannel());
}
@Override
public void send(Packet<?> packet, @Nullable ChannelFutureListener listener, boolean flush) {
}
@Override
public void setReadOnly()
{
src/main/java/io/github/skippyall/minions/minion/fakeplayer/MinionFakePlayer.java
+37 -10
View File
@@ -3,6 +3,7 @@ package io.github.skippyall.minions.minion.fakeplayer;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.gui.minion.MinionGui;
import io.github.skippyall.minions.listener.SerializableListenerManager;
import io.github.skippyall.minions.minion.MinionData;
@@ -15,6 +16,7 @@ import io.github.skippyall.minions.module.ModuleInventory;
import io.github.skippyall.minions.registration.MinionConfigOptions;
import io.github.skippyall.minions.registration.MinionItems;
import io.github.skippyall.minions.registration.SpecialAbilities;
import net.fabricmc.fabric.impl.networking.context.PacketContextImpl;
import net.minecraft.core.BlockPos;
import net.minecraft.network.DisconnectionDetails;
import net.minecraft.network.chat.Component;
@@ -29,6 +31,7 @@ import net.minecraft.server.level.ClientInformation;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.util.ProblemReporter;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.damagesource.DamageSource;
@@ -37,18 +40,20 @@ import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.entity.item.ItemEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.vehicle.AbstractBoat;
import net.minecraft.world.entity.vehicle.boat.AbstractBoat;
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.TagValueInput;
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 java.util.Optional;
import java.util.Set;
import java.util.function.Consumer;
@@ -82,7 +87,17 @@ public class MinionFakePlayer extends ServerPlayer {
if(pos != null && rot != null) {
instance.fixStartingPosition = () -> instance.snapTo(pos.x, pos.y, pos.z, rot.x, rot.y);
}
server.getPlayerList().placeNewPlayer(new FakeClientConnection(PacketFlow.SERVERBOUND), instance, new CommonListenerCookie(profile, 0, instance.clientInformation(), false));
FakeClientConnection connection = new FakeClientConnection(PacketFlow.SERVERBOUND);
//noinspection UnstableApiUsage
connection.getPacketContext().set(PacketContextImpl.REGISTRY_ACCESS, server.registryAccess());
//noinspection UnstableApiUsage
connection.getPacketContext().set(PacketContextImpl.SERVER_INSTANCE, server);
//noinspection UnstableApiUsage
connection.getPacketContext().set(PacketContextImpl.GAME_PROFILE, profile);
server.getPlayerList().placeNewPlayer(connection, instance, new CommonListenerCookie(profile, 0, instance.clientInformation(), false));
loadPlayerData(instance);
instance.stopRiding(); // otherwise the created fake player will be on the vehicle
System.out.println(instance.position());
if(pos != null && rot != null) {
instance.teleportTo(level, pos.x, pos.y, pos.z, Set.of(), rot.x, rot.y, true);
@@ -102,6 +117,19 @@ public class MinionFakePlayer extends ServerPlayer {
instance.listeners().forEach(listener -> listener.onMinionSpawn(instance));
}
private static void loadPlayerData(MinionFakePlayer player)
{
try (ProblemReporter.ScopedCollector scopedCollector = new ProblemReporter.ScopedCollector(player.problemPath(), Minions.LOGGER))
{
Optional<ValueInput> optional = player.level().getServer().getPlayerList().loadPlayerData(player.nameAndId()).map((compoundTag) -> TagValueInput.create(scopedCollector, player.registryAccess(), compoundTag));
optional.ifPresent( valueInput -> {
player.load(valueInput);
player.loadAndSpawnEnderPearls(valueInput);
player.loadAndSpawnParentVehicle(valueInput);
});
}
}
public static MinionFakePlayer respawnFake(MinecraftServer server, ServerLevel level, GameProfile profile, ClientInformation cli)
{
return new MinionFakePlayer(server, level, profile, cli);
@@ -153,19 +181,18 @@ public class MinionFakePlayer extends ServerPlayer {
return canSpawnMobs();
}
public MinecraftServer getServer() {
return level().getServer();
}
@Override
public InteractionResult interact(Player player, InteractionHand hand) {
public InteractionResult interact(Player player, InteractionHand hand, Vec3 location) {
if(player instanceof ServerPlayer spe) {
new MinionGui(spe, this);
}
return InteractionResult.CONSUME;
}
@Override
public InteractionResult interactAt(Player player, Vec3 hitPos, InteractionHand hand) {
return interact(player, hand);
}
@Override
public void onEquipItem(final EquipmentSlot slot, final ItemStack previous, final ItemStack stack)
{
@@ -213,8 +240,8 @@ public class MinionFakePlayer extends ServerPlayer {
}
@Override
public boolean startRiding(Entity entityToRide, boolean force) {
if (super.startRiding(entityToRide, force)) {
public boolean startRiding(Entity entityToRide, boolean force, boolean sendEventAndTriggers) {
if (super.startRiding(entityToRide, force, sendEventAndTriggers)) {
// from ClientPacketListener.handleSetEntityPassengersPacket
if (entityToRide instanceof AbstractBoat) {
this.yRotO = entityToRide.getYRot();
src/main/java/io/github/skippyall/minions/minion/fakeplayer/NetHandlerPlayServerFake.java
+1 -6
View File
@@ -4,13 +4,13 @@ package io.github.skippyall.minions.minion.fakeplayer;
import net.minecraft.network.Connection;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.contents.TranslatableContents;
import net.minecraft.network.protocol.Packet;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.world.entity.PositionMoveRotation;
import net.minecraft.world.entity.Relative;
import java.util.Set;
public class NetHandlerPlayServerFake extends ServerGamePacketListenerImpl
@@ -20,11 +20,6 @@ public class NetHandlerPlayServerFake extends ServerGamePacketListenerImpl
super(minecraftServer, connection, serverPlayer, i);
}
@Override
public void send(final Packet<?> packetIn)
{
}
@Override
public void disconnect(Component message)
{
src/main/java/io/github/skippyall/minions/minion/fakeplayer/Tracer.java
+3 -2
View File
@@ -1,8 +1,6 @@
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.minion.fakeplayer;
import java.util.Optional;
import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.ClipContext;
import net.minecraft.world.level.Level;
@@ -12,6 +10,9 @@ import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import java.util.Optional;
import java.util.function.Predicate;
public class Tracer
{
public static HitResult rayTrace(Entity source, float partialTicks, double reach, boolean fluids)
src/main/java/io/github/skippyall/minions/minion/program/instruction/inventory/SwapItemExecution.java
+2 -2
View File
@@ -8,7 +8,7 @@ import io.github.skippyall.minions.program.supplier.Parameter;
import io.github.skippyall.minions.program.supplier.ParameterValueList;
import io.github.skippyall.minions.registration.ValueTypes;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.ClickType;
import net.minecraft.world.inventory.ContainerInput;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.storage.ValueInput;
@@ -93,7 +93,7 @@ public class SwapItemExecution implements InstructionExecution<MinionRuntime> {
AbstractContainerMenu screenHandler = getScreen(minion, screen);
ItemStack previousCursor = screenHandler.getCarried();
screenHandler.setCarried(cursor);
screenHandler.clicked(slotIndex, 0, ClickType.SWAP, minion);
screenHandler.clicked(slotIndex, 0, ContainerInput.SWAP, minion);
cursor = screenHandler.getCarried();
screenHandler.setCarried(previousCursor);
}
src/main/java/io/github/skippyall/minions/minion/program/instruction/move/TurnDirection.java
+2 -1
View File
@@ -3,9 +3,10 @@ package io.github.skippyall.minions.minion.program.instruction.move;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.gui.Displayable;
import io.github.skippyall.minions.gui.GuiDisplay;
import java.util.UUID;
import net.minecraft.util.StringRepresentable;
import java.util.UUID;
public enum TurnDirection implements StringRepresentable, Displayable {
LEFT("left", -1, 0),
UP("up", 0, -1),
src/main/java/io/github/skippyall/minions/minion/program/supplier/AnalogInputSupplier.java
+5 -5
View File
@@ -16,15 +16,15 @@ import io.github.skippyall.minions.registration.MinionComponentTypes;
import io.github.skippyall.minions.registration.MinionItems;
import io.github.skippyall.minions.registration.ValueSuppliers;
import io.github.skippyall.minions.registration.ValueTypes;
import org.jetbrains.annotations.Nullable;
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;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> {
public static final Codec<AnalogInputSupplier> CODEC = RecordCodecBuilder.create(instance ->
@@ -63,7 +63,7 @@ public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> {
@Override
public Component getDisplayText() {
return Component.translatable("value_supplier.minions.analog_input.display", analogInputPos.toShortString(), analogInputWorld.location().toString());
return Component.translatable("value_supplier.minions.analog_input.display", analogInputPos.toShortString(), analogInputWorld.identifier().toString());
}
public static class AnalogInputSupplierType extends ValueSupplierType<MinionRuntime> {
@@ -81,7 +81,7 @@ public class AnalogInputSupplier implements ValueSupplier<Long, MinionRuntime> {
new SimpleMinionsGui(parent, (onClose, me) -> {
SimpleGui gui = new SimpleGui(MenuType.GENERIC_3x3, parent.getViewer(), false) {
@Override
public void onClose() {
public void onPlayerClose(boolean success) {
onClose.run();
}
};
src/main/java/io/github/skippyall/minions/minion/skin/Base64SkinProvider.java
+20 -14
View File
@@ -1,20 +1,18 @@
package io.github.skippyall.minions.minion.skin;
import com.google.common.collect.ImmutableMultimap;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.Minions;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import net.fabricmc.fabric.api.entity.FakePlayer;
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.Identifier;
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;
@@ -25,19 +23,26 @@ 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;
import net.minecraft.world.item.component.ResolvableProfile;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
public class Base64SkinProvider implements SkinProvider {
public static final ResourceKey<Dialog> DIALOG = ResourceKey.create(Registries.DIALOG, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "base_64_input"));
public static final ResourceLocation CUSTOM_DIALOG_ACTION = ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "base_64_submit");
public static final ResourceKey<Dialog> DIALOG = ResourceKey.create(Registries.DIALOG, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "base_64_input"));
public static final Identifier CUSTOM_DIALOG_ACTION = Identifier.fromNamespaceAndPath(Minions.MOD_ID, "base_64_submit");
private static long dialogIdCounter = 0;
private static Map<Long, CompletableFuture<Optional<PropertyMap>>> futures = new HashMap<>();
private static Map<Long, CompletableFuture<ResolvableProfile>> futures = new HashMap<>();
@Override
public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player) {
public CompletableFuture<ResolvableProfile> openSkinMenu(ServerPlayer player) {
dialogIdCounter++;
player.openDialog(getDialog());
CompletableFuture<Optional<PropertyMap>> future = new CompletableFuture<>();
CompletableFuture<ResolvableProfile> future = new CompletableFuture<>();
futures.put(dialogIdCounter, future);
return future;
}
@@ -48,10 +53,11 @@ public class Base64SkinProvider implements SkinProvider {
Optional<String> base64 = compound.getString("base_64");
if(id.isPresent() && base64.isPresent() && !base64.get().isBlank()) {
if(futures.containsKey(id.get())) {
PropertyMap map = new PropertyMap();
map.put("textures", new Property("textures", base64.get().strip()));
PropertyMap map = new PropertyMap(ImmutableMultimap.of(
"textures", new Property("textures", base64.get().strip())
));
futures.get(id.get()).complete(Optional.of(map));
futures.get(id.get()).complete(ResolvableProfile.createResolved(new GameProfile(FakePlayer.DEFAULT_UUID, "", map)));
futures.remove(id.get());
}
}
src/main/java/io/github/skippyall/minions/minion/skin/NameSkinProvider.java
+5 -8
View File
@@ -1,20 +1,17 @@
package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.gui.input.TextInput;
import java.util.Optional;
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;
import net.minecraft.world.item.component.ResolvableProfile;
import java.util.concurrent.CompletableFuture;
public class NameSkinProvider implements SkinProvider {
@Override
public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player) {
public CompletableFuture<ResolvableProfile> openSkinMenu(ServerPlayer player) {
return TextInput.inputString(player, Component.translatable("minions.gui.look.skin.name.title"), "")
.thenCompose(SkullBlockEntity::fetchGameProfile)
.thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties));
.thenApply(ResolvableProfile::createUnresolved);
}
@Override
src/main/java/io/github/skippyall/minions/minion/skin/SkinProvider.java
+4 -4
View File
@@ -1,13 +1,13 @@
package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.properties.PropertyMap;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.item.component.ResolvableProfile;
import java.util.concurrent.CompletableFuture;
public interface SkinProvider {
CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player);
CompletableFuture<ResolvableProfile> openSkinMenu(ServerPlayer player);
Component getDisplayName();
}
src/main/java/io/github/skippyall/minions/minion/skin/UUIDSkinProvider.java
+5 -9
View File
@@ -1,21 +1,17 @@
package io.github.skippyall.minions.minion.skin;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.PropertyMap;
import io.github.skippyall.minions.gui.input.TextInput;
import java.util.Optional;
import java.util.UUID;
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;
import net.minecraft.world.item.component.ResolvableProfile;
import java.util.concurrent.CompletableFuture;
public class UUIDSkinProvider implements SkinProvider {
@Override
public CompletableFuture<Optional<PropertyMap>> openSkinMenu(ServerPlayer player) {
public CompletableFuture<ResolvableProfile> openSkinMenu(ServerPlayer player) {
return TextInput.inputString(player, Component.translatable("minions.gui.look.skin.uuid.title"), "")
.thenCompose(uuidString -> SkullBlockEntity.fetchGameProfile(UUID.fromString(uuidString)))
.thenApply(gameProfile -> gameProfile.map(GameProfile::getProperties));
.thenApply(ResolvableProfile::createUnresolved);
}
@Override
src/main/java/io/github/skippyall/minions/mixinhelper/EntityViewMixinHelper.java
+2 -1
View File
@@ -1,8 +1,9 @@
package io.github.skippyall.minions.mixinhelper;
import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
import java.util.function.Predicate;
public class EntityViewMixinHelper {
public static final ThreadLocal<Predicate<Entity>> ADDITIONAL_PREDICATE = ThreadLocal.withInitial(() -> entity -> true);
}
src/main/java/io/github/skippyall/minions/mixins/EntityAccessor.java
+2 -2
View File
@@ -1,10 +1,10 @@
package io.github.skippyall.minions.mixins;
import net.minecraft.world.entity.Entity;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
import java.util.stream.Stream;
import net.minecraft.world.entity.Entity;
@Mixin(Entity.class)
public interface EntityAccessor {
@@ -12,5 +12,5 @@ public interface EntityAccessor {
boolean minions$canAddPassenger(Entity other);
@Invoker("getIndirectPassengersStream")
Stream<Entity> minions$streamIntoPassengers();
Stream<Entity> minions$getIndirectPassengersStream();
}
src/main/java/io/github/skippyall/minions/mixins/EntityGetterMixin.java
+2 -2
View File
@@ -1,14 +1,14 @@
package io.github.skippyall.minions.mixins;
import io.github.skippyall.minions.mixinhelper.EntityViewMixinHelper;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.EntityGetter;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.ModifyArg;
import java.util.function.Predicate;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.level.EntityGetter;
@Mixin(EntityGetter.class)
public interface EntityGetterMixin {
src/main/java/io/github/skippyall/minions/mixins/EntityMixin.java
+1 -1
View File
@@ -22,6 +22,6 @@ public abstract class EntityMixin {
@Inject(method = "isLocalInstanceAuthoritative", at = @At("HEAD"), cancellable = true)
private void isFakePlayer(CallbackInfoReturnable<Boolean> cir)
{
if (getControllingPassenger() instanceof MinionFakePlayer) cir.setReturnValue(!level.isClientSide);
if (getControllingPassenger() instanceof MinionFakePlayer) cir.setReturnValue(!level.isClientSide());
}
}
src/main/java/io/github/skippyall/minions/mixins/MinecraftServerMixin.java
+2 -2
View File
@@ -5,7 +5,7 @@ import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.minion.skin.Base64SkinProvider;
import io.github.skippyall.minions.registration.MinionConfigOptions;
import net.minecraft.nbt.Tag;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.server.MinecraftServer;
import net.minecraft.server.level.ServerPlayer;
import org.spongepowered.asm.mixin.Mixin;
@@ -29,7 +29,7 @@ public class MinecraftServerMixin {
}
@Inject(method = "handleCustomClickAction", at = @At("HEAD"), cancellable = true)
private void onCustomClickAction(ResourceLocation id, Optional<Tag> payload, CallbackInfo ci) {
private void onCustomClickAction(Identifier id, Optional<Tag> payload, CallbackInfo ci) {
if(id.equals(Base64SkinProvider.CUSTOM_DIALOG_ACTION)) {
Base64SkinProvider.onCustomDialogAction(payload);
ci.cancel();
src/main/java/io/github/skippyall/minions/mixins/PlayerListMixin.java
+3 -6
View File
@@ -18,23 +18,20 @@ import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.network.CommonListenerCookie;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import net.minecraft.server.players.PlayerList;
import net.minecraft.util.ProblemReporter;
import net.minecraft.world.level.storage.ValueInput;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
@Mixin(PlayerList.class)
public class PlayerListMixin {
@Inject(method = "load", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
private void fixStartingPos(ServerPlayer player, ProblemReporter errorReporter, CallbackInfoReturnable<Optional<ValueInput>> cir)
@Inject(method = "placeNewPlayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;level()Lnet/minecraft/server/level/ServerLevel;"))
private void fixStartingPos(Connection connection, ServerPlayer player, CommonListenerCookie cookie, CallbackInfo ci)
{
if (player instanceof MinionFakePlayer)
{
src/main/java/io/github/skippyall/minions/mixins/PlayerMixin.java
+1 -1
View File
@@ -16,7 +16,7 @@ public abstract class PlayerMixin {
* To make sure player attacks are able to knockback fake players
*/
@ModifyExpressionValue(
method = "attack",
method = "causeExtraKnockback",
at = @At(
value = "FIELD",
target = "Lnet/minecraft/world/entity/Entity;hurtMarked:Z",
src/main/java/io/github/skippyall/minions/mixins/TickRateManagerMixin.java
+2 -1
View File
@@ -1,3 +1,4 @@
//code from https://github.com/gnembon/fabric-carpet
package io.github.skippyall.minions.mixins;
import com.llamalad7.mixinextras.injector.ModifyReturnValue;
@@ -22,7 +23,7 @@ public abstract class TickRateManagerMixin {
return !isActualPlayer(entity) && // not carrying players
((EntityAccessor) entity)
.minions$streamIntoPassengers()
.minions$getIndirectPassengersStream()
.noneMatch(TickRateManagerMixin::isActualPlayer);
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/DistanceManager$FixedPlayerDistanceChunkTrackerMixin.java
+5 -5
View File
@@ -18,9 +18,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(value = DistanceManager.FixedPlayerDistanceChunkTracker.class)
public abstract class DistanceManager$FixedPlayerDistanceChunkTrackerMixin extends ChunkTrackerMixin implements ChunkLevelManager$DistanceFromNearestPlayerTrackerAccessor {
@Final
@Shadow
DistanceManager field_17462;
@Final
DistanceManager this$0;
@Shadow
@Final
@@ -40,7 +40,7 @@ public abstract class DistanceManager$FixedPlayerDistanceChunkTrackerMixin exten
@Override
public boolean minions$isRealPlayerInChunk(long chunkPos) {
ObjectSet<ServerPlayer> players = ((ChunkLevelManagerAccessor)field_17462).minions$getPlayers(chunkPos);
ObjectSet<ServerPlayer> players = ((ChunkLevelManagerAccessor)this$0).minions$getPlayers(chunkPos);
boolean contains = false;
if(players != null) {
contains = players.stream().anyMatch(player -> {
@@ -56,14 +56,14 @@ public abstract class DistanceManager$FixedPlayerDistanceChunkTrackerMixin exten
@Inject(method = "runAllUpdates", at = @At("HEAD"))
public void minions$sync(CallbackInfo info) {
if (minions$target) {
((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().runAllUpdates();
((ChunkLevelManagerAccessor)this$0).minions$getMinionless().runAllUpdates();
}
}
@Override
public void minions$updateLevel(long chunkPos, int distance, boolean decrease, CallbackInfo info) {
if (minions$target && (distance == Integer.MAX_VALUE || minions$isRealPlayerInChunk(chunkPos))) {
((ChunkLevelManagerAccessor)field_17462).minions$getMinionless().update(chunkPos, distance, decrease);
((ChunkLevelManagerAccessor)this$0).minions$getMinionless().update(chunkPos, distance, decrease);
}
}
src/main/java/io/github/skippyall/minions/mixins/antimobcap/DistanceManagerMixin.java
+4 -4
View File
@@ -5,6 +5,10 @@ import io.github.skippyall.minions.mixinhelper.antimobcap.ChunkLevelManager$Dist
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.core.SectionPos;
import net.minecraft.server.level.DistanceManager;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.level.TicketStorage;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
@@ -14,10 +18,6 @@ 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 {
src/main/java/io/github/skippyall/minions/mixins/compat/universal_graves/GraveMixin.java
+1 -1
View File
@@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.ModifyArg;
@Mixin(Grave.class)
public class GraveMixin {
@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"))
@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/Identifier;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) ServerPlayer player) {
if(player instanceof MinionFakePlayer) {
return false;
src/main/java/io/github/skippyall/minions/module/ModuleInventory.java
+4 -3
View File
@@ -4,9 +4,6 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.minion.fakeplayer.MinionFakePlayer;
import io.github.skippyall.minions.program.instruction.InstructionType;
import io.github.skippyall.minions.registration.MinionComponentTypes;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import net.minecraft.network.chat.Component;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.ContainerHelper;
@@ -16,6 +13,10 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
public class ModuleInventory extends SimpleContainer {
private final Set<MinionModule> modules = new HashSet<>();
private final Set<InstructionType<MinionRuntime>> instructions = new HashSet<>();
src/main/java/io/github/skippyall/minions/polymer/VersionSync.java
+6 -6
View File
@@ -3,18 +3,18 @@ package io.github.skippyall.minions.polymer;
import eu.pb4.polymer.networking.api.PolymerNetworking;
import eu.pb4.polymer.networking.api.server.PolymerServerNetworking;
import io.github.skippyall.minions.Minions;
import net.fabricmc.fabric.api.networking.v1.context.PacketContext;
import net.minecraft.network.codec.StreamCodec;
import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.server.network.ServerGamePacketListenerImpl;
import xyz.nucleoid.packettweaker.PacketContext;
public class VersionSync {
public static final int NETWORK_VERSION = 1;
public static boolean isOnClient(PacketContext context) {
if(context.getPlayer() != null) {
return isOnClient(context.getPlayer().connection);
if(context != null && context.get(PacketContext.CONNECTION).getPacketListener() instanceof ServerGamePacketListenerImpl gamePacketListener) {
return isOnClient(gamePacketListener);
}
return false;
}
@@ -25,7 +25,7 @@ public class VersionSync {
public static class VersionSyncPayload implements CustomPacketPayload {
public static final CustomPacketPayload.Type<VersionSyncPayload> PACKET_ID = new CustomPacketPayload.Type<>(ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "version_sync"));
public static final CustomPacketPayload.Type<VersionSyncPayload> PACKET_ID = new CustomPacketPayload.Type<>(Identifier.fromNamespaceAndPath(Minions.MOD_ID, "version_sync"));
@Override
public Type<? extends CustomPacketPayload> type() {
@@ -34,6 +34,6 @@ public class VersionSync {
}
public static void register() {
PolymerNetworking.registerS2CVersioned(VersionSyncPayload.PACKET_ID, NETWORK_VERSION, StreamCodec.unit(null));
PolymerNetworking.registerClientboundVersioned(VersionSyncPayload.PACKET_ID, NETWORK_VERSION, StreamCodec.unit(null));
}
}
src/main/java/io/github/skippyall/minions/program/consumer/ValueConsumerType.java
+1 -1
View File
@@ -3,10 +3,10 @@ package io.github.skippyall.minions.program.consumer;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.program.InstructionRuntime;
import io.github.skippyall.minions.program.value.ValueType;
import net.minecraft.server.level.ServerPlayer;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
import net.minecraft.server.level.ServerPlayer;
public abstract class ValueConsumerType<R extends InstructionRuntime<R>> {
public abstract <T> Codec<? extends ValueConsumer<T,R>> getCodec(ValueType<T> type);
src/main/java/io/github/skippyall/minions/program/conversion/CastConverter.java
+1 -1
View File
@@ -9,10 +9,10 @@ import io.github.skippyall.minions.program.value.ValueType;
import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.registration.ValueConverters;
import io.github.skippyall.minions.util.TranslationUtil;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
public class CastConverter<F,T> implements ValueConverter<F,T> {
private static final MapCodec<CastConverter<?,?>> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
src/main/java/io/github/skippyall/minions/program/conversion/ConverterList.java
+1 -1
View File
@@ -4,13 +4,13 @@ import com.mojang.serialization.Codec;
import io.github.skippyall.minions.gui.input.Result;
import io.github.skippyall.minions.program.value.TypedValue;
import io.github.skippyall.minions.program.value.ValueType;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
import java.util.Objects;
import net.minecraft.network.chat.Component;
public class ConverterList {
public static final Codec<ConverterList> CODEC = ValueConverter.CODEC.listOf().xmap(ConverterList::new, l -> l.converters);
src/main/java/io/github/skippyall/minions/program/conversion/EqualityConverter.java
+1 -1
View File
@@ -7,10 +7,10 @@ import io.github.skippyall.minions.program.value.ValueType;
import io.github.skippyall.minions.registration.MinionRegistries;
import io.github.skippyall.minions.registration.ValueConverters;
import io.github.skippyall.minions.registration.ValueTypes;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
public class EqualityConverter<F> implements ValueConverter<F, Boolean> {
public static final MapCodec<EqualityConverter<?>> CODEC = MinionRegistries.VALUE_TYPES.byNameCodec().dispatchMap(
src/main/java/io/github/skippyall/minions/program/instruction/InstructionExecution.java
-1
View File
@@ -3,7 +3,6 @@ package io.github.skippyall.minions.program.instruction;
import io.github.skippyall.minions.program.InstructionRuntime;
import io.github.skippyall.minions.program.consumer.ValueConsumerList;
import io.github.skippyall.minions.program.supplier.ParameterValueList;
import io.github.skippyall.minions.program.supplier.ValueSupplierList;
import net.minecraft.world.level.storage.ValueInput;
import net.minecraft.world.level.storage.ValueOutput;
src/main/java/io/github/skippyall/minions/program/instruction/InstructionType.java
+2 -1
View File
@@ -3,10 +3,11 @@ package io.github.skippyall.minions.program.instruction;
import io.github.skippyall.minions.program.InstructionRuntime;
import io.github.skippyall.minions.program.supplier.Parameter;
import io.github.skippyall.minions.program.supplier.ParameterValueList;
import net.minecraft.world.level.storage.ValueInput;
import java.util.Collection;
import java.util.List;
import java.util.function.Supplier;
import net.minecraft.world.level.storage.ValueInput;
/**
* Defines the semantics of an instruction and creates {@link InstructionExecution}
src/main/java/io/github/skippyall/minions/program/supplier/ValueSupplierList.java
+1 -1
View File
@@ -9,6 +9,7 @@ import io.github.skippyall.minions.program.conversion.Casts;
import io.github.skippyall.minions.program.conversion.ConverterList;
import io.github.skippyall.minions.program.instruction.InstructionType;
import io.github.skippyall.minions.program.value.TypedValue;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
@@ -17,7 +18,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import net.minecraft.network.chat.Component;
public class ValueSupplierList<R extends InstructionRuntime<R>> {
private final Map<Parameter<?>, ValueSupplierEntry<?,R>> arguments = new HashMap<>();
src/main/java/io/github/skippyall/minions/program/value/SimpleValueType.java
+2 -1
View File
@@ -2,10 +2,11 @@ package io.github.skippyall.minions.program.value;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.gui.MinionsGui;
import net.minecraft.network.chat.Component;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiFunction;
import java.util.function.Function;
import net.minecraft.network.chat.Component;
public record SimpleValueType<T>(Codec<T> codec, T defaultValue, Function<Object, T> checkedCast, BiFunction<MinionsGui, T, CompletableFuture<T>> valueDialogOpener, Function<T, Component> textDisplay) implements ValueType<T> {
@Override
src/main/java/io/github/skippyall/minions/program/value/ValueType.java
+1 -1
View File
@@ -2,10 +2,10 @@ package io.github.skippyall.minions.program.value;
import com.mojang.serialization.Codec;
import io.github.skippyall.minions.gui.MinionsGui;
import net.minecraft.network.chat.Component;
import org.jetbrains.annotations.Nullable;
import java.util.concurrent.CompletableFuture;
import net.minecraft.network.chat.Component;
public interface ValueType<T> {
CompletableFuture<T> openValueDialog(MinionsGui gui, T previousValue);
src/main/java/io/github/skippyall/minions/registration/ClipboardTypes.java
+2 -2
View File
@@ -6,11 +6,11 @@ import io.github.skippyall.minions.clipboard.BlockPosClipboard;
import io.github.skippyall.minions.clipboard.Clipboard;
import io.github.skippyall.minions.clipboard.InstructionClipboard;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class ClipboardTypes {
private static void register(String id, MapCodec<? extends Clipboard> codec) {
Registry.register(MinionRegistries.CLIPBOARD_TYPES, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, id), codec);
Registry.register(MinionRegistries.CLIPBOARD_TYPES, Identifier.fromNamespaceAndPath(Minions.MOD_ID, id), codec);
}
static void register() {
src/main/java/io/github/skippyall/minions/registration/DocsEntryTypes.java
+2 -2
View File
@@ -3,10 +3,10 @@ package io.github.skippyall.minions.registration;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.docs.ReferenceEntry;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class DocsEntryTypes {
public static void register() {
Registry.register(MinionRegistries.DOCS_ENTRY_TYPES, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "reference_entry"), ReferenceEntry.CODEC);
Registry.register(MinionRegistries.DOCS_ENTRY_TYPES, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "reference_entry"), ReferenceEntry.CODEC);
}
}
src/main/java/io/github/skippyall/minions/registration/GuiDisplayTypes.java
+5 -5
View File
@@ -3,13 +3,13 @@ package io.github.skippyall.minions.registration;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.gui.GuiDisplay;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class GuiDisplayTypes {
static void register() {
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "item"), GuiDisplay.ItemBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "model"), GuiDisplay.ModelBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "head"), GuiDisplay.HeadBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "stack"), GuiDisplay.StackBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "item"), GuiDisplay.ItemBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "model"), GuiDisplay.ModelBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "head"), GuiDisplay.HeadBased.CODEC);
Registry.register(MinionRegistries.GUI_DISPLAY_TYPE, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "stack"), GuiDisplay.StackBased.CODEC);
}
}
src/main/java/io/github/skippyall/minions/registration/Instructions.java
+4 -3
View File
@@ -13,11 +13,12 @@ import io.github.skippyall.minions.minion.program.instruction.move.WalkExecution
import io.github.skippyall.minions.program.instruction.InstructionExecution;
import io.github.skippyall.minions.program.instruction.InstructionType;
import io.github.skippyall.minions.program.supplier.Parameter;
import net.minecraft.core.Registry;
import net.minecraft.resources.Identifier;
import java.util.Collection;
import java.util.List;
import java.util.function.Supplier;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
public class Instructions {
public static final InstructionType<MinionRuntime> WALK = register(
@@ -64,7 +65,7 @@ public class Instructions {
);
private static InstructionType<MinionRuntime> register(String id, Supplier<InstructionExecution<MinionRuntime>> factory, Collection<Parameter<?>> parameters, Collection<Parameter<?>> returnParameters) {
ResourceLocation identifier = ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, id);
Identifier identifier = Identifier.fromNamespaceAndPath(Minions.MOD_ID, id);
return Registry.register(MinionRegistries.INSTRUCTION_TYPES, identifier, new InstructionType<>(factory, parameters, returnParameters));
}
src/main/java/io/github/skippyall/minions/registration/MinionBlocks.java
+3 -3
View File
@@ -9,15 +9,15 @@ import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityT
import net.minecraft.core.Registry;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.PushReaction;
public class MinionBlocks {
public static final ResourceLocation MINION_TRIGGER_ID = ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger");
public static final Identifier MINION_TRIGGER_ID = Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger");
public static final MinionTriggerBlock MINION_TRIGGER_BLOCK = Registry.register(
BuiltInRegistries.BLOCK,
MINION_TRIGGER_ID,
@@ -36,7 +36,7 @@ public class MinionBlocks {
FabricBlockEntityTypeBuilder.create(MinionTriggerBlockEntity::new, MINION_TRIGGER_BLOCK).build()
);
public static final ResourceLocation ANALOG_INPUT_BLOCK_ID = ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "analog_input");
public static final Identifier ANALOG_INPUT_BLOCK_ID = Identifier.fromNamespaceAndPath(Minions.MOD_ID, "analog_input");
public static final AnalogInputBlock ANALOG_INPUT_BLOCK = Registry.register(
BuiltInRegistries.BLOCK,
ANALOG_INPUT_BLOCK_ID,
src/main/java/io/github/skippyall/minions/registration/MinionComponentTypes.java
+4 -4
View File
@@ -4,12 +4,12 @@ import eu.pb4.polymer.core.api.other.PolymerComponent;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.clipboard.Clipboard;
import io.github.skippyall.minions.module.MinionModule;
import net.fabricmc.fabric.api.item.v1.ComponentTooltipAppenderRegistry;
import net.fabricmc.fabric.api.item.v1.ItemComponentTooltipProviderRegistry;
import net.minecraft.core.Registry;
import net.minecraft.core.UUIDUtil;
import net.minecraft.core.component.DataComponentType;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import java.util.UUID;
public class MinionComponentTypes {
@@ -18,12 +18,12 @@ public class MinionComponentTypes {
public static final DataComponentType<Clipboard> REFERENCE = register("reference", DataComponentType.<Clipboard>builder().persistent(Clipboard.CODEC).build());
private static <T extends DataComponentType<?>> T register(String name, T type) {
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, name), type);
Registry.register(BuiltInRegistries.DATA_COMPONENT_TYPE, Identifier.fromNamespaceAndPath(Minions.MOD_ID, name), type);
PolymerComponent.registerDataComponent(type);
return type;
}
public static void register() {
ComponentTooltipAppenderRegistry.addFirst(MinionComponentTypes.REFERENCE);
ItemComponentTooltipProviderRegistry.addFirst(MinionComponentTypes.REFERENCE);
}
}
src/main/java/io/github/skippyall/minions/registration/MinionConfigOptions.java
+3 -3
View File
@@ -3,7 +3,7 @@ package io.github.skippyall.minions.registration;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.minion.MinionConfig;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import static io.github.skippyall.minions.minion.MinionConfig.booleanOption;
@@ -20,8 +20,8 @@ public class MinionConfigOptions {
return Registry.register(MinionRegistries.MINION_CONFIG_OPTIONS, option.key(), option);
}
private static ResourceLocation id(String name) {
return ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, name);
private static Identifier id(String name) {
return Identifier.fromNamespaceAndPath(Minions.MOD_ID, name);
}
public static void register() {}
src/main/java/io/github/skippyall/minions/registration/MinionCreativeTab.java
+11 -9
View File
@@ -1,35 +1,37 @@
package io.github.skippyall.minions.registration;
import eu.pb4.polymer.core.api.item.PolymerItemGroupUtils;
import eu.pb4.polymer.core.api.item.PolymerCreativeModeTabUtils;
import io.github.skippyall.minions.Minions;
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.fabricmc.fabric.api.creativetab.v1.FabricCreativeModeTab;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import java.util.ArrayList;
import java.util.List;
public class MinionCreativeTab {
public static CreativeModeTab group;
private static final List<ItemStack> items = new ArrayList<>();
private static final List<Item> items = new ArrayList<>();
public static void add(Item entry) {
items.add(entry.getDefaultInstance());
items.add(entry);
}
public static void collectEntries(CreativeModeTab.ItemDisplayParameters displayContext, CreativeModeTab.Output entries) {
entries.acceptAll(items);
for(Item item : items) {
entries.accept(item);
}
}
public static void registerGroup() {
group = FabricItemGroup.builder()
group = FabricCreativeModeTab.builder()
.title(Component.translatable("minions.generic.mod_name"))
.icon(MinionItems.MINION_ITEM::getDefaultInstance)
.displayItems(MinionCreativeTab::collectEntries)
.build();
PolymerItemGroupUtils.registerPolymerItemGroup(ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "main"), group);
PolymerCreativeModeTabUtils.registerPolymerCreativeModeTab(Identifier.fromNamespaceAndPath(Minions.MOD_ID, "main"), group);
}
}
src/main/java/io/github/skippyall/minions/registration/MinionItems.java
+18 -17
View File
@@ -9,60 +9,61 @@ import io.github.skippyall.minions.minion.MinionRuntime;
import io.github.skippyall.minions.module.MinionModule;
import io.github.skippyall.minions.module.SpecialAbility;
import io.github.skippyall.minions.program.instruction.InstructionType;
import java.util.List;
import java.util.function.Function;
import net.minecraft.core.Registry;
import net.minecraft.core.component.DataComponents;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.core.registries.Registries;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.damagesource.DamageType;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.component.DamageResistant;
import java.util.List;
import java.util.function.Function;
import static io.github.skippyall.minions.Minions.MOD_ID;
public class MinionItems {
public static final TagKey<DamageType> MINION_ITEM_RESISTS = TagKey.create(Registries.DAMAGE_TYPE, ResourceLocation.fromNamespaceAndPath(MOD_ID, "minion_item_resists"));
public static final TagKey<DamageType> MINION_ITEM_RESISTS = TagKey.create(Registries.DAMAGE_TYPE, Identifier.fromNamespaceAndPath(MOD_ID, "minion_item_resists"));
public static final MinionItem MINION_ITEM = registerItem(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "minion"),
settings -> new MinionItem(settings.component(DataComponents.DAMAGE_RESISTANT, new DamageResistant(MINION_ITEM_RESISTS)))
Identifier.fromNamespaceAndPath(MOD_ID, "minion"),
settings -> new MinionItem(settings.delayedComponent(DataComponents.DAMAGE_RESISTANT, context -> new DamageResistant(context.getOrThrow(MINION_ITEM_RESISTS))))
);
public static final SimplePolymerItem BASIC_UPGRADE_BASE = registerItem(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "basic_upgrade_base"),
Identifier.fromNamespaceAndPath(MOD_ID, "basic_upgrade_base"),
settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
);
public static final SimplePolymerItem ADVANCED_UPGRADE_BASE = registerItem(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "advanced_upgrade_base"),
Identifier.fromNamespaceAndPath(MOD_ID, "advanced_upgrade_base"),
settings -> new SimplePolymerItem(settings, Items.NETHERITE_UPGRADE_SMITHING_TEMPLATE)
);
public static final SimplePolymerItem MOVE_MODULE = registerModule(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "move_module"),
Identifier.fromNamespaceAndPath(MOD_ID, "move_module"),
Items.IRON_BOOTS,
List.of(Instructions.WALK, Instructions.WALK_CONTINUOUS, Instructions.TURN, Instructions.TURN_VECTOR)
);
public static final SimplePolymerItem ATTACK_MODULE = registerModule(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "attack_module"),
Identifier.fromNamespaceAndPath(MOD_ID, "attack_module"),
Items.IRON_PICKAXE,
List.of(Instructions.ATTACK, Instructions.MINE_BLOCK)
);
public static final SimplePolymerItem INTERACT_MODULE = registerModule(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "interact_module"),
Identifier.fromNamespaceAndPath(MOD_ID, "interact_module"),
Items.LEVER,
List.of(Instructions.USE)
);
public static final SimplePolymerItem MOB_SPAWNING_MODULE = registerModule(
ResourceLocation.fromNamespaceAndPath(MOD_ID, "mob_spawning_module"),
Identifier.fromNamespaceAndPath(MOD_ID, "mob_spawning_module"),
Items.SPAWNER,
List.of(),
List.of(SpecialAbilities.MOB_SPAWNING)
@@ -75,9 +76,9 @@ public class MinionItems {
new Item.Properties().useBlockDescriptionPrefix()
);
public static final ClipboardItem REFERENCE_ITEM = registerItem(ResourceLocation.fromNamespaceAndPath(MOD_ID, "clipboard"), ClipboardItem::new);
public static final ClipboardItem REFERENCE_ITEM = registerItem(Identifier.fromNamespaceAndPath(MOD_ID, "clipboard"), ClipboardItem::new);
public static <T extends Item> T registerItem(ResourceLocation identifier, Function<Item.Properties, T> constructor, Item.Properties settings) {
public static <T extends Item> T registerItem(Identifier identifier, Function<Item.Properties, T> constructor, Item.Properties settings) {
T item = constructor.apply(settings.setId(ResourceKey.create(Registries.ITEM, identifier)));
MinionCreativeTab.add(item);
@@ -85,11 +86,11 @@ public class MinionItems {
return Registry.register(BuiltInRegistries.ITEM, identifier, item);
}
public static <T extends Item> T registerItem(ResourceLocation identifier, Function<Item.Properties, T> constructor) {
public static <T extends Item> T registerItem(Identifier identifier, Function<Item.Properties, T> constructor) {
return registerItem(identifier, constructor, new Item.Properties());
}
public static SimplePolymerItem registerModule(ResourceLocation identifier, Item vanillaItem, List<InstructionType<MinionRuntime>> instructionTypes, List<SpecialAbility> specialAbilities) {
public static SimplePolymerItem registerModule(Identifier identifier, Item vanillaItem, List<InstructionType<MinionRuntime>> instructionTypes, List<SpecialAbility> specialAbilities) {
return registerItem(
identifier,
settings -> new SimplePolymerItem(settings, vanillaItem),
@@ -97,7 +98,7 @@ public class MinionItems {
);
}
public static SimplePolymerItem registerModule(ResourceLocation identifier, Item vanillaItem, List<InstructionType<MinionRuntime>> instructionTypes) {
public static SimplePolymerItem registerModule(Identifier identifier, Item vanillaItem, List<InstructionType<MinionRuntime>> instructionTypes) {
return registerModule(
identifier,
vanillaItem,
src/main/java/io/github/skippyall/minions/registration/MinionListeners.java
+2 -2
View File
@@ -3,10 +3,10 @@ package io.github.skippyall.minions.registration;
import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.block.miniontrigger.MinionTriggerMinionListener;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class MinionListeners {
public static void register() {
Registry.register(MinionRegistries.MINION_LISTENER_CODECS, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger"), MinionTriggerMinionListener.CODEC);
Registry.register(MinionRegistries.MINION_LISTENER_CODECS, Identifier.fromNamespaceAndPath(Minions.MOD_ID, "minion_trigger"), MinionTriggerMinionListener.CODEC);
}
}
src/main/java/io/github/skippyall/minions/registration/MinionRegistries.java
+3 -3
View File
@@ -22,8 +22,8 @@ import net.fabricmc.fabric.api.event.registry.DynamicRegistries;
import net.fabricmc.fabric.api.event.registry.FabricRegistryBuilder;
import net.fabricmc.fabric.api.event.registry.RegistryAttribute;
import net.minecraft.core.Registry;
import net.minecraft.resources.Identifier;
import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation;
public class MinionRegistries {
public static final Registry<ValueType<?>> VALUE_TYPES = registry("value_type");
@@ -45,11 +45,11 @@ public class MinionRegistries {
public static final ResourceKey<Registry<ReferenceEntry>> DOCS_ENTRY = key("docs_entry");
private static <T> Registry<T> registry(String id) {
return FabricRegistryBuilder.<T>createSimple(key(id)).attribute(RegistryAttribute.OPTIONAL).buildAndRegister();
return FabricRegistryBuilder.<T>create(key(id)).attribute(RegistryAttribute.OPTIONAL).buildAndRegister();
}
private static <T> ResourceKey<Registry<T>> key(String name) {
return ResourceKey.createRegistryKey(ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, name));
return ResourceKey.createRegistryKey(Identifier.fromNamespaceAndPath(Minions.MOD_ID, name));
}
public static void register() {
src/main/java/io/github/skippyall/minions/registration/SkinProviders.java
+2 -2
View File
@@ -6,7 +6,7 @@ import io.github.skippyall.minions.minion.skin.NameSkinProvider;
import io.github.skippyall.minions.minion.skin.SkinProvider;
import io.github.skippyall.minions.minion.skin.UUIDSkinProvider;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class SkinProviders {
public static NameSkinProvider NAME = register(new NameSkinProvider(), "name");
@@ -14,7 +14,7 @@ public class SkinProviders {
public static Base64SkinProvider BASE64 = register(new Base64SkinProvider(), "base64");
public static <T extends SkinProvider> T register(T skinProvider, String path) {
return Registry.register(MinionRegistries.SKIN_PROVIDERS, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, path), skinProvider);
return Registry.register(MinionRegistries.SKIN_PROVIDERS, Identifier.fromNamespaceAndPath(Minions.MOD_ID, path), skinProvider);
}
public static void register() {
src/main/java/io/github/skippyall/minions/registration/SpecialAbilities.java
+2 -2
View File
@@ -4,13 +4,13 @@ import io.github.skippyall.minions.Minions;
import io.github.skippyall.minions.module.MobSpawningAbility;
import io.github.skippyall.minions.module.SpecialAbility;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class SpecialAbilities {
public static final MobSpawningAbility MOB_SPAWNING = register("mob_spawning", new MobSpawningAbility());
private static <T extends SpecialAbility> T register(String name, T type) {
Registry.register(MinionRegistries.SPECIAL_ABILITIES, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, name), type);
Registry.register(MinionRegistries.SPECIAL_ABILITIES, Identifier.fromNamespaceAndPath(Minions.MOD_ID, name), type);
return type;
}
src/main/java/io/github/skippyall/minions/registration/ValueConverters.java
+2 -2
View File
@@ -5,14 +5,14 @@ import io.github.skippyall.minions.program.conversion.CastConverter;
import io.github.skippyall.minions.program.conversion.EqualityConverter;
import io.github.skippyall.minions.program.conversion.ValueConverterType;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class ValueConverters {
public static final EqualityConverter.EqualityConverterType EQUALITY_CONVERTER = register("equality", new EqualityConverter.EqualityConverterType());
public static final CastConverter.Type CAST_CONVERTER = register("cast", new CastConverter.Type());
private static <T extends ValueConverterType<?>> T register(String name, T type) {
return Registry.register(MinionRegistries.VALUE_CONVERTER_TYPES, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, name), type);
return Registry.register(MinionRegistries.VALUE_CONVERTER_TYPES, Identifier.fromNamespaceAndPath(Minions.MOD_ID, name), type);
}
public static void register() {}
src/main/java/io/github/skippyall/minions/registration/ValueSuppliers.java
+2 -2
View File
@@ -6,14 +6,14 @@ import io.github.skippyall.minions.minion.program.supplier.AnalogInputSupplier;
import io.github.skippyall.minions.program.supplier.FixedValueSupplierType;
import io.github.skippyall.minions.program.supplier.ValueSupplierType;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class ValueSuppliers {
public static final FixedValueSupplierType<MinionRuntime> FIXED_VALUE_SUPPLIER_TYPE = register("fixed", new FixedValueSupplierType<>());
public static final AnalogInputSupplier.AnalogInputSupplierType ANALOG_INPUT = register("analog_input", new AnalogInputSupplier.AnalogInputSupplierType());
public static <T extends ValueSupplierType<MinionRuntime>> T register(String id, T type) {
return Registry.register(MinionRegistries.VALUE_SUPPLIER_TYPES, ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, id), type);
return Registry.register(MinionRegistries.VALUE_SUPPLIER_TYPES, Identifier.fromNamespaceAndPath(Minions.MOD_ID, id), type);
}
public static void register() {}
src/main/java/io/github/skippyall/minions/registration/ValueTypes.java
+4 -3
View File
@@ -6,10 +6,11 @@ import io.github.skippyall.minions.gui.input.TextInput;
import io.github.skippyall.minions.minion.program.instruction.move.TurnDirection;
import io.github.skippyall.minions.program.value.SimpleValueType;
import io.github.skippyall.minions.program.value.ValueType;
import java.util.concurrent.CompletableFuture;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import java.util.concurrent.CompletableFuture;
public class ValueTypes {
public static ValueType<Long> LONG = register(
@@ -85,7 +86,7 @@ public class ValueTypes {
String id,
T type
) {
ResourceLocation identifier = ResourceLocation.fromNamespaceAndPath(Minions.MOD_ID, id);
Identifier identifier = Identifier.fromNamespaceAndPath(Minions.MOD_ID, id);
Registry.register(
MinionRegistries.VALUE_TYPES,
identifier,
src/main/java/io/github/skippyall/minions/util/ModelIdUtil.java
+2 -2
View File
@@ -1,11 +1,11 @@
package io.github.skippyall.minions.util;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
import net.minecraft.world.item.Item;
public class ModelIdUtil {
public static ResourceLocation getItemModelId(Item item) {
public static Identifier getItemModelId(Item item) {
return BuiltInRegistries.ITEM.getKey(item);
}
}
src/main/java/io/github/skippyall/minions/util/TranslationUtil.java
+3 -3
View File
@@ -1,11 +1,11 @@
package io.github.skippyall.minions.util;
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.resources.Identifier;
public class TranslationUtil {
public static <T> String getTranslationKey(T object, Registry<T> registry, String defaultKey) {
return getTranslationKey(object, registry, registry.key().location().getPath(), defaultKey);
return getTranslationKey(object, registry, registry.key().identifier().getPath(), defaultKey);
}
public static <T> String getTranslationKey(T object, Registry<T> registry, String prefix, String defaultKey) {
@@ -13,7 +13,7 @@ public class TranslationUtil {
return defaultKey;
}
ResourceLocation id = registry.getKey(object);
Identifier id = registry.getKey(object);
if(id == null) {
return defaultKey;
}
src/main/resources/fabric.mod.json
+4 -4
View File
@@ -6,7 +6,7 @@
"description": "",
"authors": [],
"contact": {
"repo": "https://github.com/falko/Minions"
"repo": "https://github.com/Mineattack-Foxgalaxy/Minions"
},
"license": "MIT",
"icon": "assets/minions/icon.png",
@@ -22,11 +22,11 @@
"mixins": [
"minions.mixins.json"
],
"accessWidener" : "minions.accesswidener",
"accessWidener" : "minions.classtweaker",
"depends": {
"fabricloader": "*",
"fabric": "*",
"minecraft": "~1.21.5",
"fabric-api": "*",
"minecraft": "~26.1",
"polymer-core": "*"
}
}
src/main/resources/minions.accesswidener → src/main/resources/minions.classtweaker
+1 -1
View File
@@ -1,4 +1,4 @@
accessWidener v2 named
classTweaker v2 official
accessible class net/minecraft/server/level/DistanceManager$FixedPlayerDistanceChunkTracker
accessible method net/minecraft/server/level/DistanceManager$FixedPlayerDistanceChunkTracker <init> (Lnet/minecraft/server/level/DistanceManager;I)V
src/main/resources/minions.mixins.json
+4 -4
View File
@@ -5,23 +5,23 @@
"compatibilityLevel": "JAVA_17",
"mixins": [
"ChunkTicketManagerFixMixin",
"ClientboundPlayerInfoUpdatePacket$EntryMixin",
"ConnectionMixin",
"EntityAccessor",
"EntityMixin",
"EntityGetterMixin",
"EntityMixin",
"MinecraftServerMixin",
"MobMixin",
"NaturalSpawnerMixin",
"PistonMovingBlockEntityMixin",
"ClientboundPlayerInfoUpdatePacket$EntryMixin",
"PlayerListMixin",
"PlayerMixin",
"ServerGamePacketListenerImplMixin",
"SleepStatusMixin",
"NaturalSpawnerMixin",
"TickRateManagerMixin",
"antimobcap.ChunkTrackerMixin",
"antimobcap.DistanceManager$FixedPlayerDistanceChunkTrackerMixin",
"antimobcap.DistanceManagerMixin",
"antimobcap.ChunkTrackerMixin",
"antimobcap.ServerChunkCacheAccessor",
"antimobcap.ServerChunkCacheMixin",
"compat.universal_graves.GraveMixin"