Some fixes spotted in backporting.

quinn-semele · Apr 17, 2024 · c0b207a · c0b207a
1 parent 2824140
commit c0b207a
Show file tree

Hide file tree

Showing 12 changed files with 212 additions and 134 deletions.
diff --git a/buildSrc/src/main/kotlin/semele/quinn/expandedstorage/plugin/Versions.kt b/buildSrc/src/main/kotlin/semele/quinn/expandedstorage/plugin/Versions.kt
@@ -3,7 +3,7 @@ package semele.quinn.expandedstorage.plugin
 import org.gradle.api.JavaVersion
 
 object Versions {
-    const val EXPANDEDSTORAGE = "10.3.0-beta.4"
+    const val EXPANDEDSTORAGE = "10.3.0-beta.5"
 
     // Generic
     val JAVA = JavaVersion.VERSION_17

diff --git a/changelog.md b/changelog.md
@@ -1,2 +1,2 @@
-- Lowered Fabric API requirement
-- Removed some unused code.
+- Fix the vanilla mini barrel not having a conversion recipe.
+- Fix the forge specific mixin file not having the correct refmap name set.
diff --git a/.../main/java/compasses/expandedstorage/impl/datagen/providers/ConversionRecipeProvider.java b/.../main/java/compasses/expandedstorage/impl/datagen/providers/ConversionRecipeProvider.java
@@ -416,6 +416,7 @@ protected void registerBlockRecipes(RecipeCondition isWoodBarrel, RecipeConditio
             sparrowReversibleBlockThemeSwap("obsidian_mini_chest", ModBlocks.OBSIDIAN_MINI_CHEST);
             sparrowReversibleBlockThemeSwap("netherite_mini_chest", ModBlocks.NETHERITE_MINI_CHEST);
 
+            sparrowReversibleBlockThemeSwap("mini_barrel", ModBlocks.MINI_BARREL);
             sparrowReversibleBlockThemeSwap("copper_mini_barrel", ModBlocks.COPPER_MINI_BARREL);
             sparrowReversibleBlockThemeSwap("exposed_copper_mini_barrel", ModBlocks.EXPOSED_COPPER_MINI_BARREL);
             sparrowReversibleBlockThemeSwap("weathered_copper_mini_barrel", ModBlocks.WEATHERED_COPPER_MINI_BARREL);

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -80,9 +80,9 @@ val modDependencies = FreezableDependencyList().apply {
     }
 
     add("rei", cfDependencyName = "roughly-enough-items") {
-        compileOnly("me.shedaniel:RoughlyEnoughItems-api:${Versions.REI}")
-        compileOnly("me.shedaniel:RoughlyEnoughItems-api-forge:${Versions.REI}")
-        runtimeOnly("me.shedaniel:RoughlyEnoughItems-forge:${Versions.REI}")
+//        compileOnly("me.shedaniel:RoughlyEnoughItems-api:${Versions.REI}")
+//        compileOnly("me.shedaniel:RoughlyEnoughItems-api-forge:${Versions.REI}")
+        implementation("me.shedaniel:RoughlyEnoughItems-forge:${Versions.REI}")
     }
 
     freeze()

diff --git a/forge/src/generated/resources/.cache/2bf785e149f1cd147bd4bcadec1942ad152e4720 b/forge/src/generated/resources/.cache/2bf785e149f1cd147bd4bcadec1942ad152e4720
@@ -1,4 +1,4 @@
-// 1.20.1	2024-03-19T15:49:38.4509755	Expanded Storage - Conversion Recipes
+// 1.20.1	2024-04-17T17:24:38.1225317	Expanded Storage - Conversion Recipes
 2e29b788bccc1764fd2a6e4a851868fda41e31e3 data/expandedstorage/conversion_recipes/block/bamboo_to_moss_chest.json
 886d1f4ae902a906f8e05101bada0c6d1cbcf2f2 data/expandedstorage/conversion_recipes/block/candy_cane_to_green_mini_present.json
 1259c6aa6fe53d2f33bd6d3d7b581f76933f0234 data/expandedstorage/conversion_recipes/block/candy_cane_to_green_mini_present_with_sparrow.json
@@ -57,6 +57,8 @@ c35f014f97c6baec2e2b250ba0682f38c1aa917c data/expandedstorage/conversion_recipes
 3cc33a3f79f61282204b18fc2a00c8e38cf7fb44 data/expandedstorage/conversion_recipes/block/iron_to_old_iron_chest.json
 c1e07d4c076434fc30422d1aeace037eb9b0e554 data/expandedstorage/conversion_recipes/block/lavender_to_pink_amethyst_mini_present.json
 3fe3aacd58c032c29f066399aa35f09fd860087a data/expandedstorage/conversion_recipes/block/lavender_to_pink_amethyst_mini_present_with_sparrow.json
+de6b141e37cb33587953fa167e091adcae739063 data/expandedstorage/conversion_recipes/block/mini_barrel_to_without_sparrow.json
+6148d6e55d765e292109ab23a1cf93f81d8e14da data/expandedstorage/conversion_recipes/block/mini_barrel_to_with_sparrow.json
 7371e19e634eb5bb3e4d26cab40b7f96dc08b9c2 data/expandedstorage/conversion_recipes/block/moss_to_old_wood_chest.json
 09fd1c8b2853fce54d226e4bce70e0c8efb5b88d data/expandedstorage/conversion_recipes/block/netherite_mini_barrel_to_without_sparrow.json
 a96444cd8c21ed60be5fc384af1bc231432093c2 data/expandedstorage/conversion_recipes/block/netherite_mini_barrel_to_with_sparrow.json

diff --git a/.../resources/data/expandedstorage/conversion_recipes/block/mini_barrel_to_with_sparrow.json b/.../resources/data/expandedstorage/conversion_recipes/block/mini_barrel_to_with_sparrow.json
@@ -0,0 +1,19 @@
+{
+  "type": "expandedstorage:block_conversion",
+  "inputs": {
+    "id": "expandedstorage:mini_barrel",
+    "state": {
+      "sparrow": "false"
+    }
+  },
+  "result": {
+    "id": "expandedstorage:mini_barrel",
+    "state": {
+      "sparrow": "true"
+    }
+  },
+  "tool": {
+    "id": "expandedstorage:storage_mutator",
+    "name": "sparrow"
+  }
+}
diff --git a/...sources/data/expandedstorage/conversion_recipes/block/mini_barrel_to_without_sparrow.json b/...sources/data/expandedstorage/conversion_recipes/block/mini_barrel_to_without_sparrow.json
@@ -0,0 +1,18 @@
+{
+  "type": "expandedstorage:block_conversion",
+  "inputs": {
+    "id": "expandedstorage:mini_barrel",
+    "state": {
+      "sparrow": "true"
+    }
+  },
+  "result": {
+    "id": "expandedstorage:mini_barrel",
+    "state": {
+      "sparrow": "false"
+    }
+  },
+  "tool": {
+    "id": "expandedstorage:storage_mutator"
+  }
+}
diff --git a/forge/src/main/resources/expandedstorage-forge.mixins.json b/forge/src/main/resources/expandedstorage-forge.mixins.json
@@ -11,5 +11,5 @@
   ],
   "injectors": { "defaultRequire": 1 },
   "minVersion": "0.8",
-  "refmap": "expandedstorage-refmap.json"
+  "refmap": "expandedstorage.refmap.json"
 }
diff --git a/quilt/build.gradle.kts b/quilt/build.gradle.kts
@@ -60,4 +60,3 @@ dependencies {
         }
     }
 }
-