fix

jpeterik12 · jpeterik12 · commit 8ed7e87c0d03 · 2021-10-19T14:01:28.000-05:00
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/bat_grenades/bat_grenades.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/bat_grenades/bat_grenades.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:bat_grenades/bat_leather"
+    "parent": "gm4:item/bat_grenades/bat_leather"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/end_fishing/end_fishing_phantom.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/end_fishing/end_fishing_phantom.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:end_fishing/elytra/broken_elytra_11"
+    "parent": "gm4:item/end_fishing/elytra/broken_elytra_11"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/end_fishing/end_fishing_swords.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/end_fishing/end_fishing_swords.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:end_fishing/swords/diamond_sword_22"
+    "parent": "gm4:item/end_fishing/swords/diamond_sword_22"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/everstones/everstones.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/everstones/everstones.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:everstones/everstone"
+    "parent": "gm4:item/everstones/everstone"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/heart_canisters/heart_canisters_max.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/heart_canisters/heart_canisters_max.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:heart_canisters/heart_canister_tier_2"
+    "parent": "gm4:item/heart_canisters/heart_canister_tier_2"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/heart_canisters/heart_canisters_tier_1.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/heart_canisters/heart_canisters_tier_1.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:heart_canisters/heart_canister_tier_1"
+    "parent": "gm4:item/heart_canisters/heart_canister_tier_1"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/heart_canisters/heart_canisters_tier_2.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/heart_canisters/heart_canisters_tier_2.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:heart_canisters/heart_canister_tier_2"
+    "parent": "gm4:item/heart_canisters/heart_canister_tier_2"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/metallurgy/metallurgy_blast_ore.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/metallurgy/metallurgy_blast_ore.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:metallurgy/lump/bauxite_lump"
+    "parent": "gm4:item/metallurgy/lump/bauxite_lump"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/metallurgy/metallurgy_cast.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/metallurgy/metallurgy_cast.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:metallurgy/band/aluminium_band"
+    "parent": "gm4:item/metallurgy/band/aluminium_band"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/orb_of_ankou/orb_of_ankou_soaring_pneuma.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/orb_of_ankou/orb_of_ankou_soaring_pneuma.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:orb_of_ankou/essences/soaring"
+    "parent": "gm4:item/orb_of_ankou/essences/soaring"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/orb_of_ankou/orb_of_ankou_soul_essence.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/orb_of_ankou/orb_of_ankou_soul_essence.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:orb_of_ankou/essences/lifeless"
+    "parent": "gm4:item/orb_of_ankou/essences/lifeless"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/orb_of_ankou/orb_of_ankou_soul_shard.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/orb_of_ankou/orb_of_ankou_soul_shard.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:orb_of_ankou/shards/lifeless"
+    "parent": "gm4:item/orb_of_ankou/shards/lifeless"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/scuba_gear/scuba_gear.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/scuba_gear/scuba_gear.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:scuba_gear/scuba_helmet"
+    "parent": "gm4:item/scuba_gear/scuba_helmet"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/shroomites/shroomites.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/shroomites/shroomites.json
@@ -0,0 +1,3 @@
+{
+    "parent": "minecraft:item/red_mushroom"
+}
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/sky_dimension/sky_dimension_aetherpuff_gift.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/sky_dimension/sky_dimension_aetherpuff_gift.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:sky_dimension/aetherpuff"
+    "parent": "gm4:item/sky_dimension/aetherpuff"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/sky_dimension/sky_dimension_obtain_stardust.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/sky_dimension/sky_dimension_obtain_stardust.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:sky_dimension/stardust"
+    "parent": "gm4:item/sky_dimension/stardust"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/sunken_treasure/sunken_treasure.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/sunken_treasure/sunken_treasure.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:sunken_treasure/message_in_a_bottle"
+    "parent": "gm4:item/sunken_treasure/message_in_a_bottle"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/tunnel_bores/tunnel_bores.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/tunnel_bores/tunnel_bores.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:tunnel_bores/piston_minecart"
+    "parent": "gm4:item/tunnel_bores/piston_minecart"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/zauber_cauldrons/zauber_cauldrons_full_armor.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/zauber_cauldrons/zauber_cauldrons_full_armor.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:zauber_cauldrons/zauber_chestplate_attack"
+    "parent": "gm4:item/zauber_cauldrons/zauber_chestplate_attack"
 }
diff --git a/gm4_resources/assets/gm4/models/gui/advancements/icon/zauber_cauldrons/zauber_cauldrons_wormhole.json b/gm4_resources/assets/gm4/models/gui/advancements/icon/zauber_cauldrons/zauber_cauldrons_wormhole.json
@@ -1,3 +1,3 @@
 {
-    "parent": "gm4:zauber_cauldrons/wormhole_in_a_bottle"
+    "parent": "gm4:item/zauber_cauldrons/wormhole_in_a_bottle"
 }
diff --git a/gm4_resources/assets/gm4/models/item/shroomites/shroomites.json b/gm4_resources/assets/gm4/models/item/shroomites/shroomites.json
@@ -0,0 +1,3 @@
+{
+    "parent": "minecraft:item/red_mushroom"
+}
diff --git a/gm4_resources/assets/minecraft/models/item/red_mushroom.json b/gm4_resources/assets/minecraft/models/item/red_mushroom.json
@@ -0,0 +1,32 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "minecraft:block/red_mushroom"
+    },
+    "overrides": [
+        {
+            "predicate": {
+                "custom_model_data": 1
+            },
+            "model": "gm4:gui/advancements/icon/shroomites/shroomites"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 2
+            },
+            "model": "minecraft:item/red_mushroom"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 3420001
+            },
+            "model": "gm4:gui/advancements/icon/shroomites/shroomites"
+        },
+        {
+            "predicate": {
+                "custom_model_data": 3420002
+            },
+            "model": "minecraft:item/red_mushroom"
+        }
+    ]
+}

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:bat_grenades/bat_leather"`
	`2`	`+ "parent": "gm4:item/bat_grenades/bat_leather"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:end_fishing/elytra/broken_elytra_11"`
	`2`	`+ "parent": "gm4:item/end_fishing/elytra/broken_elytra_11"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:end_fishing/swords/diamond_sword_22"`
	`2`	`+ "parent": "gm4:item/end_fishing/swords/diamond_sword_22"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:everstones/everstone"`
	`2`	`+ "parent": "gm4:item/everstones/everstone"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:heart_canisters/heart_canister_tier_2"`
	`2`	`+ "parent": "gm4:item/heart_canisters/heart_canister_tier_2"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:metallurgy/lump/bauxite_lump"`
	`2`	`+ "parent": "gm4:item/metallurgy/lump/bauxite_lump"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:metallurgy/band/aluminium_band"`
	`2`	`+ "parent": "gm4:item/metallurgy/band/aluminium_band"`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "parent": "gm4:orb_of_ankou/essences/soaring"`
	`2`	`+ "parent": "gm4:item/orb_of_ankou/essences/soaring"`
`3`	`3`	`}`