feat: 1.21.1 support (#418)

* feat: initial 1.21.1 support

* chore: move rrp logic into new library mod (YARRP)

* feat: add more links to modmenu

* chore: add json formatter

* fix: crash on NeoForge startup

* fix: compat with curios

* fix(curios): make sure slot is always within range

Author: RubixDev

.github/workflows/release.yml

@@ -172,6 +172,7 @@ jobs:
         run: |
           echo 'value<<EOF' >> "$GITHUB_OUTPUT"
           echo 'cloth-config(required){modrinth:9s6osm5g}{curseforge:348521}' >> "$GITHUB_OUTPUT"
+          echo 'yarrp(required){modrinth:Z2RtCqwR}{curseforge:1385339}' >> "$GITHUB_OUTPUT"
           if [ "${{ endsWith(matrix.subproject, '-fabric') }}" = "true" ]; then
               # shellcheck disable=SC2129
               echo 'fabric-api(required){modrinth:P7dR8mSH}{curseforge:306612}' >> "$GITHUB_OUTPUT"

README.md

@@ -15,7 +15,7 @@ This is my vision of the Inventory Update for Minecraft. Of
 [features](#Features) I believe are in line with Mojang's vision and could be
 potentially added to the game.
 
-Available for both Fabric and (Neo)Forge.
+Available for both Fabric and NeoForge.
 
 ## Installation
 

build.gradle.kts

@@ -31,13 +31,19 @@ preprocess {
     // which we would need for strict mappings to work
     strictExtraMappings = false
 
-    val mc12006_common = createNode("1.20.6-common", 1_20_06, "yarn")
     val mc12006_fabric = createNode("1.20.6-fabric", 1_20_06, "yarn")
     val mc12006_neoforge = createNode("1.20.6-neoforge", 1_20_06, "yarn")
 
+    val mc12101_common = createNode("1.21.1-common", 1_21_01, "yarn")
+    val mc12101_fabric = createNode("1.21.1-fabric", 1_21_01, "yarn")
+    val mc12101_neoforge = createNode("1.21.1-neoforge", 1_21_01, "yarn")
+
     // 1.20.6
-    mc12006_common.link(mc12006_fabric, null)
-    mc12006_common.link(mc12006_neoforge, file("versions/mappings-common-neoforge.txt"))
+    mc12101_fabric.link(mc12006_fabric, null)
+    mc12101_neoforge.link(mc12006_neoforge, file("versions/mappings-neoforge-1.21.1-1.20.6.txt"))
+    // 1.21.1
+    mc12101_common.link(mc12101_fabric, null)
+    mc12101_common.link(mc12101_neoforge, file("versions/mappings-common-neoforge.txt"))
 }
 
 spotless {
@@ -46,12 +52,13 @@ spotless {
             "ktlint_standard_no-wildcard-imports" to "disabled",
             "ktlint_standard_blank-line-before-declaration" to "disabled",
             "ktlint_standard_spacing-between-declarations-with-annotations" to "disabled",
+            "ktlint_standard_no-empty-file" to "disabled",
             // these are replaced by the custom rule set
             "ktlint_standard_import-ordering" to "disabled",
             "ktlint_standard_comment-spacing" to "disabled",
             "ktlint_standard_chain-wrapping" to "disabled",
         ),
-    ).customRuleSets(listOf("com.github.RubixDev:ktlint-ruleset-mc-preprocessor:2c5a3687bb"))
+    ).customRuleSets(listOf("com.github.RubixDev:ktlint-ruleset-mc-preprocessor:54d81aa9b4"))
 
     kotlinGradle {
         target("**/*.gradle.kts")
@@ -73,6 +80,10 @@ spotless {
         eclipse("4.31").configFile("eclipse-prefs.xml")
         formatAnnotations()
     }
+    json {
+        target("**/*.json")
+        gson().indentWithSpaces(2)
+    }
 }
 
 tasks.register("buildAndGather") {

common.gradle.kts

@@ -86,6 +86,7 @@ class Props {
     val neoforge_version_range: String by prop
 
     val cloth_version: String by prop
+    val yarrp_version: String by prop
     val clumps_version: String by prop
 
     val early_loading_screen_version: String by prop
@@ -135,11 +136,12 @@ repositories {
 
     // Mixin
     maven("https://repo.spongepowered.org/maven/")
+    // Conditional Mixin
+    maven("https://maven.fallenbreath.me/releases")
     // Cloth Config
     maven("https://maven.shedaniel.me/")
-    // Conditional Mixin
+    // YARRP
     maven("https://jitpack.io")
-    maven("https://maven.fallenbreath.me/releases")
     // Other mods from Modrinth
     maven("https://api.modrinth.com/maven")
 }
@@ -171,6 +173,7 @@ dependencies {
                 exclude(group = "net.fabricmc.fabric-api")
             }
             modCompileOnly("me.fallenbreath:conditional-mixin-common:${props.conditional_mixin_version}")
+            modCompileOnly("com.github.RubixDev.YARRP:yarrp-mc${props.minecraft_version}-fabric:${props.yarrp_version}")
         }
         Loader.FABRIC -> {
             modLocalRuntime("maven.modrinth:early-loading-screen:${props.early_loading_screen_version}")
@@ -185,6 +188,7 @@ dependencies {
             modImplementation("me.shedaniel.cloth:cloth-config-fabric:${props.cloth_version}") {
                 exclude(group = "net.fabricmc.fabric-api")
             }
+            modImplementation("com.github.RubixDev.YARRP:yarrp-mc${props.minecraft_version}-fabric:${props.yarrp_version}")
 
             // other mods we do integration with
             // - Trinkets
@@ -200,6 +204,7 @@ dependencies {
                 exclude(group = "net.neoforged.fancymodloader", module = "loader")
             }
             modImplementation("me.shedaniel.cloth:cloth-config-neoforge:${props.cloth_version}")
+            modImplementation("com.github.RubixDev.YARRP:yarrp-mc${props.minecraft_version}-neoforge:${props.yarrp_version}")
 
             // other mods we do integration with
             // - Curios API
@@ -227,7 +232,14 @@ tasks.named<ProcessResources>("processResources") {
 
     // See https://minecraft.wiki/w/Pack_format#List_of_resource_pack_formats
     val resourcePackVersions = mapOf(
-        12006 to 32,
+        12006 to "32",
+        12101 to "34",
+        12103 to "42",
+        12104 to "46",
+        12105 to "55",
+        12106 to "63",
+        12108 to "64",
+        12110 to "69.0",
     )
 
     val replaceProperties = mapOf(

settings.json

@@ -1,7 +1,9 @@
 {
   "versions": [
-    "1.20.6-common",
     "1.20.6-fabric",
-    "1.20.6-neoforge"
+    "1.20.6-neoforge",
+    "1.21.1-common",
+    "1.21.1-fabric",
+    "1.21.1-neoforge"
   ]
 }

src/main/java/de/rubixdev/inventorio/mixin/PlayerEntityMixin.java

@@ -61,7 +61,7 @@ private void inventorioDisplayOffhand(EquipmentSlot slot, CallbackInfoReturnable
      * hands. First, the offhand is attached to the utility belt, rather than a
      * vanilla slot. Second, a player can swap the main hand and the offhand.
      */
-    @SuppressWarnings({ "unchecked", "MixinExtrasOperationParameters" })
+    @SuppressWarnings("unchecked")
     @WrapOperation(
         method = "equipStack",
         at = @At(
@@ -102,7 +102,7 @@ private <E> E inventorioEquipOffhand(DefaultedList<E> defaultedList, int index,
      */
     @Inject(method = "equipStack", at = @At(value = "RETURN"))
     private void inventorioOnEquipArmor(EquipmentSlot slot, ItemStack stack, CallbackInfo ci) {
-        if (slot.getType() == EquipmentSlot.Type.ARMOR) MixinHelpers
+        if (slot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) MixinHelpers
             .withScreenHandler((PlayerEntity) (Object) this, InventorioScreenHandler::updateDeepPocketsCapacity);
     }
 

src/main/java/de/rubixdev/inventorio/mixin/PlayerManagerMixin.java

@@ -12,6 +12,10 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+//#if MC >= 12101
+import net.minecraft.entity.Entity;
+//#endif
+
 @Mixin(PlayerManager.class)
 public class PlayerManagerMixin {
     /**
@@ -34,9 +38,12 @@ private void inventorioSetPlayerSettings(
      * server to the client
      */
     @Inject(method = "respawnPlayer", at = @At(value = "RETURN"), require = 0)
-    private void inventorioSetPlayerSettings(
+    private void inventorioSetPlayerSettings(/* #if <- hack around formatter */
         ServerPlayerEntity oldPlayer,
         boolean alive,
+        //#if MC >= 12101
+        Entity.RemovalReason removalReason,
+        //#endif
         CallbackInfoReturnable<ServerPlayerEntity> cir
     ) {
         ServerPlayerEntity newPlayer = cir.getReturnValue();

src/main/java/de/rubixdev/inventorio/mixin/accessor/CraftingScreenHandlerAccessor.java

@@ -9,6 +9,12 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Invoker;
 
+//#if MC >= 12101
+import net.minecraft.recipe.CraftingRecipe;
+import net.minecraft.recipe.RecipeEntry;
+import org.jetbrains.annotations.Nullable;
+//#endif
+
 @Mixin(CraftingScreenHandler.class)
 public interface CraftingScreenHandlerAccessor {
     @Invoker("updateResult")
@@ -18,5 +24,8 @@ static void updateTheResult(
         PlayerEntity player,
         RecipeInputInventory craftingInventory,
         CraftingResultInventory resultInventory
+        //#if MC >= 12101
+        , @Nullable RecipeEntry<CraftingRecipe> recipe
+        //#endif
     ) {}
 }

src/main/java/de/rubixdev/inventorio/mixin/client/InGameHudMixinHP.java

@@ -13,15 +13,27 @@
 import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+//#if MC >= 12101
+import net.minecraft.client.render.RenderTickCounter;
+//#endif
+
 @Mixin(value = InGameHud.class, priority = 1500)
 @Environment(EnvType.CLIENT)
 public class InGameHudMixinHP {
     /**
      * This mixin calls the renderer of hotbar addons. Note: this mixin doesn't
-     * work in (Neo)Forge and is substituted with a (Neo)Forge event.
+     * work in NeoForge and is substituted with a NeoForge event.
      */
     @Inject(method = "render", at = @At(value = "RETURN"))
-    private void inventorioRenderHotbarAddons(DrawContext context, float tickDelta, CallbackInfo ci) {
+    private void inventorioRenderHotbarAddons(/* #if <- hack around formatter */
+        DrawContext context,
+        //#if MC >= 12101
+        RenderTickCounter tickCounter,
+        //#else
+        //$$ float tickDelta,
+        //#endif
+        CallbackInfo ci
+    ) {
         HotbarHUDRenderer.INSTANCE.renderHotbarAddons(context);
     }
 

src/main/java/de/rubixdev/inventorio/mixin/client/InGameHudMixinLP.java

@@ -14,6 +14,10 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+//#if MC >= 12101
+import net.minecraft.client.render.RenderTickCounter;
+//#endif
+
 @Mixin(value = InGameHud.class, priority = 99)
 @Environment(EnvType.CLIENT)
 public class InGameHudMixinLP {
@@ -22,12 +26,28 @@ public class InGameHudMixinLP {
      * is selected.
      */
     @Inject(method = "renderHotbar", at = @At(value = "HEAD"), cancellable = true, require = 0)
-    private void inventorioRenderSegmentedHotbar(DrawContext context, float tickDelta, CallbackInfo ci) {
+    private void inventorioRenderSegmentedHotbar(/* #if <- hack around formatter */
+        DrawContext context,
+        //#if MC >= 12101
+        RenderTickCounter tickCounter,
+        //#else
+        //$$ float tickDelta,
+        //#endif
+        CallbackInfo ci
+    ) {
         if (HotbarHUDRenderer.INSTANCE.renderSegmentedHotbar(context)) ci.cancel();
     }
 
     @Inject(method = "renderHotbar", at = @At(value = "RETURN"), require = 0)
-    private void inventorioRenderFunctionOnlySelector(DrawContext context, float tickDelta, CallbackInfo ci) {
+    private void inventorioRenderFunctionOnlySelector(/* #if <- hack around formatter */
+        DrawContext context,
+        //#if MC >= 12101
+        RenderTickCounter tickCounter,
+        //#else
+        //$$ float tickDelta,
+        //#endif
+        CallbackInfo ci
+    ) {
         HotbarHUDRenderer.INSTANCE.renderFunctionOnlySelector(context);
     }