Update to 1.21

gradle.properties

@@ -3,27 +3,27 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.20.6
-yarn_mappings=1.20.6+build.1
-loader_version=0.15.10
+minecraft_version=1.21-rc1
+yarn_mappings=1.21-rc1+build.1
+loader_version=0.15.11
 
 #Fabric api
-fabric_version=0.97.6+1.20.6
+fabric_version=0.100.1+1.21
 
 # Mod Properties
-mod_version = 1.12.2
+mod_version = 1.13.0
 maven_group = eu.pb4
 archives_base_name = goml
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 rtree_version=0.3.0
-cca_version=6.0.0-beta.1
-pal_version=1.9.0
-polymer_version=0.8.2+1.20.6
-sgui_version=1.5.1+1.20.5
-stapi_version=2.3.0+1.20.5-rc2
-placeholder_version=2.4.0-pre.1+1.20.5
+cca_version=6.1.0
+pal_version=1.10.0
+polymer_version=0.9.0+1.21-rc1
+sgui_version=1.6.0+1.21
+stapi_version=2.3.1+1.21-pre2
+placeholder_version=2.4.0-pre.2+1.21
 common-protection-api_version=1.0.0
 
 # compat

src/main/java/draylar/goml/GetOffMyLawn.java

@@ -53,7 +53,7 @@ public class GetOffMyLawn implements ModInitializer, WorldComponentInitializer {
     public static GOMLConfig CONFIG = new GOMLConfig();
 
     public static Identifier id(String name) {
-        return new Identifier("goml", name);
+        return Identifier.of("goml", name);
     }
 
     @Override
@@ -68,7 +68,7 @@ public void onInitialize() {
 
         PolymerItemGroupUtils.registerPolymerItemGroup(id("group"), GROUP);
 
-        CommonProtection.register(new Identifier("goml", "claim_protection"), GomlProtectionProvider.INSTANCE);
+        CommonProtection.register(Identifier.of("goml", "claim_protection"), GomlProtectionProvider.INSTANCE);
 
         ServerLifecycleEvents.SERVER_STARTING.register((s) -> {
             CardboardWarning.checkAndAnnounce();

src/main/java/draylar/goml/api/Claim.java

@@ -326,7 +326,7 @@ public static Claim fromNbt(MinecraftServer server, NbtCompound nbt, int version
     }
 
     public Identifier getWorld() {
-        return this.world != null ? this.world : new Identifier("undefined");
+        return this.world != null ? this.world : Identifier.of("undefined");
     }
 
     @Nullable

src/main/java/draylar/goml/block/augment/ForceFieldAugmentBlock.java

@@ -16,6 +16,7 @@
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Items;
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.PositionFlag;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.screen.ScreenHandlerType;
@@ -91,12 +92,12 @@ public void onPlayerEnter(Claim claim, PlayerEntity player) {
                 y = player.getWorld().getTopY(Heightmap.Type.MOTION_BLOCKING, (int) pos.x, (int) pos.z);
             }
 
-            player.teleport(pos.x, y, pos.z);
+            player.teleport(pos.x, y, pos.z, true);
 
             player.setVelocity(Vec3d.of(dir.getVector()).multiply(0.2));
 
             if (player.hasVehicle()) {
-                player.getVehicle().teleport(pos.x, y, pos.z);
+                player.getVehicle().teleport((ServerWorld) player.getVehicle().getWorld(), pos.x, y, pos.z, PositionFlag.VALUES, player.getVehicle().getYaw(), player.getVehicle().getPitch());
                 player.getVehicle().setVelocity(Vec3d.of(dir.getVector()).multiply(0.2));
             }
 

src/main/java/draylar/goml/cca/WorldClaimComponent.java

@@ -7,6 +7,7 @@
 import net.fabricmc.fabric.api.util.NbtType;
 import net.minecraft.nbt.NbtCompound;
 import net.minecraft.nbt.NbtList;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
@@ -36,7 +37,7 @@ public void remove(Claim info) {
     }
 
     @Override
-    public void readFromNbt(NbtCompound tag) {
+    public void readFromNbt(NbtCompound tag, RegistryWrapper.WrapperLookup lookup) {
         this.claims = RTreeMap.create(new ConfigurationBuilder().star().build(), ClaimBox::rtree3iBox);
         var world = this.world.getRegistryKey().getValue();
 
@@ -72,7 +73,7 @@ public void readFromNbt(NbtCompound tag) {
     }
 
     @Override
-    public void writeToNbt(NbtCompound tag) {
+    public void writeToNbt(NbtCompound tag, RegistryWrapper.WrapperLookup lookup) {
         NbtList nbtListClaims = new NbtList();
         tag.putInt("Version", 1);
 

src/main/java/draylar/goml/config/BaseGson.java

@@ -42,7 +42,6 @@ public class BaseGson {
 
             .registerTypeHierarchyAdapter(Item.class, new RegistrySerializer<>(Registries.ITEM))
             .registerTypeHierarchyAdapter(Block.class, new RegistrySerializer<>(Registries.BLOCK))
-            .registerTypeHierarchyAdapter(Enchantment.class, new RegistrySerializer<>(Registries.ENCHANTMENT))
             .registerTypeHierarchyAdapter(SoundEvent.class, new RegistrySerializer<>(Registries.SOUND_EVENT))
             .registerTypeHierarchyAdapter(StatusEffect.class, new RegistrySerializer<>(Registries.STATUS_EFFECT))
             .registerTypeHierarchyAdapter(EntityType.class, new RegistrySerializer<>(Registries.ENTITY_TYPE))

src/main/java/draylar/goml/item/GogglesItem.java

@@ -5,11 +5,11 @@
 import draylar.goml.api.WorldParticleUtils;
 import eu.pb4.polymer.core.api.item.PolymerItem;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.item.*;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.registry.Registries;
@@ -57,14 +57,12 @@ public void inventoryTick(ItemStack stack, World world, Entity entity, int slot,
     }
 
     @Override
-    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
-        return Items.IRON_HELMET;
+    public boolean hasGlint(ItemStack stack) {
+        return true;
     }
 
     @Override
-    public ItemStack getPolymerItemStack(ItemStack itemStack, TooltipType context, @Nullable ServerPlayerEntity player) {
-        var clientStack = PolymerItem.super.getPolymerItemStack(itemStack, context, player);
-        clientStack.addEnchantment(Enchantments.LURE, 64);
-        return clientStack;
+    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
+        return Items.IRON_HELMET;
     }
 }

src/main/java/draylar/goml/item/ToggleableBlockItem.java

@@ -3,9 +3,9 @@
 import eu.pb4.polymer.core.api.block.PolymerHeadBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.item.ItemPlacementContext;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;

src/main/java/draylar/goml/item/TooltippedBlockItem.java

@@ -3,8 +3,8 @@
 import eu.pb4.polymer.core.api.block.PolymerHeadBlock;
 import eu.pb4.polymer.core.api.item.PolymerHeadBlockItem;
 import net.minecraft.block.Block;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.item.ItemStack;
+import net.minecraft.item.tooltip.TooltipType;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.world.World;

src/main/java/draylar/goml/item/UpgradeKitItem.java

@@ -13,11 +13,12 @@
 import eu.pb4.polymer.core.api.item.PolymerItem;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.entity.BlockEntity;
-import net.minecraft.client.item.TooltipType;
 import net.minecraft.enchantment.Enchantments;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.ItemUsageContext;
+import net.minecraft.item.tooltip.TooltipType;
+import net.minecraft.registry.RegistryWrapper;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
@@ -149,14 +150,12 @@ public void appendTooltip(ItemStack stack, TooltipContext context, List<Text> to
     }
 
     @Override
-    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
-        return this.clientItem;
+    public boolean hasGlint(ItemStack stack) {
+        return true;
     }
 
     @Override
-    public ItemStack getPolymerItemStack(ItemStack itemStack, TooltipType context, @Nullable ServerPlayerEntity player) {
-        var clientStack = PolymerItem.super.getPolymerItemStack(itemStack, context, player);
-        clientStack.addEnchantment(Enchantments.LURE, 68);
-        return clientStack;
+    public Item getPolymerItem(ItemStack itemStack, @Nullable ServerPlayerEntity player) {
+        return this.clientItem;
     }
 }

src/main/java/draylar/goml/mixin/ShapedRecipeMixin.java

@@ -5,6 +5,7 @@
 import net.minecraft.inventory.RecipeInputInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.recipe.ShapedRecipe;
+import net.minecraft.recipe.input.CraftingRecipeInput;
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -17,8 +18,8 @@
 public class ShapedRecipeMixin {
     @Shadow @Final private ItemStack result;
 
-    @Inject(method = "matches(Lnet/minecraft/inventory/RecipeInputInventory;Lnet/minecraft/world/World;)Z", at = @At("HEAD"), cancellable = true)
-    private void goml_cancelIfDisabled(RecipeInputInventory recipeInputInventory, World world, CallbackInfoReturnable<Boolean> cir) {
+    @Inject(method = "matches(Lnet/minecraft/recipe/input/CraftingRecipeInput;Lnet/minecraft/world/World;)Z", at = @At("HEAD"), cancellable = true)
+    private void goml_cancelIfDisabled(CraftingRecipeInput craftingRecipeInput, World world, CallbackInfoReturnable<Boolean> cir) {
         if (this.result.getItem() instanceof ToggleableBlockItem item && !item.isEnabled()) {
             cir.setReturnValue(false);
         }

src/main/java/draylar/goml/other/ClaimCommand.java

@@ -19,6 +19,7 @@
 import net.minecraft.command.argument.GameProfileArgumentType;
 import net.minecraft.nbt.NbtHelper;
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
+import net.minecraft.network.packet.s2c.play.PositionFlag;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
 import net.minecraft.server.MinecraftServer;
@@ -183,12 +184,12 @@ private static int escape(CommandContext<ServerCommandSource> context, ServerPla
                     y = player.getWorld().getTopY(Heightmap.Type.MOTION_BLOCKING, (int) pos.x, (int) pos.z);
                 }
 
-                player.teleport(pos.x, y, pos.z);
+                player.teleport(pos.x, y, pos.z, true);
 
                 player.setVelocity(Vec3d.of(dir.getVector()).multiply(0.2));
 
                 if (player.hasVehicle()) {
-                    player.getVehicle().teleport(pos.x, y, pos.z);
+                    player.getVehicle().teleport((ServerWorld) player.getVehicle().getWorld(), pos.x, y, pos.z, PositionFlag.VALUES, player.getVehicle().getYaw(), player.getVehicle().getPitch());
                     player.getVehicle().setVelocity(Vec3d.of(dir.getVector()).multiply(0.2));
                 }
 

src/main/java/draylar/goml/other/PlaceholdersReg.java

@@ -16,7 +16,7 @@
 @ApiStatus.Internal
 public class PlaceholdersReg {
     public static void init() {
-        Placeholders.register(new Identifier("goml", "claim_owners"), (ctx, arg) -> {
+        Placeholders.register(Identifier.of("goml", "claim_owners"), (ctx, arg) -> {
             if (!ctx.hasPlayer()) {
                 return PlaceholderResult.invalid("No player!");
             }
@@ -47,7 +47,7 @@ public static void init() {
             }
         });
 
-        Placeholders.register(new Identifier("goml", "claim_owners"), (ctx, arg) -> {
+        Placeholders.register(Identifier.of("goml", "claim_owners"), (ctx, arg) -> {
             if (!ctx.hasPlayer()) {
                 return PlaceholderResult.invalid("No player!");
             }
@@ -78,7 +78,7 @@ public static void init() {
             }
         });
 
-        Placeholders.register(new Identifier("goml", "claim_trusted"), (ctx, arg) -> {
+        Placeholders.register(Identifier.of("goml", "claim_trusted"), (ctx, arg) -> {
             if (!ctx.hasPlayer()) {
                 return PlaceholderResult.invalid("No player!");
             }
@@ -110,7 +110,7 @@ public static void init() {
             }
         });
 
-        Placeholders.register(new Identifier("goml", "claim_trusted_uuid"), (ctx, arg) -> {
+        Placeholders.register(Identifier.of("goml", "claim_trusted_uuid"), (ctx, arg) -> {
             if (!ctx.hasPlayer()) {
                 return PlaceholderResult.invalid("No player!");
             }
@@ -142,7 +142,7 @@ public static void init() {
             }
         });
 
-        Placeholders.register(new Identifier("goml", "claim_info"), (ctx, arg) -> {
+        Placeholders.register(Identifier.of("goml", "claim_info"), (ctx, arg) -> {
             if (!ctx.hasPlayer()) {
                 return PlaceholderResult.invalid("No player!");
             }