Merge pull request #85 from doc-bok/84-achievements-arent-working

[FIX] Butterfly net achievements work again.
doc-bok · Jan 26, 2024 · 2d1ea33 · 2d1ea33
2 parents e942672 + d5312d0
commit 2d1ea33
Show file tree

Hide file tree

Showing 26 changed files with 79 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 ## Changelog
 
+### 2.0.9 (2024-01-26)
+-   Fixed butterfly net achievements not working
+
+### 2.0.8 (2024-01-14)
+-   Redesigned the buckeye butterfly texture.
+-   Tweaked cabbage and forester textures.
+
+### 2.0.7 (2024-01-13)
+-   Butterfly eggs are now smaller in size.
+
 ### 2.0.6 (2024-01-05)
 -   Fixed shift-clicking recipes.
 

diff --git a/gradle.properties b/gradle.properties
@@ -48,7 +48,7 @@ mod_name=Butterfly Mod
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=All Rights Reserved
 # The mod version. See https://semver.org/
-mod_version=2.0.6
+mod_version=2.0.9
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

diff --git a/src/main/resources/assets/butterflies/models/item/admiral_egg.json b/src/main/resources/assets/butterflies/models/item/admiral_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/admiral_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/buckeye_egg.json b/src/main/resources/assets/butterflies/models/item/buckeye_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/buckeye_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/cabbage_egg.json b/src/main/resources/assets/butterflies/models/item/cabbage_egg.json
@@ -1,6 +1,6 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/cabbage_egg"
   }
-}
+}
diff --git a/src/main/resources/assets/butterflies/models/item/chalkhill_egg.json b/src/main/resources/assets/butterflies/models/item/chalkhill_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/chalkhill_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/clipper_egg.json b/src/main/resources/assets/butterflies/models/item/clipper_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/clipper_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/common_egg.json b/src/main/resources/assets/butterflies/models/item/common_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/common_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/emperor_egg.json b/src/main/resources/assets/butterflies/models/item/emperor_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/emperor_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/forester_egg.json b/src/main/resources/assets/butterflies/models/item/forester_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/forester_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/glasswing_egg.json b/src/main/resources/assets/butterflies/models/item/glasswing_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/glasswing_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/hairstreak_egg.json b/src/main/resources/assets/butterflies/models/item/hairstreak_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/hairstreak_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/heath_egg.json b/src/main/resources/assets/butterflies/models/item/heath_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/heath_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/longwing_egg.json b/src/main/resources/assets/butterflies/models/item/longwing_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/longwing_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/monarch_egg.json b/src/main/resources/assets/butterflies/models/item/monarch_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/monarch_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/morpho_egg.json b/src/main/resources/assets/butterflies/models/item/morpho_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/morpho_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/rainbow_egg.json b/src/main/resources/assets/butterflies/models/item/rainbow_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/rainbow_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/swallowtail_egg.json b/src/main/resources/assets/butterflies/models/item/swallowtail_egg.json
@@ -1,5 +1,5 @@
 {
-  "parent": "item/handheld_rod",
+  "parent": "butterflies:item/template_butterfly_egg",
   "textures": {
     "layer0": "butterflies:item/butterfly_egg/swallowtail_egg"
   }

diff --git a/src/main/resources/assets/butterflies/models/item/template_butterfly_egg.json b/src/main/resources/assets/butterflies/models/item/template_butterfly_egg.json
@@ -0,0 +1,32 @@
+{
+  "parent": "item/generated",
+  "display": {
+    "thirdperson_righthand": {
+      "rotation": [ 0, 0, 0 ],
+      "translation": [ 0, 1.5, 1 ],
+      "scale": [ 0.255, 0.255, 0.255 ]
+    },
+    "firstperson_righthand": {
+      "rotation": [ 0, -90, 25 ],
+      "translation": [ 1.13, 1.6, 1.13],
+      "scale": [ 0.204, 0.204, 0.204 ]
+    },
+    "gui": {
+      "scale": [ 0.45, 0.45, 0.45 ]
+    },
+    "head": {
+      "rotation": [ 0, 180, 0 ],
+      "translation": [ 0, 13, 7],
+      "scale": [ 0.3, 0.3, 0.3 ]
+    },
+    "ground": {
+      "rotation": [ 0, 0, 0 ],
+      "translation": [ 0, 1, 0],
+      "scale":[ 0.15, 0.15, 0.15 ]
+    },
+    "fixed": {
+      "rotation": [ 0, 180, 0 ],
+      "scale": [ 0.3, 0.3, 0.3 ]
+    }
+  }
+}
diff --git a/...in/resources/assets/butterflies/textures/entity/butterfly/butterfly_buckeye.png b/...in/resources/assets/butterflies/textures/entity/butterfly/butterfly_buckeye.png
diff --git a/...in/resources/assets/butterflies/textures/entity/butterfly/butterfly_cabbage.png b/...in/resources/assets/butterflies/textures/entity/butterfly/butterfly_cabbage.png
diff --git a/...n/resources/assets/butterflies/textures/entity/butterfly/butterfly_forester.png b/...n/resources/assets/butterflies/textures/entity/butterfly/butterfly_forester.png
diff --git a/src/main/resources/assets/butterflies/textures/gui/butterfly_scroll/buckeye.png b/src/main/resources/assets/butterflies/textures/gui/butterfly_scroll/buckeye.png
diff --git a/src/main/resources/assets/butterflies/textures/gui/butterfly_scroll/forester.png b/src/main/resources/assets/butterflies/textures/gui/butterfly_scroll/forester.png
diff --git a/src/main/resources/data/butterflies/advancements/butterfly/catch_all_butterflies.json b/src/main/resources/data/butterflies/advancements/butterfly/catch_all_butterflies.json
@@ -2,8 +2,7 @@
   "parent": "butterflies:butterfly/catch_butterfly",
   "display": {
     "icon": {
-      "item": "butterflies:butterfly_net",
-      "nbt": "{CustomModelData:1}"
+      "item": "butterflies:butterfly_net_full"
     },
     "title": {
       "translate": "advancements.butterfly.catch_all_butterflies.title"
@@ -26,7 +25,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:admiral\"}"
           }
@@ -39,7 +38,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:buckeye\"}"
           }
@@ -52,7 +51,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:cabbage\"}"
           }
@@ -65,7 +64,7 @@
         "items": [
           {
             "item": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:chalkhill\"}"
           }
@@ -78,7 +77,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:clipper\"}"
           }
@@ -91,7 +90,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:common\"}"
           }
@@ -104,7 +103,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:emporer\"}"
           }
@@ -117,7 +116,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:forester\"}"
           }
@@ -130,7 +129,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:glasswing\"}"
           }
@@ -143,7 +142,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:hairstreak\"}"
           }
@@ -156,7 +155,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:heath\"}"
           }
@@ -169,7 +168,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:longwing\"}"
           }
@@ -182,7 +181,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:monarch\"}"
           }
@@ -195,7 +194,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:morpho\"}"
           }
@@ -208,7 +207,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:rainbow\"}"
           }
@@ -221,7 +220,7 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
+              "butterflies:butterfly_net_full"
             ],
             "nbt": "{EntityId:\"butterflies:swallowtail\"}"
           }

diff --git a/src/main/resources/data/butterflies/advancements/butterfly/catch_butterfly.json b/src/main/resources/data/butterflies/advancements/butterfly/catch_butterfly.json
@@ -22,9 +22,8 @@
         "items": [
           {
             "items": [
-              "butterflies:butterfly_net"
-            ],
-            "nbt": "{CustomModelData:1}"
+              "butterflies:butterfly_net_full"
+            ]
           }
         ]
       }