fixed 1.20

infernalstudios · Apr 7, 2024 · fcf2ab0 · fcf2ab0
1 parent 640bfa7
commit fcf2ab0
Show file tree

Hide file tree

Showing 294 changed files with 592 additions and 586 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,13 +18,17 @@ jobs:
         uses: actions/checkout@master
 
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v2
 
-      - uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'adopt'
           java-version: '17'
           cache: 'gradle'
+          cache-dependency-path: |
+            **/*.gradle
+            **/build.properties
+            **/gradle.properties
 
       - name: Build
         run: ./gradlew build
@@ -36,7 +40,8 @@ jobs:
           mv */build/libs/*.jar build/libs -v
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: build-artifacts
           path: build/libs/
+          if-no-files-found: error
diff --git a/1.20/build.properties b/1.20/build.properties
@@ -1,5 +1,5 @@
 MINECRAFT_VERSION=1.20.1
-FORGE_VERSION=47.1.0
+FORGE_VERSION=47.2.0
 MAPPINGS_CHANNEL=official
 MAPPINGS_VERSION=1.20.1
 JAVA_LANG_VERSION=17
diff --git a/1.20/src/generated/resources/.cache/2a7bbf3a9ab5dc916a93448df50d9163b8c9131d b/1.20/src/generated/resources/.cache/2a7bbf3a9ab5dc916a93448df50d9163b8c9131d
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/absorber.json b/1.20/src/generated/resources/assets/nebs/models/item/absorber.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/absorber"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/acquisition.json b/1.20/src/generated/resources/assets/nebs/models/item/acquisition.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/acquisition"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/acrobat_chest.json b/1.20/src/generated/resources/assets/nebs/models/item/acrobat_chest.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/acrobat_chest"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/acrobat_legs.json b/1.20/src/generated/resources/assets/nebs/models/item/acrobat_legs.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/acrobat_legs"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/aerial_affinity.json b/1.20/src/generated/resources/assets/nebs/models/item/aerial_affinity.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/aerial_affinity"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/agility.json b/1.20/src/generated/resources/assets/nebs/models/item/agility.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/agility"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/air_affinity.json b/1.20/src/generated/resources/assets/nebs/models/item/air_affinity.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/air_affinity"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/air_skills.json b/1.20/src/generated/resources/assets/nebs/models/item/air_skills.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/air_skills"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/alleviating.json b/1.20/src/generated/resources/assets/nebs/models/item/alleviating.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/alleviating"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/amphibious.json b/1.20/src/generated/resources/assets/nebs/models/item/amphibious.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/amphibious"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/angler.json b/1.20/src/generated/resources/assets/nebs/models/item/angler.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/angler"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/aqua_affinity.json b/1.20/src/generated/resources/assets/nebs/models/item/aqua_affinity.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/aqua_affinity"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/archmage.json b/1.20/src/generated/resources/assets/nebs/models/item/archmage.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/archmage"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/artifact.json b/1.20/src/generated/resources/assets/nebs/models/item/artifact.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/artifact"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/auto-smelt.json b/1.20/src/generated/resources/assets/nebs/models/item/auto-smelt.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/auto-smelt"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/backstabbing.json b/1.20/src/generated/resources/assets/nebs/models/item/backstabbing.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/backstabbing"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/bane_of_arthropods.json b/1.20/src/generated/resources/assets/nebs/models/item/bane_of_arthropods.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/bane_of_arthropods"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/bane_of_illagers.json b/1.20/src/generated/resources/assets/nebs/models/item/bane_of_illagers.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/bane_of_illagers"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/bang.json b/1.20/src/generated/resources/assets/nebs/models/item/bang.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/bang"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/berserk.json b/1.20/src/generated/resources/assets/nebs/models/item/berserk.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/berserk"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/binding_curse.json b/1.20/src/generated/resources/assets/nebs/models/item/binding_curse.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/binding_curse"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/blast_protection.json b/1.20/src/generated/resources/assets/nebs/models/item/blast_protection.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/blast_protection"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/blazing.json b/1.20/src/generated/resources/assets/nebs/models/item/blazing.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/blazing"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/blazing_protection.json b/1.20/src/generated/resources/assets/nebs/models/item/blazing_protection.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/blazing_protection"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/blazing_walker.json b/1.20/src/generated/resources/assets/nebs/models/item/blazing_walker.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/blazing_walker"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/blight_curse.json b/1.20/src/generated/resources/assets/nebs/models/item/blight_curse.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/blight_curse"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/board_return.json b/1.20/src/generated/resources/assets/nebs/models/item/board_return.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/board_return"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/brace.json b/1.20/src/generated/resources/assets/nebs/models/item/brace.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/brace"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/breaking_curse.json b/1.20/src/generated/resources/assets/nebs/models/item/breaking_curse.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/breaking_curse"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/bubbling.json b/1.20/src/generated/resources/assets/nebs/models/item/bubbling.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/bubbling"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/bulwark.json b/1.20/src/generated/resources/assets/nebs/models/item/bulwark.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/bulwark"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/butchering.json b/1.20/src/generated/resources/assets/nebs/models/item/butchering.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/butchering"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/capacity.json b/1.20/src/generated/resources/assets/nebs/models/item/capacity.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/capacity"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/capturing.json b/1.20/src/generated/resources/assets/nebs/models/item/capturing.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/capturing"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/cavalier.json b/1.20/src/generated/resources/assets/nebs/models/item/cavalier.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/cavalier"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/chain_lightning.json b/1.20/src/generated/resources/assets/nebs/models/item/chain_lightning.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/chain_lightning"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/channeling.json b/1.20/src/generated/resources/assets/nebs/models/item/channeling.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/channeling"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/charisma.json b/1.20/src/generated/resources/assets/nebs/models/item/charisma.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/charisma"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/cleaving.json b/1.20/src/generated/resources/assets/nebs/models/item/cleaving.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/cleaving"
   }
 }
diff --git a/1.20/src/generated/resources/assets/nebs/models/item/cloudskipper.json b/1.20/src/generated/resources/assets/nebs/models/item/cloudskipper.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "minecraft:item/enchanted_book"
+    "layer0": "nebs:item/cloudskipper"
   }
 }