Merge pull request #894 from Gu-ZT/releases/1.20.1

修复海绵芽球合成海绵配方
Anvil-Dev · Jun 12, 2024 · 1aa3216 · 1aa3216
2 parents e5d3a50 + 08d8d80
commit 1aa3216
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 26 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,8 +17,6 @@ jobs:
     uses: ./.github/workflows/gametest.yml
   build:
     runs-on: ubuntu-latest
-    needs:
-      - gametest
     env:
       CI_BUILD: true
       PR_BUILD: false

diff --git a/.github/workflows/gametest.yml b/.github/workflows/gametest.yml
@@ -24,5 +24,8 @@ jobs:
       - name: Build with Gradle
         uses: gradle/actions/setup-gradle@v3
 
-      - name: Run GameTest
+      - name: Run Fabric GameTest
         run: ./gradlew anvilcraft-fabric:runGameTestServer
+
+      - name: Run Forge GameTest
+        run: ./gradlew anvilcraft-forge:runGameTestServer
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
@@ -15,8 +15,6 @@ jobs:
     uses: ./.github/workflows/gametest.yml
   build:
     runs-on: ubuntu-latest
-    needs:
-      - gametest
     env:
       CI_BUILD: true
       PR_BUILD: true

diff --git a/...n/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesLoader.java b/...n/java/dev/dubhe/anvilcraft/data/generator/recipe/BulgingAndCrystallizeRecipesLoader.java
@@ -32,7 +32,7 @@ public static void init(RegistrateRecipeProvider provider) {
         bulging(Items.FIRE_CORAL, Items.FIRE_CORAL_BLOCK);
         bulging(Items.HORN_CORAL, Items.HORN_CORAL_BLOCK);
         bulging(Items.TUBE_CORAL, Items.TUBE_CORAL_BLOCK);
-        bulging(Items.WET_SPONGE, Items.WET_SPONGE, 1);
+        bulging(ModItems.SPONGE_GEMMULE, Items.WET_SPONGE, 1);
         bulging(ModItems.FLOUR, ModItems.DOUGH);
         crystallize(ModItems.SEA_HEART_SHELL_SHARD, ModItems.PRISMARINE_CLUSTER, 1);
     }

diff --git a/...src/generated/resources/data/anvilcraft/advancements/recipes/misc/bulging/wet_sponge.json b/...src/generated/resources/data/anvilcraft/advancements/recipes/misc/bulging/wet_sponge.json
@@ -1,28 +1,28 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "anvilcraft:bulging/wet_sponge"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    },
-    "has_wet_sponge": {
+    "has_sponge_gemmule": {
       "conditions": {
         "items": [
           {
             "items": [
-              "minecraft:wet_sponge"
+              "anvilcraft:sponge_gemmule"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:bulging/wet_sponge"
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_wet_sponge",
+      "has_sponge_gemmule",
       "has_the_recipe"
     ]
   ],

diff --git a/fabric/src/generated/resources/data/anvilcraft/recipes/bulging/wet_sponge.json b/fabric/src/generated/resources/data/anvilcraft/recipes/bulging/wet_sponge.json
@@ -36,7 +36,7 @@
           "min": 1
         },
         "items": [
-          "minecraft:wet_sponge"
+          "anvilcraft:sponge_gemmule"
         ]
       },
       "offset": [

diff --git a/...src/generated/resources/data/anvilcraft/advancements/recipes/misc/bulging/wet_sponge.json b/...src/generated/resources/data/anvilcraft/advancements/recipes/misc/bulging/wet_sponge.json
@@ -1,28 +1,28 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_the_recipe": {
-      "conditions": {
-        "recipe": "anvilcraft:bulging/wet_sponge"
-      },
-      "trigger": "minecraft:recipe_unlocked"
-    },
-    "has_wet_sponge": {
+    "has_sponge_gemmule": {
       "conditions": {
         "items": [
           {
             "items": [
-              "minecraft:wet_sponge"
+              "anvilcraft:sponge_gemmule"
             ]
           }
         ]
       },
       "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "anvilcraft:bulging/wet_sponge"
+      },
+      "trigger": "minecraft:recipe_unlocked"
     }
   },
   "requirements": [
     [
-      "has_wet_sponge",
+      "has_sponge_gemmule",
       "has_the_recipe"
     ]
   ],

diff --git a/forge/src/generated/resources/data/anvilcraft/recipes/bulging/wet_sponge.json b/forge/src/generated/resources/data/anvilcraft/recipes/bulging/wet_sponge.json
@@ -36,7 +36,7 @@
           "min": 1
         },
         "items": [
-          "minecraft:wet_sponge"
+          "anvilcraft:sponge_gemmule"
         ]
       },
       "offset": [