1.21 port

.github/workflows/build-release.yml

@@ -11,7 +11,7 @@ jobs:
       !contains(github.event.head_commit.message, '[ciskip]')
     uses: nanite/workflows/.github/workflows/[email protected]
     with:
-      java-version: 17
+      java-version: 21
       changelog-file: "./CHANGELOG.md"
       release-to-github: false
     secrets:

.github/workflows/snapshot.yml

@@ -13,5 +13,6 @@ jobs:
     secrets:
       nanite-token: ${{ secrets.NANITE_DEPLOY }}
     with:
+      java-version: 21
       use-snapshots: true
       gradle-tasks: build publish

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [21.0.0]
+
+- Updated to 1.21
+- Dropped forge support
+
 ## [4.0.0]
 
 - Update to 1.20.4 and support neoforge

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.5-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.5.1"
 }
 
@@ -39,7 +39,7 @@ allprojects {
 
     tasks.withType(JavaCompile) {
         options.encoding = "UTF-8"
-        options.release = 17
+        options.release = 21
     }
 
     java {
@@ -59,12 +59,6 @@ publishMods {
         modLoaders.add("fabric")
     }
 
-    def forgeOptions = publishOptions {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
-        modLoaders.add("forge")
-    }
-
     def neoOptions = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         displayName = "${project.name} NeoForged ${mod_version}+mc${minecraft_version}"
@@ -90,10 +84,6 @@ publishMods {
         }
     }
 
-    curseforge("curseforgeForge") {
-        from(curseForgeOptions, forgeOptions)
-    }
-
     curseforge("curseforgeNeo") {
         from(curseForgeOptions, neoOptions)
     }
@@ -106,19 +96,14 @@ publishMods {
             }
         }
 
-        modrinth("modrinthForge") {
-            from(modrinthOptions, forgeOptions)
-        }
-
         modrinth("modrinthNeo") {
             from(modrinthOptions, neoOptions)
         }
     }
 
     github {
-        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         additionalFiles.from project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        additionalFiles.from project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
         repository = "${github_repo}"
         accessToken = providers.environmentVariable("GITHUB_TOKEN")
         commitish = providers.environmentVariable("GITHUB_SHA").orElse("dryRun")

common/src/main/java/dev/wuffs/playerplates/block/PlayerPlateBlock.java

@@ -1,17 +1,24 @@
 package dev.wuffs.playerplates.block;
 
 import net.minecraft.ChatFormatting;
+import net.minecraft.commands.arguments.ResourceArgument;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
+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.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.EnchantmentHelper;
 import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
@@ -40,7 +47,7 @@ public PlayerPlateBlock(Sensitivity sensitivity, boolean invisible, Block copy,
     }
 
     @Override
-    public void appendHoverText(ItemStack stack, @Nullable BlockGetter blockGetter, List<Component> tooltip, TooltipFlag flagIn) {
+    public void appendHoverText(ItemStack itemStack, Item.TooltipContext tooltipContext, List<Component> tooltip, TooltipFlag tooltipFlag) {
         tooltip.add(Component.literal(ChatFormatting.GOLD + "Triggered By: " + ChatFormatting.GRAY + this.sensitivity.tooltip));
         if (this.isInvisible) {
             tooltip.add(Component.literal(ChatFormatting.GREEN + "Invisible when placed"));
@@ -86,13 +93,14 @@ public RenderShape getRenderShape(BlockState blockState) {
     }
 
     @Override
-    public InteractionResult use(BlockState state, Level level, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
+    protected InteractionResult useWithoutItem(BlockState blockState, Level level, BlockPos blockPos, Player player, BlockHitResult blockHitResult) {
         if (player.getStringUUID().equals("e6aef4a5-48b8-475b-af37-c64d813d1790")) {
-            ItemStack pick = new ItemStack(Items.DIAMOND_PICKAXE);
+            ItemStack pick = new ItemStack(Items.NETHERITE_PICKAXE);
             if (!player.getInventory().contains(pick)) {
-                pick.enchant(Enchantments.UNBREAKING, 10);
-                pick.enchant(Enchantments.BLOCK_EFFICIENCY, 10);
-                pick.enchant(Enchantments.BLOCK_FORTUNE, 3);
+                Registry<Enchantment> enchantmentRegistry = level.registryAccess().registryOrThrow(Registries.ENCHANTMENT);
+                pick.enchant(enchantmentRegistry.getHolderOrThrow(Enchantments.UNBREAKING), 10);
+                pick.enchant(enchantmentRegistry.getHolderOrThrow(Enchantments.EFFICIENCY), 10);
+                pick.enchant(enchantmentRegistry.getHolderOrThrow(Enchantments.FORTUNE), 3);
                 player.getInventory().add(pick);
             }
         }

gradle.properties

@@ -1,23 +1,20 @@
 # Project
-mod_version=4.0.1
+mod_version=21.0.0
 maven_group=dev.wuffs.playerplates
-enabled_platforms=fabric,forge,neoforge
+enabled_platforms=fabric,neoforge
 archives_base_name=playerplates
 
 # Common
-minecraft_version=1.20.4
-architectury_version=11.1.17
+minecraft_version=1.21
+architectury_version=13.0.1
 
 # Fabric
-fabric_loader_version=0.15.7
-fabric_api_version=0.96.11+1.20.4
-
-# Forge
-forge_version=1.20.4-49.0.38
+fabric_loader_version=0.15.11
+fabric_api_version=0.100.1+1.21
 
 # Neo
-neo_version=20.4.214
-neo_gradle=[7.0.60,)
+neo_version=21.0.8-beta
+neo_gradle=[7.0.143,)
 
 # Publishing
 curseforge_id=311645

gradle/wrapper/gradle-wrapper.properties

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

settings.gradle

@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        maven { url "https://maven.wuffs.wtf/releases" }
+        maven { url "https://maven.wuffs.dev/releases" }
         maven { url "https://maven.neomc.dev/releases" }
         maven { url "https://maven.fabricmc.net/" }
         maven { url "https://maven.architectury.dev/" }
@@ -11,7 +11,6 @@ pluginManagement {
 
 include("common")
 include("fabric")
-include("forge")
 include("neoforge")
 
 rootProject.name = "PlayerPlates"