feat: Head hats no longer stackable

Using warped_fungus_on_a_stick as head items instead of sticks
OrangeUtan · Jul 7, 2021 · 6da3341 · 6da3341
1 parent ffbc76a
commit 6da3341
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 11 deletions.
diff --git a/beet.yml b/beet.yml
@@ -33,12 +33,12 @@ meta:
         prefix_identifiers: true
     hats:
         cmd_id: 777
-        default_item_head: minecraft:stick
+        default_item_head: minecraft:warped_fungus_on_a_stick
         default_item_inventory: minecraft:leather_helmet
     installation_advancement:
         author_skull_owner: Oran9eUtan
         icon:
-            item: "minecraft:stick"
+            item: "minecraft:warped_fungus_on_a_stick"
             nbt: "{CustomModelData: {{ hats.hat.fez.cmd }}}"
     render:
       data_pack:

diff --git a/datapack/data/oran9eutan/advancements/hats/event/player_dropped_hat_item.json b/datapack/data/oran9eutan/advancements/hats/event/player_dropped_hat_item.json
@@ -14,16 +14,16 @@
 							},
 							{
 								"condition": "minecraft:reference",
-								"name": "oran9eutan:hats/player/dropped_stick"
+								"name": "oran9eutan:hats/player/dropped_warped_fungus_on_a_stick"
 							}
-						]	
+						]
 					}
-					
+
 				]
 			}
 		}
 	},
 	"rewards": {
 		"function": "oran9eutan:hats/event/player_dropped_hat_item"
 	}
-}
+}
diff --git a/datapack/data/oran9eutan/functions/hats/event/player_dropped_hat_item.mcfunction b/datapack/data/oran9eutan/functions/hats/event/player_dropped_hat_item.mcfunction
@@ -6,5 +6,5 @@ execute if {{ hats.setting["dog_conversion"].is_true }} as @e[type=item,distance
 
 # Reset trigger
 scoreboard players set @s hats.dropLthrHlm 0
-scoreboard players set @s hats.dropStick 0
+scoreboard players set @s hats.drpWFOAS 0
 advancement revoke @s only oran9eutan:hats/event/player_dropped_hat_item
diff --git a/datapack/data/oran9eutan/functions/hats/install.mcfunction b/datapack/data/oran9eutan/functions/hats/install.mcfunction
@@ -3,7 +3,7 @@
 # Create scoreboards
 scoreboard objectives add hats.math dummy
 scoreboard objectives add hats.dropLthrHlm minecraft.dropped:minecraft.leather_helmet
-scoreboard objectives add hats.dropStick minecraft.dropped:minecraft.stick
+scoreboard objectives add hats.drpWFOAS minecraft.dropped:minecraft.warped_fungus_on_a_stick
 scoreboard objectives add hats.fix_old_hat trigger
 
 # Initialize settings

diff --git a/datapack/data/oran9eutan/functions/hats/uninstall.mcfunction b/datapack/data/oran9eutan/functions/hats/uninstall.mcfunction
@@ -7,7 +7,7 @@ tellraw @a[tag=!global.ignore,tag=!global.ignore.gui] ["",{"text":"Uninstalling
 scoreboard objectives remove hats.math
 scoreboard objectives remove hats.cfg
 scoreboard objectives remove hats.dropLthrHlm
-scoreboard objectives remove hats.dropStick
+scoreboard objectives remove hats.drpWFOAS
 scoreboard objectives remove hats.fix_old_hat
 
 # Remove storage

diff --git a/...predicates/hats/player/dropped_stick.json → ...yer/dropped_warped_fungus_on_a_stick.json b/...predicates/hats/player/dropped_stick.json → ...yer/dropped_warped_fungus_on_a_stick.json
@@ -2,9 +2,9 @@
 	"condition": "minecraft:entity_scores",
 	"entity": "this",
 	"scores": {
-	  "hats.dropStick": {
+	  "hats.drpWFOAS": {
 		"min": 1,
 		"max": 2147483647
 	  }
 	}
-}
+}
diff --git a/hats/templates/models/warped_fungus_on_a_stick.json b/hats/templates/models/warped_fungus_on_a_stick.json
@@ -0,0 +1,19 @@
+{
+  "parent": "minecraft:item/handheld_rod",
+  "textures": {
+    "layer0": "minecraft:item/warped_fungus_on_a_stick"
+  }
+  {%- if overrides %}
+  ,
+  "overrides":[
+    {% for override in overrides %}
+    {
+      "predicate":{
+          "custom_model_data": {{ override.cmd }}
+      },
+      "model": "{{ override.model }}"
+    }{% if not loop.last %},{% endif %}
+    {% endfor %}
+  ]
+  {%- endif %}
+}