Update mod to Minecraft 1.21.5 (#321)

haykam821 · web-flow · commit 34c86f2724f6 · 2025-04-19T22:01:37.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id 'fabric-loom' version '1.8.+'
+  id 'fabric-loom' version '1.10.+'
   id 'maven-publish'
   id "com.modrinth.minotaur" version "2.+"
 }
diff --git a/gradle.properties b/gradle.properties
@@ -2,25 +2,25 @@
 org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.1
-loader_version=0.16.9
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
+loader_version=0.16.13
 
 # Dependencies
-fabric_version=0.118.5+1.21.4
-polymer_version=0.11.8+1.21.4
-server_translations_version=2.4.0+1.21.2-rc1
+fabric_version=0.120.0+1.21.5
+polymer_version=0.12.3+1.21.5
+server_translations_version=2.5.0+1.21.5-rc1
 packet_tweaker_version=0.6.0-pre.1+1.21.2-pre3
 fantasy_version=0.6.5+1.21.2
 more_codecs_version=0.3.5+1.21.2
-stimuli_version=0.5.0+1.21.3
-map_templates_version=0.2.2+1.21.4
+stimuli_version=0.5.0+1.21.5
+map_templates_version=0.2.2+1.21.5
 substrate_version=0.2.2+1.20.1
-sgui_version=1.8.2+1.21.4
+sgui_version=1.9.0+1.21.5
 sidebar_api_version=0.5.1+1.21.1
-placeholder_api_version=2.5.2+1.21.3
+placeholder_api_version=2.6.2+1.21.5
 map_canvas_api_version=0.5.0+1.21.3
-player_data_api_version=0.7.0+1.21.3
+player_data_api_version=0.7.0+1.21.5
 predicate_api_version=0.6.0+1.21.2
 permission_api_version=0.3.3
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/GameTexts.java b/src/main/java/xyz/nucleoid/plasmid/api/game/GameTexts.java
@@ -26,8 +26,8 @@ public static Style commandLinkStyle(String command) {
 
     public static Style commandLinkStyle(String command, Text hoverText) {
         return Style.EMPTY
-                .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))
-                .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverText))
+                .withClickEvent(new ClickEvent.RunCommand(command))
+                .withHoverEvent(new HoverEvent.ShowText(hoverText))
                 .withFormatting(Formatting.BLUE, Formatting.UNDERLINE);
     }
 
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/common/OldCombat.java b/src/main/java/xyz/nucleoid/plasmid/api/game/common/OldCombat.java
@@ -7,6 +7,7 @@
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.item.*;
 import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.registry.tag.ItemTags;
 import net.minecraft.util.Identifier;
 
 /**
@@ -55,7 +56,7 @@ public static ItemStack applyTo(ItemStack stack) {
         }
 
         {
-            float attackDamageBonus = stack.getItem() instanceof HoeItem ? 0 : getToolMaterial(stack).attackDamageBonus();
+            float attackDamageBonus = stack.isIn(ItemTags.HOES) ? 0 : getToolMaterial(stack).attackDamageBonus();
             int baseDamage = getBaseDamage(stack);
 
             EntityAttributeModifier modifier = createDamageModifier(attackDamageBonus + baseDamage);
@@ -91,16 +92,15 @@ private static ToolMaterial getToolMaterial(ItemStack item) {
     }
 
     private static int getBaseDamage(ItemStack stack) {
-        var item = stack.getItem();
-        if (item instanceof SwordItem) {
+        if (stack.isIn(ItemTags.SWORDS)) {
             return SWORD_BASE_DAMAGE;
-        } else if (item instanceof AxeItem) {
+        } else if (stack.isIn(ItemTags.AXES)) {
             return AXE_BASE_DAMAGE;
-        } else if (item instanceof PickaxeItem) {
+        } else if (stack.isIn(ItemTags.PICKAXES)) {
             return PICKAXE_BASE_DAMAGE;
-        } else if (item instanceof ShovelItem) {
+        } else if (stack.isIn(ItemTags.SHOVELS)) {
             return SHOVEL_BASE_DAMAGE;
-        } else if (item instanceof HoeItem) {
+        } else if (stack.isIn(ItemTags.HOES)) {
             return HOE_BASE_DAMAGE;
         }
         return 0;
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/GameTeamConfig.java b/src/main/java/xyz/nucleoid/plasmid/api/game/common/team/GameTeamConfig.java
@@ -117,7 +117,7 @@ private static Text getNameWithColorFallback(Optional<Text> name, Colors colors)
             if (colors == Colors.NONE) {
                 return Text.literal("Team");
             } else {
-                return Text.translatable("color.minecraft." + colors.blockDyeColor().getName());
+                return Text.translatable("color.minecraft." + colors.blockDyeColor().getId());
             }
         });
     }
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/util/Guis.java b/src/main/java/xyz/nucleoid/plasmid/api/util/Guis.java
@@ -9,6 +9,7 @@
 import net.minecraft.block.entity.BannerPatterns;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.BannerPatternsComponent;
+import net.minecraft.component.type.TooltipDisplayComponent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.*;
@@ -18,7 +19,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.text.MutableText;
 import net.minecraft.util.DyeColor;
-import net.minecraft.util.Unit;
 import net.minecraft.util.math.MathHelper;
 import org.jetbrains.annotations.Range;
 
@@ -173,7 +173,7 @@ private static ScreenHandlerType<?> selectScreenType(int rowCount) {
     private static ItemStack createBanner(BannerPatternsComponent.Builder patterns) {
         ItemStack stack = Items.GRAY_BANNER.getDefaultStack();
         stack.set(DataComponentTypes.CUSTOM_NAME, ScreenTexts.EMPTY);
-        stack.set(DataComponentTypes.HIDE_ADDITIONAL_TOOLTIP, Unit.INSTANCE);
+        stack.apply(DataComponentTypes.TOOLTIP_DISPLAY, TooltipDisplayComponent.DEFAULT, tooltipDisplay -> tooltipDisplay.with(DataComponentTypes.BANNER_PATTERNS, true));
         stack.set(DataComponentTypes.BANNER_PATTERNS, patterns.build());
         return stack;
     }
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/util/ItemStackBuilder.java b/src/main/java/xyz/nucleoid/plasmid/api/util/ItemStackBuilder.java
@@ -16,6 +16,7 @@
 import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.text.Text;
+import net.minecraft.util.Unit;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -74,12 +75,16 @@ public <T> ItemStackBuilder set(ComponentType<T> type, @Nullable T value) {
     }
 
     public ItemStackBuilder setUnbreakable() {
-        this.stack.set(DataComponentTypes.UNBREAKABLE, new UnbreakableComponent(true));
+        this.stack.set(DataComponentTypes.UNBREAKABLE, Unit.INSTANCE);
+        this.stack.apply(DataComponentTypes.TOOLTIP_DISPLAY, TooltipDisplayComponent.DEFAULT, tooltipDisplay -> tooltipDisplay.with(DataComponentTypes.UNBREAKABLE, true));
+
         return this;
     }
 
     public ItemStackBuilder setDyeColor(int color) {
-        this.stack.set(DataComponentTypes.DYED_COLOR, new DyedColorComponent(color, true));
+        this.stack.set(DataComponentTypes.DYED_COLOR, new DyedColorComponent(color));
+        this.stack.apply(DataComponentTypes.TOOLTIP_DISPLAY, TooltipDisplayComponent.DEFAULT, tooltipDisplay -> tooltipDisplay.with(DataComponentTypes.DYED_COLOR, true));
+
         return this;
     }
 
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/player/isolation/IsolatingPlayerTeleporter.java b/src/main/java/xyz/nucleoid/plasmid/impl/player/isolation/IsolatingPlayerTeleporter.java
@@ -118,7 +118,7 @@ private void teleport(ServerPlayerEntity player, Function<ServerPlayerEntity, Se
         networkHandler.syncWithPlayerPosition();
         world.onDimensionChanged(player);
         networkHandler.sendPacket(new DifficultyS2CPacket(worldProperties.getDifficulty(), worldProperties.isDifficultyLocked()));
-        networkHandler.sendPacket(new UpdateSelectedSlotS2CPacket(player.getInventory().selectedSlot));
+        networkHandler.sendPacket(new UpdateSelectedSlotS2CPacket(player.getInventory().getSelectedSlot()));
         player.sendAbilitiesUpdate();
         playerManager.sendCommandTree(player);
         player.getRecipeBook().sendInitRecipesPacket(player);
diff --git a/src/main/java/xyz/nucleoid/plasmid/impl/portal/GamePortalInterface.java b/src/main/java/xyz/nucleoid/plasmid/impl/portal/GamePortalInterface.java
@@ -1,7 +1,6 @@
 package xyz.nucleoid.plasmid.impl.portal;
 
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Identifier;
 import org.jetbrains.annotations.Nullable;
@@ -28,10 +27,7 @@ default void serializePortal(NbtCompound root) {
 
     @Nullable
     default Identifier deserializePortalId(NbtCompound root) {
-        if (root.contains(NBT_KEY, NbtElement.STRING_TYPE)) {
-            return Identifier.of(root.getString(NBT_KEY));
-        }
-        return null;
+        return root.get(NBT_KEY, Identifier.CODEC).orElse(null);
     }
 
     default boolean tryConnectTo(Identifier portalId) {
diff --git a/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/LootTableMixin.java b/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/LootTableMixin.java
@@ -19,7 +19,7 @@
 public class LootTableMixin {
     @WrapWithCondition(
             method = "supplyInventory",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/loot/LootTable;shuffle(Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/util/math/random/Random;)V")
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/loot/LootTable;spreadStacks(Lit/unimi/dsi/fastutil/objects/ObjectArrayList;ILnet/minecraft/util/math/random/Random;)V")
     )
     public boolean preventContainerLootShuffling(LootTable lootTable, ObjectArrayList<ItemStack> stacks, int freeSlots, Random random, @Local LootContext context) {
         var entity = context.get(LootContextParameters.THIS_ENTITY);
diff --git a/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/ServerPlayNetworkHandlerMixin.java b/src/main/java/xyz/nucleoid/plasmid/mixin/game/rule/ServerPlayNetworkHandlerMixin.java
@@ -41,18 +41,18 @@ private void onClickSlot(ClickSlotC2SPacket packet, CallbackInfo ci) {
         var gameSpace = GameSpaceManagerImpl.get().byPlayer(this.player);
 
         if (gameSpace != null) {
-            if (packet.getSlot() < 0 || packet.getSlot() >= this.player.getInventory().size()) return;
+            if (packet.slot() < 0 || packet.slot() >= this.player.getInventory().size()) return;
             // See https://wiki.vg/File:Inventory-slots.png for the slot numbering
             var screenHandler = this.player.currentScreenHandler;
 
-            boolean isArmor = (packet.getSlot() >= 5 && packet.getSlot() <= 8) && screenHandler instanceof PlayerScreenHandler;
+            boolean isArmor = (packet.slot() >= 5 && packet.slot() <= 8) && screenHandler instanceof PlayerScreenHandler;
             boolean denyModifyInventory = gameSpace.getBehavior().testRule(GameRuleType.MODIFY_INVENTORY) == EventResult.DENY;
             var modifyArmor = gameSpace.getBehavior().testRule(GameRuleType.MODIFY_ARMOR);
             if ((denyModifyInventory && (!isArmor || modifyArmor != EventResult.ALLOW))
                     || (isArmor && modifyArmor == EventResult.DENY)) {
-                var stack = screenHandler.getSlot(packet.getSlot()).getStack();
+                var stack = screenHandler.getSlot(packet.slot()).getStack();
 
-                this.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(packet.getSyncId(), screenHandler.nextRevision(), packet.getSlot(), stack));
+                this.sendPacket(new ScreenHandlerSlotUpdateS2CPacket(packet.syncId(), screenHandler.nextRevision(), packet.slot(), stack));
                 this.sendPacket(new SetCursorItemS2CPacket(screenHandler.getCursorStack()));
 
                 ci.cancel();
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
   "depends": {
     "fabricloader": ">=0.14",
     "fabric": "*",
-    "minecraft": ">=1.21.4-",
+    "minecraft": ">=1.21.5-",
     "polymer-core": "*",
     "fabric-permissions-api-v0": "*",
     "java": ">=21"
diff --git a/src/main/resources/plasmid.accesswidener b/src/main/resources/plasmid.accesswidener
@@ -12,4 +12,6 @@ accessible field net/minecraft/world/GameRules$IntRule value I
 accessible method net/minecraft/entity/Entity unsetRemoved ()V
 accessible method net/minecraft/server/network/ServerPlayerInteractionManager setGameMode (Lnet/minecraft/world/GameMode;Lnet/minecraft/world/GameMode;)V
 
-accessible method net/minecraft/block/TntBlock primeTnt (Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/LivingEntity;)V
+accessible method net/minecraft/block/TntBlock primeTnt (Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/LivingEntity;)Z
+
+accessible method net/minecraft/registry/entry/RegistryEntry$Reference setTags (Ljava/util/Collection;)V
diff --git a/src/test/java/xyz/nucleoid/plasmid/test/OldCombatTests.java b/src/test/java/xyz/nucleoid/plasmid/test/OldCombatTests.java
@@ -12,17 +12,63 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.entry.RegistryEntry;
+import net.minecraft.registry.tag.ItemTags;
+import net.minecraft.registry.tag.TagKey;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
 import xyz.nucleoid.plasmid.api.game.common.OldCombat;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 public class OldCombatTests {
     @BeforeAll
     public static void beforeAll() {
         SharedConstants.createGameVersion();
         Bootstrap.initialize();
+
+        // Work around tags not being bound
+        bindTag(Items.WOODEN_SWORD, ItemTags.SWORDS);
+        bindTag(Items.GOLDEN_SWORD, ItemTags.SWORDS);
+        bindTag(Items.STONE_SWORD, ItemTags.SWORDS);
+        bindTag(Items.IRON_SWORD, ItemTags.SWORDS);
+        bindTag(Items.DIAMOND_SWORD, ItemTags.SWORDS);
+        bindTag(Items.NETHERITE_SWORD, ItemTags.SWORDS);
+
+        bindTag(Items.WOODEN_PICKAXE, ItemTags.PICKAXES);
+        bindTag(Items.GOLDEN_PICKAXE, ItemTags.PICKAXES);
+        bindTag(Items.STONE_PICKAXE, ItemTags.PICKAXES);
+        bindTag(Items.IRON_PICKAXE, ItemTags.PICKAXES);
+        bindTag(Items.DIAMOND_PICKAXE, ItemTags.PICKAXES);
+        bindTag(Items.NETHERITE_PICKAXE, ItemTags.PICKAXES);
+
+        bindTag(Items.WOODEN_AXE, ItemTags.AXES);
+        bindTag(Items.GOLDEN_AXE, ItemTags.AXES);
+        bindTag(Items.STONE_AXE, ItemTags.AXES);
+        bindTag(Items.IRON_AXE, ItemTags.AXES);
+        bindTag(Items.DIAMOND_AXE, ItemTags.AXES);
+        bindTag(Items.NETHERITE_AXE, ItemTags.AXES);
+
+        bindTag(Items.WOODEN_SHOVEL, ItemTags.SHOVELS);
+        bindTag(Items.GOLDEN_SHOVEL, ItemTags.SHOVELS);
+        bindTag(Items.STONE_SHOVEL, ItemTags.SHOVELS);
+        bindTag(Items.IRON_SHOVEL, ItemTags.SHOVELS);
+        bindTag(Items.DIAMOND_SHOVEL, ItemTags.SHOVELS);
+        bindTag(Items.NETHERITE_SHOVEL, ItemTags.SHOVELS);
+
+        bindTag(Items.WOODEN_HOE, ItemTags.HOES);
+        bindTag(Items.GOLDEN_HOE, ItemTags.HOES);
+        bindTag(Items.STONE_HOE, ItemTags.HOES);
+        bindTag(Items.IRON_HOE, ItemTags.HOES);
+        bindTag(Items.DIAMOND_HOE, ItemTags.HOES);
+        bindTag(Items.NETHERITE_HOE, ItemTags.HOES);
     }
 
     @Test
@@ -68,6 +114,12 @@ public void testAttributes() {
         assertAttributeModifiers(Items.NETHERITE_HOE, 0);
     }
 
+    @SuppressWarnings("deprecation")
+    private static void bindTag(Item item, TagKey<Item> tag) {
+        var entry = item.getRegistryEntry();
+        entry.setTags(Set.of(tag));
+    }
+
     private static void assertAttributeModifiers(Item item, float expectedAttackDamage) {
         var stack = OldCombat.applyTo(new ItemStack(item));
         var component = stack.get(DataComponentTypes.ATTRIBUTE_MODIFIERS);
diff --git a/src/testmod/java/xyz/nucleoid/plasmid/test/JankGame.java b/src/testmod/java/xyz/nucleoid/plasmid/test/JankGame.java
@@ -8,6 +8,7 @@
 import net.minecraft.entity.MovementType;
 import net.minecraft.entity.decoration.ArmorStandEntity;
 import net.minecraft.entity.player.PlayerPosition;
+import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.play.PlayerInputC2SPacket;
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket;
 import net.minecraft.network.packet.s2c.play.*;
@@ -39,7 +40,10 @@
 import xyz.nucleoid.stimuli.event.player.PlayerC2SPacketEvent;
 import xyz.nucleoid.stimuli.event.player.PlayerDeathEvent;
 
+import java.util.List;
 import java.util.Set;
+import java.util.UUID;
+import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 public final class JankGame {
@@ -142,7 +146,10 @@ private static GameResult startGame(GameSpace gameSpace) {
             );
 
             activity.listen(GamePlayerEvents.ADD, player -> {
-                player.networkHandler.sendPacket(CAMERA.createSpawnPacket(new EntityTrackerEntry(world, CAMERA, 1, false, player.networkHandler::sendPacket)));
+                Consumer<Packet<?>> watchingSender = player.networkHandler::sendPacket;
+                var filteredWatchingSender = getFilteredPacketSender(player.getUuid(), watchingSender);
+
+                player.networkHandler.sendPacket(CAMERA.createSpawnPacket(new EntityTrackerEntry(world, CAMERA, 1, false, watchingSender, filteredWatchingSender)));
                 player.networkHandler.sendPacket(new EntityTrackerUpdateS2CPacket(CAMERA.getId(), CAMERA.getDataTracker().getChangedEntries()));
                 player.networkHandler.sendPacket(VirtualEntityUtils.createRidePacket(CAMERA.getId(), IntList.of(player.getId())));
                 player.networkHandler.sendPacket(new SetCameraEntityS2CPacket(CAMERA));
@@ -208,6 +215,14 @@ private static MapTemplate generateMapTemplate(BlockState state) {
         return template;
     }
 
+    private static BiConsumer<Packet<?>, List<UUID>> getFilteredPacketSender(UUID uuid, Consumer<Packet<?>> sender) {
+        return (packet, except) -> {
+            if (!except.contains(uuid)) {
+                sender.accept(packet);
+            }
+        };
+    }
+
     static {
         CAMERA.setNoGravity(true);
         CAMERA.setMarker(true);

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.8.+'`
	`2`	`+ id 'fabric-loom' version '1.10.+'`
`3`	`3`	`id 'maven-publish'`
`4`	`4`	`id "com.modrinth.minotaur" version "2.+"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ public static Style commandLinkStyle(String command) {`
`26`	`26`
`27`	`27`	`public static Style commandLinkStyle(String command, Text hoverText) {`
`28`	`28`	`return Style.EMPTY`
`29`		`- .withClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, command))`
`30`		`- .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hoverText))`
	`29`	`+ .withClickEvent(new ClickEvent.RunCommand(command))`
	`30`	`+ .withHoverEvent(new HoverEvent.ShowText(hoverText))`
`31`	`31`	`.withFormatting(Formatting.BLUE, Formatting.UNDERLINE);`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ private static Text getNameWithColorFallback(Optional<Text> name, Colors colors)`
`117`	`117`	`if (colors == Colors.NONE) {`
`118`	`118`	`return Text.literal("Team");`
`119`	`119`	`} else {`
`120`		`- return Text.translatable("color.minecraft." + colors.blockDyeColor().getName());`
	`120`	`+ return Text.translatable("color.minecraft." + colors.blockDyeColor().getId());`
`121`	`121`	`}`
`122`	`122`	`});`
`123`	`123`	`}`