Update to 1.20.2

terrarium-earth · Nov 18, 2023 · 69c0f47 · 69c0f47
1 parent 0cf0c96
commit 69c0f47
Show file tree

Hide file tree

Showing 354 changed files with 1,068 additions and 1,077 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -37,23 +37,23 @@ jobs:
           MAVEN_USER: ${{ secrets.MAVEN_USERNAME }}
           MAVEN_PASS: ${{ secrets.MAVEN_PASSWORD }}
 
-      - name: Upload Forge Releases (Curse/Modrinth/Github)
+      - name: Upload NeoForge Releases (Curse/Modrinth/Github)
         id: forge_release
-        if: contains(steps.properties.outputs.enabledPlatforms, 'forge')
-        uses: Kir-Antipov/mc-publish@v3.2
+        if: contains(steps.properties.outputs.enabledPlatforms, 'neoforge')
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           curseforge-id: ${{ vars.CURSE_ID }}
           curseforge-token: ${{ secrets.CURSE_TOKEN }}
 
           modrinth-id: ${{ vars.MODRINTH_ID }}
           modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
 
-          files: ./forge/build/libs/!(*-@(dev|sources|dev-shadow)).jar
-          name: "[Forge] Handcrafted ${{ steps.properties.outputs.version }}"
+          files: ./neoforge/build/libs/!(*-@(dev|sources|dev-shadow)).jar
+          name: "[NeoForge] Handcrafted ${{ steps.properties.outputs.version }}"
           version: ${{ steps.properties.outputs.version }}
           version-type: release
           changelog-file: changelog.md
-          loaders: forge
+          loaders: neoforge
           game-versions: ${{ steps.properties.outputs.minecraftVersion }}
           version-resolver: exact
 
@@ -63,7 +63,7 @@ jobs:
       - name: Upload Fabric Releases (Curse/Modrinth/Github)
         id: fabric_release
         if: contains(steps.properties.outputs.enabledPlatforms, 'fabric')
-        uses: Kir-Antipov/mc-publish@v3.2
+        uses: Kir-Antipov/mc-publish@v3.3
         with:
           curseforge-id: ${{ vars.CURSE_ID }}
           curseforge-token: ${{ secrets.CURSE_TOKEN }}

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -37,9 +37,8 @@ subprojects {
     }
 
     repositories {
-        maven(url = "https://maven.architectury.dev/")
-        maven(url = "https://maven.minecraftforge.net/")
         maven(url = "https://maven.resourcefulbees.com/repository/maven-public/")
+        maven(url = "https://maven.neoforged.net/releases/")
     }
 
     dependencies {
@@ -53,7 +52,7 @@ subprojects {
 
             officialMojangMappings()
 
-            parchment(create(group = "org.parchmentmc.data", name = "parchment-$minecraftVersion", version = parchmentVersion))
+            parchment(create(group = "org.parchmentmc.data", name = "parchment-1.20.1", version = parchmentVersion))
         })
 
         compileOnly(group = "com.teamresourceful", name = "yabn", version = "1.0.3")

diff --git a/common/src/main/generated/resources/.cache/2857e23e27fe7a23fbd858a2f2d9cd46438d9fe5 b/common/src/main/generated/resources/.cache/2857e23e27fe7a23fbd858a2f2d9cd46438d9fe5
@@ -1,2 +1,2 @@
-// 1.20.1	2023-10-07T00:09:10.811082	Tags for minecraft:painting_variant mod id handcrafted
+// 1.20.2	2023-11-18T03:09:19.528106	Tags for minecraft:painting_variant mod id handcrafted
 b3492d6a0655791539fc1fe06182c10d06b88fd8 data/handcrafted/tags/painting_variant/paintings.json
diff --git a/common/src/main/generated/resources/.cache/34e724f7bfdec2bf14377da0e28a0c3601a9c94f b/common/src/main/generated/resources/.cache/34e724f7bfdec2bf14377da0e28a0c3601a9c94f
@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-25T22:19:18.989458	Block States: handcrafted
+// 1.20.2	2023-11-18T03:09:19.490031	Block States: handcrafted
 4556e77443b8e7f536dcacb6881a60d13de5d55a assets/handcrafted/blockstates/acacia_bench.json
 32091dd9c08b0f170cebe2067e4d6ef0478ed3fe assets/handcrafted/blockstates/acacia_chair.json
 999c6f1b88ed2de9733d7c7b8f9a08c55876183b assets/handcrafted/blockstates/acacia_corner_trim.json

diff --git a/common/src/main/generated/resources/.cache/4f820cfde673b8b178d1e7534bbfbfc8c92e2fff b/common/src/main/generated/resources/.cache/4f820cfde673b8b178d1e7534bbfbfc8c92e2fff
@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-08T03:31:19.783161	Item Models: handcrafted
+// 1.20.2	2023-11-18T03:09:19.531259	Item Models: handcrafted
 e9d16e5f09deec53e52553e36264decb20a179cc assets/handcrafted/models/item/black_cushion.json
 becb4b2a271295008859164f3bcf70b01d5f5fb3 assets/handcrafted/models/item/black_sheet.json
 ca3214678d958a6a3b68a642a71d38dde6dcd5d2 assets/handcrafted/models/item/blue_bowl.json

diff --git a/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/common/src/main/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-25T22:01:01.05231	Loot Tables
+// 1.20.2	2023-11-18T03:09:19.527217	Loot Tables
 7157ae2c0301789bf203e3e3977b19532045fcb5 data/handcrafted/loot_tables/blocks/acacia_bench.json
 85930fd231a79fede542ea32416b227dfd007fbc data/handcrafted/loot_tables/blocks/acacia_chair.json
 064777c5162406e4c752a94aae29bde36b1c2e2b data/handcrafted/loot_tables/blocks/acacia_corner_trim.json

diff --git a/common/src/main/generated/resources/.cache/9c93d98e764faf9e6b3a9f796e820b558c226b9f b/common/src/main/generated/resources/.cache/9c93d98e764faf9e6b3a9f796e820b558c226b9f
@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-26T11:39:21.085504	Tags for minecraft:block mod id handcrafted
+// 1.20.2	2023-11-18T03:09:19.526402	Tags for minecraft:block mod id handcrafted
 148d9202ace672cfdf451a46397702b32fab9450 data/handcrafted/tags/blocks/benches.json
 3662d7ac15380cec631c2eb872b6cbbb69072d62 data/handcrafted/tags/blocks/bowls.json
 d23ee811738879d0b22d489c76f6947f6b0ccf40 data/handcrafted/tags/blocks/chairs.json

diff --git a/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e b/common/src/main/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
diff --git a/common/src/main/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/common/src/main/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.20.1	2023-10-25T22:01:01.055336	Languages: en_us
+// 1.20.2	2023-11-18T03:09:19.531992	Languages: en_us
 11aaed5eb0344370caafb939742db588438f557a assets/handcrafted/lang/en_us.json
diff --git a/common/src/main/generated/resources/.cache/d60991a6fb71d37d1d9acc66e836564e99560c20 b/common/src/main/generated/resources/.cache/d60991a6fb71d37d1d9acc66e836564e99560c20
@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-08T16:03:14.054545	Handcrafted Highlight States
+// 1.20.2	2023-11-18T03:09:19.524886	Handcrafted Highlight States
 84684d75471e333594f581c3e1f93a676e1eb654 assets/handcrafted/resourcefullib/highlights/acacia_bench.json
 4b76814a8aed1e8ffcfee74a219b34a7c3731e06 assets/handcrafted/resourcefullib/highlights/acacia_chair.json
 7eab3e037da8ba9a4bf3f4027454e394a4931c1a assets/handcrafted/resourcefullib/highlights/acacia_couch.json

diff --git a/common/src/main/generated/resources/.cache/d92fab55179a6614c04306098c1491a4f494f922 b/common/src/main/generated/resources/.cache/d92fab55179a6614c04306098c1491a4f494f922
@@ -1,4 +1,4 @@
-// 1.20.1	2023-10-25T22:01:01.055079	Tags for minecraft:item mod id handcrafted
+// 1.20.2	2023-11-18T03:09:19.531108	Tags for minecraft:item mod id handcrafted
 148d9202ace672cfdf451a46397702b32fab9450 data/handcrafted/tags/items/benches.json
 3662d7ac15380cec631c2eb872b6cbbb69072d62 data/handcrafted/tags/items/bowls.json
 d23ee811738879d0b22d489c76f6947f6b0ccf40 data/handcrafted/tags/items/chairs.json

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_bench.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_bench.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_bench",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_bench"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_chair.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_chair.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_chair",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_chair"
     ]
   ],
   "rewards": {

diff --git a/...in/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json b/...in/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_corner_trim.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_corner_trim",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_corner_trim"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_couch.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_couch.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_couch",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_couch"
     ]
   ],
   "rewards": {

diff --git a/...c/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_counter.json b/...c/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_counter.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_counter",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_counter"
     ]
   ],
   "rewards": {

diff --git a/.../main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_cupboard.json b/.../main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_cupboard.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_cupboard",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_cupboard"
     ]
   ],
   "rewards": {

diff --git a/.../src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_desk.json b/.../src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_desk.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_desk",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_desk"
     ]
   ],
   "rewards": {

diff --git a/...n/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_dining_bench.json b/...n/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_dining_bench.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_dining_bench",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_dining_bench"
     ]
   ],
   "rewards": {

diff --git a/...rc/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_drawer.json b/...rc/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_drawer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_drawer",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_drawer"
     ]
   ],
   "rewards": {

diff --git a/...main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_fancy_bed.json b/...main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_fancy_bed.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_fancy_bed",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_fancy_bed"
     ]
   ],
   "rewards": {

diff --git a/...ain/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_nightstand.json b/...ain/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_nightstand.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_nightstand",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_nightstand"
     ]
   ],
   "rewards": {

diff --git a/...in/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_pillar_trim.json b/...in/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_pillar_trim.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_pillar_trim",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_pillar_trim"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_shelf.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_shelf.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_shelf",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_shelf"
     ]
   ],
   "rewards": {

diff --git a/...ain/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_side_table.json b/...ain/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_side_table.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_side_table",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_side_table"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_table.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/acacia_table.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_acacia_table",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_acacia_table"
     ]
   ],
   "rewards": {

diff --git a/.../generated/resources/data/handcrafted/advancements/recipes/misc/andesite_corner_trim.json b/.../generated/resources/data/handcrafted/advancements/recipes/misc/andesite_corner_trim.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_andesite_corner_trim",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_andesite_corner_trim"
     ]
   ],
   "rewards": {

diff --git a/.../generated/resources/data/handcrafted/advancements/recipes/misc/andesite_pillar_trim.json b/.../generated/resources/data/handcrafted/advancements/recipes/misc/andesite_pillar_trim.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_andesite_pillar_trim",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_andesite_pillar_trim"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_bench.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_bench.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_bench",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_bench"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_chair.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_chair.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_chair",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_chair"
     ]
   ],
   "rewards": {

diff --git a/...in/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_corner_trim.json b/...in/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_corner_trim.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_corner_trim",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_corner_trim"
     ]
   ],
   "rewards": {

diff --git a/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_couch.json b/...src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_couch.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_couch",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_couch"
     ]
   ],
   "rewards": {

diff --git a/...c/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_counter.json b/...c/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_counter.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_counter",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_counter"
     ]
   ],
   "rewards": {

diff --git a/.../main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_cupboard.json b/.../main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_cupboard.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_cupboard",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_cupboard"
     ]
   ],
   "rewards": {

diff --git a/.../src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_desk.json b/.../src/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_desk.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_desk",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_desk"
     ]
   ],
   "rewards": {

diff --git a/...n/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_dining_bench.json b/...n/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_dining_bench.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_dining_bench",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_dining_bench"
     ]
   ],
   "rewards": {

diff --git a/...rc/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_drawer.json b/...rc/main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_drawer.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_drawer",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_drawer"
     ]
   ],
   "rewards": {

diff --git a/...main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_fancy_bed.json b/...main/generated/resources/data/handcrafted/advancements/recipes/misc/bamboo_fancy_bed.json
@@ -22,8 +22,8 @@
   },
   "requirements": [
     [
-      "has_bamboo_fancy_bed",
-      "has_the_recipe"
+      "has_the_recipe",
+      "has_bamboo_fancy_bed"
     ]
   ],
   "rewards": {