Port to 1.21

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-2022]
@@ -32,7 +32,7 @@ jobs:
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'fabric-loom' version '1.5-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version + "+mc" + project.minecraft_version
@@ -36,15 +36,10 @@ dependencies {
 
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    modRuntimeOnly "maven.modrinth:lazydfu:0.1.3"
-
     modCompileOnly "curse.maven:repurposed-structures-fabric-${project.rs_project_id}:${project.rs_file_id}"
 
-    modApi group: 'info.journeymap', name: 'journeymap-api', version: project.journeymap_api_version, changing: true
-    modRuntimeOnly "curse.maven:journeymap-${project.jm_project_id}:${project.jm_file_id}"
-
-    modApi "maven.modrinth:pinlib:$project.pinlib_api_version"
-    modRuntimeOnly "maven.modrinth:pinlib:$project.pinlib_api_version"
+    modApi group: 'info.journeymap', name: 'journeymap-api-fabric', version: project.journeymap_api_version, changing: true
+//    modRuntimeOnly "curse.maven:journeymap-${project.jm_project_id}:${project.jm_file_id}"
 
     annotationProcessor modImplementation("io.wispforest:owo-lib:${project.owo_version}")
     include "io.wispforest:owo-sentinel:${project.owo_version}"
@@ -64,7 +59,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
-    it.options.release = 17
+    it.options.release = 21
 }
 
 java {

gradle.properties

@@ -2,24 +2,24 @@
 org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.5
+minecraft_version=1.21
+yarn_mappings=1.21+build.4
+loader_version=0.15.11
 # Mod Properties
-mod_version=3.3.2
+mod_version=3.3.3
 maven_group=wraith.waystones
 archives_base_name=wraith-waystones
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.94.0+1.20.4
+fabric_version=0.100.4+1.21
 # Optional Dependencies
 # Journeymap & api
-journeymap_api_version=1.20-1.9-fabric-SNAPSHOT
-jm_project_id=32274
-jm_file_id=4950591
+journeymap_api_version=2.0.0-1.21-SNAPSHOT
+#jm_project_id=32274
+#jm_file_id=5485233
 rs_project_id=391366
-rs_file_id=4998098
+rs_file_id=5467551
 # https://modrinth.com/mod/pinlib/
 pinlib_api_version=0.2.1+mc1.19.3-beta
 # https://maven.wispforest.io/io/wispforest/owo-lib/
-owo_version=0.12.0+1.20.3
+owo_version=0.12.10+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/wraith/fwaystones/FabricWaystones.java

@@ -4,10 +4,9 @@
 import net.fabricmc.loader.api.FabricLoader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import wraith.fwaystones.integration.pinlib.PinlibPlugin;
+import wraith.fwaystones.packets.WaystonePacketHandler;
 import wraith.fwaystones.registry.*;
 import wraith.fwaystones.util.FWConfig;
-import wraith.fwaystones.util.WaystonePacketHandler;
 import wraith.fwaystones.util.WaystoneStorage;
 import wraith.fwaystones.util.WaystonesEventManager;
 
@@ -38,12 +37,9 @@ public void onInitialize() {
         CompatRegistry.init();
         CustomScreenHandlerRegistry.registerScreenHandlers();
         WaystonesEventManager.registerEvents();
+        WaystonePacketHandler.registerPackets();
         WaystonePacketHandler.registerPacketHandlers();
 
-        if (FabricLoader.getInstance().isModLoaded("pinlib")) {
-            PinlibPlugin.init();
-        }
-
         LOGGER.info("Has successfully been initialized.");
     }
 

src/main/java/wraith/fwaystones/block/WaystoneBlock.java

@@ -1,12 +1,13 @@
 package wraith.fwaystones.block;
 
 import com.mojang.serialization.MapCodec;
-import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.block.enums.DoubleBlockHalf;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.NbtComponent;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.fluid.FluidState;
@@ -43,10 +44,6 @@
 import org.jetbrains.annotations.Nullable;
 import wraith.fwaystones.FabricWaystones;
 import wraith.fwaystones.access.PlayerEntityMixinAccess;
-import wraith.fwaystones.integration.pinlib.PinlibPlugin;
-import wraith.fwaystones.item.LocalVoidItem;
-import wraith.fwaystones.item.WaystoneDebuggerItem;
-import wraith.fwaystones.item.WaystoneScrollItem;
 import wraith.fwaystones.registry.BlockEntityRegistry;
 import wraith.fwaystones.util.Utils;
 
@@ -156,7 +153,7 @@ public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, Block
     public BlockState getPlacementState(ItemPlacementContext ctx) {
         BlockPos blockPos = ctx.getBlockPos();
 
-        var nbt = ctx.getStack().getSubNbt("BlockEntityTag");
+        var nbt = ctx.getStack().get(DataComponentTypes.BLOCK_ENTITY_DATA);
         boolean hasOwner = nbt != null && nbt.contains("waystone_owner");
         var world = ctx.getWorld();
         var fluidState = world.getFluidState(blockPos);
@@ -194,9 +191,9 @@ public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEnt
             if (!world.isClient) {
                 ItemStack itemStack = new ItemStack(state.getBlock().asItem());
                 var compoundTag = new NbtCompound();
-                waystone.writeNbt(compoundTag);
+                waystone.writeNbt(compoundTag, waystone.getWorld().getRegistryManager());
                 if (FabricWaystones.CONFIG.store_waystone_data_on_sneak_break() && player.isSneaking() && !compoundTag.isEmpty()) {
-                    itemStack.setSubNbt("BlockEntityTag", compoundTag);
+                    itemStack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(compoundTag));
                 }
                 ItemScatterer.spawn(world, (double) topPos.getX() + 0.5D, (double) topPos.getY() + 0.5D, (double) topPos.getZ() + 0.5D, itemStack);
                 if (waystone.getCachedState().get(MOSSY)) {
@@ -205,6 +202,8 @@ public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEnt
             } else {
                 waystone.generateLoot(player);
             }
+
+            FabricWaystones.WAYSTONE_STORAGE.removeWaystone(waystone);
         }
 
         world.removeBlock(topPos, false);
@@ -233,14 +232,17 @@ public BlockRenderType getRenderType(BlockState state) {
         return BlockRenderType.MODEL;
     }
 
+
+    //    protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
     @Override
-    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+    public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
         if (world.isClient) {
             return ActionResult.success(true);
         }
         BlockPos openPos = state.get(HALF) == DoubleBlockHalf.UPPER ? pos.down() : pos;
         BlockState topState = world.getBlockState(openPos.up());
         BlockState bottomState = world.getBlockState(openPos);
+        Hand hand = player.getActiveHand();
         Item heldItem = player.getStackInHand(hand).getItem();
         if (heldItem == Items.VINE) {
             if (!topState.get(MOSSY)) {
@@ -252,18 +254,6 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
             }
             return ActionResult.PASS;
         }
-        if (heldItem == Items.SHEARS) {
-            if (topState.get(MOSSY)) {
-                world.setBlockState(openPos.up(), topState.with(MOSSY, false));
-                world.setBlockState(openPos, bottomState.with(MOSSY, false));
-                var dropPos = openPos.up(2);
-                ItemScatterer.spawn(world, dropPos.getX() + 0.5F, dropPos.getY() + 0.5F, dropPos.getZ() + 0.5F, new ItemStack(Items.VINE));
-            }
-            return ActionResult.PASS;
-        }
-        if (heldItem instanceof WaystoneScrollItem || heldItem instanceof LocalVoidItem || heldItem instanceof WaystoneDebuggerItem) {
-            return ActionResult.PASS;
-        }
 
         WaystoneBlockEntity blockEntity = (WaystoneBlockEntity) world.getBlockEntity(openPos);
         if (blockEntity == null) {
@@ -277,8 +267,8 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
             }
             return ActionResult.success(false);
         }
-        if (!FabricWaystones.CONFIG.discover_waystone_on_map_use() && FabricLoader.getInstance().isModLoaded("pinlib") && PinlibPlugin.tryUseOnMarkableBlock(player.getStackInHand(hand), world, openPos))
-            return ActionResult.SUCCESS;
+//        if (!FabricWaystones.CONFIG.discover_waystone_on_map_use() && FabricLoader.getInstance().isModLoaded("pinlib") && PinlibPlugin.tryUseOnMarkableBlock(player.getStackInHand(hand), world, openPos))
+//            return ActionResult.SUCCESS;
 
         FabricWaystones.WAYSTONE_STORAGE.tryAddWaystone(blockEntity);
         PlayerEntityMixinAccess playerAccess = (PlayerEntityMixinAccess) player;
@@ -294,7 +284,7 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
                             "fwaystones.missing_discover_item",
                             discoverAmount,
                             Text.translatable(discoverItem.getTranslationKey()).styled(style ->
-                                style.withColor(TextColor.parse(Text.translatable("fwaystones.missing_discover_item.arg_color").getString()).get().left().get())
+                                style.withColor(TextColor.parse(Text.translatable("fwaystones.missing_discover_item.arg_color").getString()).getOrThrow())
                             )
                         ), false);
                         return ActionResult.FAIL;
@@ -304,15 +294,15 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
                             "fwaystones.discover_item_paid",
                             discoverAmount,
                             Text.translatable(discoverItem.getTranslationKey()).styled(style ->
-                                style.withColor(TextColor.parse(Text.translatable("fwaystones.discover_item_paid.arg_color").getString()).get().left().get())
+                                style.withColor(TextColor.parse(Text.translatable("fwaystones.discover_item_paid.arg_color").getString()).getOrThrow())
                             )
                         ), false);
                     }
                 }
                 player.sendMessage(Text.translatable(
                     "fwaystones.discover_waystone",
                     Text.literal(blockEntity.getWaystoneName()).styled(style ->
-                        style.withColor(TextColor.parse(Text.translatable("fwaystones.discover_waystone.arg_color").getString()).get().left().get())
+                        style.withColor(TextColor.parse(Text.translatable("fwaystones.discover_waystone.arg_color").getString()).getOrThrow())
                     )
                 ), false);
             }