From 1bcf7c960953f45434b8d94c7459d84d2dcdb448 Mon Sep 17 00:00:00 2001
From: Oran9eUtan <oran9eutan@gmail.com>
Date: Sat, 3 Jul 2021 17:02:11 +0200
Subject: [PATCH] refactor: rename squid to posh_squid

BREAKING CHANGE: Renemad type of squid to posh_squid
---
 beet.yml                                                        | 2 +-
 datapack/data/oran9eutan/advancements/hats/root.json            | 2 +-
 datapack/data/oran9eutan/loot_tables/hats/dress/drowned.json    | 2 +-
 hats/registry/hat_tags.yml                                      | 2 +-
 hats/registry/hats.yml                                          | 2 +-
 resourcepack/assets/minecraft/lang/item.hats.hat.csv            | 2 +-
 .../models/item/hats/misc/{squid.json => posh_squid.json}       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
 rename resourcepack/assets/minecraft/models/item/hats/misc/{squid.json => posh_squid.json} (99%)

diff --git a/beet.yml b/beet.yml
index e44170e..9f182cd 100644
--- a/beet.yml
+++ b/beet.yml
@@ -35,7 +35,7 @@ meta:
         author_head: "Oran9eUtan"
         icon:
             item: "minecraft:stick"
-            nbt: "{CustomModelData: {{ hats.hat.squid.cmd }}}"
+            nbt: "{CustomModelData: {{ hats.hat.posh_squid.cmd }}}"
     render:
       data_pack:
         advancements: ["oran9eutan:*"]
diff --git a/datapack/data/oran9eutan/advancements/hats/root.json b/datapack/data/oran9eutan/advancements/hats/root.json
index 06af8ca..044e88a 100644
--- a/datapack/data/oran9eutan/advancements/hats/root.json
+++ b/datapack/data/oran9eutan/advancements/hats/root.json
@@ -2,7 +2,7 @@
     "display": {
       "icon": {
         "item": "minecraft:stick",
-        "nbt": "{CustomModelData: {{ hats.hat.squid.cmd }}}"
+        "nbt": "{CustomModelData: {{ hats.hat.posh_squid.cmd }}}"
       },
       "title": {
         "translate": "advancements.hats.root.title"
diff --git a/datapack/data/oran9eutan/loot_tables/hats/dress/drowned.json b/datapack/data/oran9eutan/loot_tables/hats/dress/drowned.json
index 6771651..880efc4 100644
--- a/datapack/data/oran9eutan/loot_tables/hats/dress/drowned.json
+++ b/datapack/data/oran9eutan/loot_tables/hats/dress/drowned.json
@@ -6,7 +6,7 @@
             "entries": [
                 {
                     "type": "minecraft:loot_table",
-                    "name": "oran9eutan:hats/hat_on_head/squid"
+                    "name": "oran9eutan:hats/hat_on_head/posh_squid"
                 },
 
                 {
diff --git a/hats/registry/hat_tags.yml b/hats/registry/hat_tags.yml
index de6b9e8..aa70ece 100644
--- a/hats/registry/hat_tags.yml
+++ b/hats/registry/hat_tags.yml
@@ -97,6 +97,6 @@ halloween:
 
 misc:
   - fez
-  - squid
+  - posh_squid
   - arrow_prop
   - frying_pan
diff --git a/hats/registry/hats.yml b/hats/registry/hats.yml
index d6708dd..5b3b877 100644
--- a/hats/registry/hats.yml
+++ b/hats/registry/hats.yml
@@ -138,7 +138,7 @@ villager:
 misc:
   fez:
     cmd: 3100
-  squid:
+  posh_squid:
     cmd: 3101
   arrow_prop:
     cmd: 3102
diff --git a/resourcepack/assets/minecraft/lang/item.hats.hat.csv b/resourcepack/assets/minecraft/lang/item.hats.hat.csv
index b8aa4f4..b4e6819 100644
--- a/resourcepack/assets/minecraft/lang/item.hats.hat.csv
+++ b/resourcepack/assets/minecraft/lang/item.hats.hat.csv
@@ -1,7 +1,7 @@
 String,de_de,en_us
 # Misc
 fez.name,Fez,Fez
-squid.name,Tintenfisch,Squid
+posh_squid.name,Nobler Tintenfisch,Posh squid
 arrow_prop.name,Pfeil Attrape,Fake Arrow
 arrow_prop.lore1,>>-o.o->,>>-o.o->
 frying_pan.name,Bratpfanne,Frying Pan
diff --git a/resourcepack/assets/minecraft/models/item/hats/misc/squid.json b/resourcepack/assets/minecraft/models/item/hats/misc/posh_squid.json
similarity index 99%
rename from resourcepack/assets/minecraft/models/item/hats/misc/squid.json
rename to resourcepack/assets/minecraft/models/item/hats/misc/posh_squid.json
index 80fd217..0b088f3 100644
--- a/resourcepack/assets/minecraft/models/item/hats/misc/squid.json
+++ b/resourcepack/assets/minecraft/models/item/hats/misc/posh_squid.json
@@ -333,4 +333,4 @@
 			"children": [16, 17, 18, 19, 20, 21, 22, 23]
 		}
 	]
-}
\ No newline at end of file
+}