More renames and translation/texture fixes

src/main/java/com/minelittlepony/unicopia/item/MagicGemItem.java

@@ -156,8 +156,8 @@ public class MagicGemItem extends Item implements Castable {
     @Override
     public Text getName(ItemStack stack) {
         if (SpellRegistry.stackHasEnchantment(stack)) {
-            return new TranslatableText(getTranslationKey(stack) + ".enchanted.name",
-                    new TranslatableText(String.format("%s.%s.name", getAffinity(stack).getTranslationKey(), SpellRegistry.getKeyFromStack(stack)
+            return new TranslatableText(getTranslationKey(stack) + ".enchanted",
+                    new TranslatableText(String.format("%s.%s", getAffinity(stack).getTranslationKey(), SpellRegistry.getKeyFromStack(stack)
             )));
         }
 

src/main/java/com/minelittlepony/unicopia/item/UItems.java

@@ -29,9 +29,9 @@ import net.minecraft.util.registry.Registry;
 
 public interface UItems {
 
-    AppleItem GREEN_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_green");
-    AppleItem SWEET_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_sweet");
-    AppleItem SOUR_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "apple_sour");
+    AppleItem GREEN_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "green_apple");
+    AppleItem SWEET_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "sweet_apple");
+    AppleItem SOUR_APPLE = register(new AppleItem(new Item.Settings().group(ItemGroup.FOOD).food(FoodComponents.APPLE)), "sour_apple");
 
     ZapAppleItem ZAP_APPLE = register(new ZapAppleItem(new Item.Settings().group(ItemGroup.FOOD).food(UFoodComponents.ZAP_APPLE)), "zap_apple");
 
@@ -47,12 +47,10 @@ public interface UItems {
 
     Item CLOUD_BLOCK = register(new PredicatedBlockItem(UBlocks.CLOUD_BLOCK, new Settings().group(ItemGroup.MATERIALS), INTERACT_WITH_CLOUDS), "cloud_block");
     Item ENCHANTED_CLOUD_BLOCK = register(new PredicatedBlockItem(UBlocks.ENCHANTED_CLOUD_BLOCK, new Settings().group(ItemGroup.MATERIALS), INTERACT_WITH_CLOUDS), "enchanted_cloud_block");
-    Item PACKED_CLOUD_BLOCK = register(new PredicatedBlockItem(UBlocks.DENSE_CLOUD_BLOCK, new Settings().group(ItemGroup.MATERIALS), INTERACT_WITH_CLOUDS), "packed_cloud_block");
+    Item DENSE_CLOUD_BLOCK = register(new PredicatedBlockItem(UBlocks.DENSE_CLOUD_BLOCK, new Settings().group(ItemGroup.MATERIALS), INTERACT_WITH_CLOUDS), "dense_cloud_block");
 
     Item CLOUD_STAIRS = register(new PredicatedBlockItem(UBlocks.CLOUD_STAIRS, new Settings().group(ItemGroup.BUILDING_BLOCKS), INTERACT_WITH_CLOUDS), "cloud_stairs");
-
     Item CLOUD_FENCE = register(new PredicatedBlockItem(UBlocks.CLOUD_FENCE, new Settings().group(ItemGroup.DECORATIONS), INTERACT_WITH_CLOUDS), "cloud_fence");
-
     Item CLOUD_ANVIL = register(new PredicatedBlockItem(UBlocks.CLOUD_ANVIL, new Settings().group(ItemGroup.DECORATIONS), INTERACT_WITH_CLOUDS), "cloud_anvil");
 
     Item MUSIC_DISC_CRUSADE = register(createRecord(USounds.RECORD_CRUSADE), "music_disc_crusade");
@@ -85,8 +83,8 @@ public interface UItems {
     AlicornAmuletItem ALICORN_AMULET = register(new AlicornAmuletItem(new Settings().group(ItemGroup.COMBAT).rarity(Rarity.RARE).maxCount(1)), "alicorn_amulet");
 
     SpellbookItem SPELLBOOK = register(new SpellbookItem(new Item.Settings().maxCount(1).group(ItemGroup.BREWING)), "spellbook");
-    Item STAFF_MEADOW_BROOK = register(new StaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(2)), "staff_meadow_brook");
-    Item STAFF_REMEMBERANCE = register(new EnchantedStaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1), new ScorchSpell()), "staff_remembrance");
+    Item MEADOW_BROOK_STAFF = register(new StaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1).maxDamage(2)), "meadow_brook_staff");
+    Item REMEMBERANCE_STAFF = register(new EnchantedStaffItem(new Settings().group(ItemGroup.TOOLS).rarity(Rarity.UNCOMMON).maxCount(1), new ScorchSpell()), "remembrance_staff");
 
     Item SPEAR = register(new SpearItem(new Settings().group(ItemGroup.TOOLS).maxCount(1).maxDamage(500)), "spear");
 
@@ -102,11 +100,11 @@ public interface UItems {
             .food(UFoodComponents.CEREAL)
             .maxCount(1)
             .recipeRemainder(Items.BOWL), 1), "cereal");
-    Item SUGAR_CEREAL = register(new SugaryItem(new Settings()
+    Item BOOP_O_ROOPS = register(new SugaryItem(new Settings()
             .group(ItemGroup.FOOD)
             .food(UFoodComponents.SUGAR)
             .maxCount(1)
-            .recipeRemainder(Items.BOWL), 110), "sugar_cereal");
+            .recipeRemainder(Items.BOWL), 110), "boop_o_roops");
 
     TomatoSeedsItem TOMATO_SEEDS = register(new TomatoSeedsItem(new Settings().group(ItemGroup.MATERIALS)), "tomato_seeds");
     TomatoItem TOMATO = register(new TomatoItem(new Settings()

src/main/resources/assets/unicopia/lang/en_us.json

@@ -25,6 +25,11 @@
 
   "block.unicopia.enchanted_torch": "Enchanted Torch",
 
+  "block.unicopia.misted_glass_door": "Misted Glass Door",
+  "block.unicopia.library_door": "Dutch Library Door",
+  "block.unicopia.bakery_door": "Dutch Bakery Door",
+  "block.unicopia.diamond_door": "Diamond Door",
+
   "item.unicopia.cloud_spawn_egg": "Cloud Spawn Egg",
   "item.unicopia.butterfly_spawn_egg": "Butterfly Spawn Egg",
 
@@ -33,18 +38,14 @@
   "item.unicopia.construction_cloud_spawner": "Construction Cloud",
   "item.unicopia.wild_cloud_spawner": "Wild Cloud",
 
-  "item.unicopia.misted_glass_door": "Misted Glass Door",
-  "item.unicopia.library_door": "Dutch Library Door",
-  "item.unicopia.bakery_door": "Dutch Bakery Door",
-  "item.unicopia.diamond_door": "Diamond Door",
   "item.unicopia.dew_drop": "Dew Drop",
   "item.unicopia.cloud_anvil": "Cloud Anvil",
   "item.unicopia.chitin_shell": "Chitinous Shell",
 
   "item.unicopia.moss": "Moss",
-  "item.unicopia.staff_meadow_brook": "Meadow Brook's Staff",
-  "item.unicopia.staff_meadow_brook.tagline": "It's a big stick",
-  "item.unicopia.staff_remembrance": "Staff of Remembrance",
+  "item.unicopia.meadow_brook_staff": "Meadow Brook's Staff",
+  "item.unicopia.meadow_brook_staff.tagline": "It's a big stick",
+  "item.unicopia.remembrance_staff": "Staff of Remembrance",
   "item.unicopia.spear": "Spear",
   "item.unicopia.alicorn_amulet": "The Alicorn Amulet",
   "item.unicopia.alicorn_amulet.tagline": "Time Worn: %s",
@@ -59,20 +60,12 @@
   "item.unicopia.spellbook": "Spellbook",
   "item.unicopia.bag_of_holding": "Bag of Holding",
 
-  "item.unicopia.apple_green": "Granny Smith Apple",
-  "item.unicopia.apple_sweet": "Sweet Apple Acres Apple",
-  "item.unicopia.apple_sour": "Sour Apple",
-
+  "item.unicopia.green_apple": "Granny Smith Apple",
+  "item.unicopia.sweet_apple": "Sweet Apple Acres Apple",
+  "item.unicopia.sour_apple": "Sour Apple",
   "item.unicopia.rotten_apple": "Rotten Apple",
-
   "item.unicopia.cooked_zap_apple": "Cooked Zap Apple",
-
   "item.unicopia.zap_apple": "Zap Apple",
-  "item.unicopia.zap_apple.red": "Apple",
-  "item.unicopia.zap_apple.green": "Granny Smith Apple",
-  "item.unicopia.zap_apple.sweet": "Sweet Apple Acres Apple",
-  "item.unicopia.zap_apple.sour": "Sour Apple",
-  "item.unicopia.zap_apple.zap": "Cooked Zap Apple",
 
   "item.unicopia.apple_seeds": "Apple Seeds",
 
@@ -87,7 +80,7 @@
   "item.unicopia.alfalfa_seeds": "Grain",
 
   "item.unicopia.cereal": "Breakfast Cereal",
-  "item.unicopia.sugar_cereal": "Boop 'o Roops",
+  "item.unicopia.boop_o_roops": "Boop 'o Roops",
   "item.unicopia.daffodil_daisy_sandwich": "Daffodil Daisy Sandwich",
   "item.unicopia.hay_burger": "Hay Burger",
   "item.unicopia.hay_fries": "Hay Fries",
@@ -100,7 +93,7 @@
   "item.unicopia.burned_juice": "Burned Juice",
 
   "item.unicopia.music_disc_pet": "Music Disc",
-  "item.unicopia.music_disc_pet.pet.desc": "Danial Ingram - pet",
+  "item.unicopia.music_disc_pet.desc": "Danial Ingram - pet",
   "item.unicopia.music_disc_popular": "Music Disc",
   "item.unicopia.music_disc_popular.desc": "Danial Ingram - popular",
   "item.unicopia.music_disc_crusade": "Music Disc",
@@ -112,64 +105,64 @@
   "affinity.neutral": "Neutral",
   "affinity.curse": "Corrupt",
 
-  "spell.shield.name": "Defense",
+  "spell.shield": "Defense",
   "spell.shield.tagline": "Protection I",
 
-  "spell.awkward.name": "Awkwardness",
+  "spell.awkward": "Awkwardness",
   "spell.awkward.tagline": "*Derp*",
 
-  "spell.portal.name": "Transportation",
+  "spell.portal": "Transportation",
   "spell.portal.tagline": "Teleportation I",
 
-  "spell.light.name": "Illumination",
+  "spell.light": "Illumination",
   "spell.light.tagline": "Discovery I",
 
-  "spell.reveal.name": "Revealing",
+  "spell.reveal": "Revealing",
   "spell.reveal.tagline": "Discovery II",
 
-  "spell.flame.name": "Burning",
+  "spell.flame": "Burning",
   "spell.flame.tagline": "Fire I",
 
-  "spell.fire.name": "Flame",
+  "spell.fire": "Flame",
   "spell.fire.tagline": "Fire II",
 
-  "spell.vortex.name": "Retention",
+  "spell.vortex": "Retention",
   "spell.vortex.tagline": "Containment I",
 
-  "spell.charge.name": "Channeling",
+  "spell.charge": "Channeling",
   "spell.charge.tagline": "Energy I",
 
-  "spell.siphon.name": "Pilon",
+  "spell.siphon": "Pilon",
   "spell.siphon.tagline": "Energy II",
 
-  "spell.ice.name": "Frost",
+  "spell.ice": "Frost",
   "spell.ice.tagline": "Ice I",
 
-  "spell.drake.name": "Assistance",
+  "spell.drake": "Assistance",
   "spell.drake.tagline": "Golomancy I",
 
-  "curse.shield.name": "Repulsion",
+  "curse.shield": "Repulsion",
   "curse.shield.tagline": "Hostility I",
 
-  "curse.darkness.name": "Darkness",
+  "curse.darkness": "Darkness",
   "curse.darkness.tagline": "Golomancy I/Resurrection II",
 
-  "curse.harm.name": "Hurting",
+  "curse.harm": "Hurting",
   "curse.harm.tagline": "Hostility II",
 
-  "curse.awkward.name": "Awkwardness",
+  "curse.awkward": "Awkwardness",
   "curse.awkward.tagline": "*Derp*",
 
-  "curse.vortex.name": "Suffering",
+  "curse.vortex": "Suffering",
   "curse.vortex.tagline": "Torture I",
 
-  "curse.necromancy.name": "Necromancy",
+  "curse.necromancy": "Necromancy",
   "curse.necromancy.tagline": "Resurrection I",
 
-  "curse.inferno.name": "Inferno",
+  "curse.inferno": "Inferno",
   "curse.inferno.tagline": "Fire III",
 
-  "curse.siphon.name": "Siphoning",
+  "curse.siphon": "Siphoning",
   "curse.siphon.tagline": "Energy III",
 
   "entity.racing_cloud.name": "Bucking Bronco",

src/main/resources/assets/unicopia/models/block/apple_leaves_heavy.json

@@ -2,7 +2,7 @@
     "parent": "block/leaves",
     "textures": {
         "all": "unicopia:blocks/leaves_apple",
-        "fruit": "minecraft:items/apple"
+        "fruit": "minecraft:item/apple"
     },
     "elements": [
          {   "from": [ 0, 0, 0 ],

src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json

@@ -1,65 +0,0 @@
-{
-    "ambientocclusion": false,
-    "textures": {
-        "particle": "blocks/flower_pot",
-        "flowerpot": "blocks/flower_pot",
-        "dirt": "blocks/dirt"
-    },
-    "elements": [
-        {   "from": [ 5, 0, 5 ],
-            "to": [ 6, 6, 11 ],
-            "faces": {
-                "down":  { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot", "cullface": "down" },
-                "up":    { "uv": [ 5, 5, 6, 11 ], "texture": "#flowerpot" },
-                "north": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
-                "south": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
-                "west":  { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
-                "east":  { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
-            }
-        },
-        {   "from": [ 10, 0, 5 ],
-            "to": [ 11, 6, 11 ],
-            "faces": {
-                "down":  { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot", "cullface": "down" },
-                "up":    { "uv": [ 10, 5, 11, 11 ], "texture": "#flowerpot" },
-                "north": { "uv": [ 5, 10, 6, 16 ], "texture": "#flowerpot" },
-                "south": { "uv": [ 10, 10, 11, 16 ], "texture": "#flowerpot" },
-                "west":  { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" },
-                "east":  { "uv": [ 5, 10, 11, 16 ], "texture": "#flowerpot" }
-            }
-        },
-        {   "from": [ 6, 0, 5 ],
-            "to": [ 10, 6, 6 ],
-            "faces": {
-                "down":  { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot", "cullface": "down" },
-                "up":    { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot" },
-                "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
-                "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
-            }
-        },
-        {   "from": [ 6, 0, 10 ],
-            "to": [ 10, 6, 11 ],
-            "faces": {
-                "down":  { "uv": [ 6, 5, 10, 6 ], "texture": "#flowerpot", "cullface": "down" },
-                "up":    { "uv": [ 6, 10, 10, 11 ], "texture": "#flowerpot" },
-                "north": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" },
-                "south": { "uv": [ 6, 10, 10, 16 ], "texture": "#flowerpot" }
-            }
-        },
-        {   "from": [ 6, 0, 6 ],
-            "to": [ 10, 4, 10 ],
-            "faces": {
-                "down": { "uv": [ 6, 6, 10, 10 ], "texture": "#flowerpot", "cullface": "down" },
-                "up":   { "uv": [ 6, 6, 10, 10 ], "texture": "#dirt" }
-            }
-        },
-        {   "from": [ 8, 4, 4.6 ],
-            "to": [ 8, 16, 15.4 ],
-            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": false },
-            "faces": {
-                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#plant" },
-                "east": { "uv": [ 16, 0, 0, 16 ], "texture": "#plant" }
-            }
-        }
-    ]
-}

src/main/resources/assets/unicopia/models/block/flower_pot/feather.json

@@ -1,6 +0,0 @@
-{
-    "parent": "unicopia:block/flower_pot/cross_rotated",
-    "textures": {
-        "plant": "minecraft:items/feather"
-    }
-}

src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json

@@ -1,6 +0,0 @@
-{
-    "parent": "unicopia:block/flower_pot/cross_rotated",
-    "textures": {
-        "plant": "unicopia:items/staff_meadow_brook"
-    }
-}

src/main/resources/assets/unicopia/models/block/tomato_plant/stage0.json

@@ -1,8 +1,8 @@
 {
     "textures": {
-		"stick_top": "minecraft:blocks/log_oak_top",
-        "stick_side": "minecraft:blocks/log_oak",
-        "particle": "minecraft:blocks/log_oak"
+		"stick_top": "minecraft:block/oak_log_top",
+        "stick_side": "minecraft:block/oak_log",
+        "particle": "minecraft:block/oak_log"
     },
     "elements": [
 	     {   "from": [ 7, -1, 7 ],

src/main/resources/assets/unicopia/models/item/alfalfa_leaves.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/alfalfa_leaves"
+        "layer0": "unicopia:item/alfalfa_leaves"
     }
 }

src/main/resources/assets/unicopia/models/item/alfalfa_seeds.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/alfalfa_seeds"
+        "layer0": "unicopia:item/alfalfa_seeds"
     }
 }

src/main/resources/assets/unicopia/models/item/alicorn_amulet.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/alicorn_amulet"
+        "layer0": "unicopia:item/alicorn_amulet"
     },
     "display": {
         "thirdperson": {

src/main/resources/assets/unicopia/models/item/apple.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "minecraft:item/apple"
-    }
-}

src/main/resources/assets/unicopia/models/item/apple_cider.json

@@ -1,28 +1,6 @@
 {
-    "parent": "item/generated",
+    "parent": "unicopia:item/mug",
     "textures": {
-        "layer0": "unicopia:items/apple_cider"
-    },
-    "display": {
-        "thirdperson_righthand": {
-            "rotation": [ 0, -90, -55 ],
-            "translation": [ 0, 4.0, 0.5 ],
-            "scale": [ 0.85, 0.85, 0.85 ]
-        },
-        "thirdperson_lefthand": {
-            "rotation": [ 0, 90, 55 ],
-            "translation": [ 0, 4.0, 0.5 ],
-            "scale": [ 0.85, 0.85, 0.85 ]
-        },
-        "firstperson_righthand": {
-            "rotation": [ 0, -90, 25 ],
-            "translation": [ 1.13, 3.2, 1.13 ],
-            "scale": [ 0.68, 0.68, 0.68 ]
-        },
-        "firstperson_lefthand": {
-            "rotation": [ 0, 90, -25 ],
-            "translation": [ 1.13, 3.2, 1.13 ],
-            "scale": [ 0.68, 0.68, 0.68 ]
-        }
+        "layer0": "unicopia:item/apple_cider"
     }
 }

src/main/resources/assets/unicopia/models/item/apple_seeds.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_seeds"
+        "layer0": "unicopia:item/apple_seeds"
     }
 }

src/main/resources/assets/unicopia/models/item/apple_sweet.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "unicopia:items/apple_sweet"
-    }
-}

src/main/resources/assets/unicopia/models/item/bag_of_holding.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/bag_o"
+        "layer0": "unicopia:item/bag_of_holding"
     }
 }

src/main/resources/assets/unicopia/models/item/bakery_door.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/door_bakery"
+        "layer0": "unicopia:item/bakery_door"
     }
 }

src/main/resources/assets/unicopia/models/item/boop_o_roops.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_green"
+        "layer0": "unicopia:item/boop_o_roops"
     }
 }

src/main/resources/assets/unicopia/models/item/burned_juice.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/burned_juice"
+        "layer0": "unicopia:item/burned_juice"
     }
 }

src/main/resources/assets/unicopia/models/item/cereal.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/cereal"
+        "layer0": "unicopia:item/cereal"
     }
 }

src/main/resources/assets/unicopia/models/item/chitin_shell.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/chitin_shell"
+        "layer0": "unicopia:item/chitin_shell"
     }
 }

src/main/resources/assets/unicopia/models/item/cloud_matter.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/cloud_matter"
+        "layer0": "unicopia:item/cloud_matter"
     },
     "display": {
         "thirdperson": {

src/main/resources/assets/unicopia/models/item/cloudsdale_tomato.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/tomato"
+        "layer0": "unicopia:item/tomato"
     }
 }

src/main/resources/assets/unicopia/models/item/construction_cloud_spawner.json

@@ -1,6 +1,6 @@
 {
     "parent": "unicopia:block/cloud_cube",
     "textures": {
-        "all": "unicopia:items/cloud"
+        "all": "unicopia:entity/cloud_spawner"
     }
 }

src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_zap_cooked"
+        "layer0": "unicopia:item/cooked_zap_apple"
     }
 }

src/main/resources/assets/unicopia/models/item/corrupted_gem.json

@@ -1,8 +1,8 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/corrupted_gem",
-        "layer1": "unicopia:items/corrupted_gem_overlay"
+        "layer0": "unicopia:item/corrupted_gem",
+        "layer1": "unicopia:item/corrupted_gem_overlay"
     },
     "display": {
         "thirdperson": {

src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/daffodil_daisy_sandwich"
+        "layer0": "unicopia:item/daffodil_daisy_sandwich"
     }
 }

src/main/resources/assets/unicopia/models/item/dew_drop.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/dew_drop"
+        "layer0": "unicopia:item/dew_drop"
     },
     "display": {
         "thirdperson": {

src/main/resources/assets/unicopia/models/item/diamond_door.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/door_diamond"
+        "layer0": "unicopia:item/diamond_door"
     }
 }

src/main/resources/assets/unicopia/models/item/gem.json

@@ -1,8 +1,8 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/gem",
-        "layer1": "unicopia:items/gem_overlay"
+        "layer0": "unicopia:item/gem",
+        "layer1": "unicopia:item/gem_overlay"
     },
     "display": {
         "thirdperson": {

src/main/resources/assets/unicopia/models/item/green_apple.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_sour"
+        "layer0": "unicopia:item/green_apple"
     }
 }

src/main/resources/assets/unicopia/models/item/hay_burger.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/hay_burger"
+        "layer0": "unicopia:item/hay_burger"
     }
 }

src/main/resources/assets/unicopia/models/item/hay_fries.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/hay_fries"
+        "layer0": "unicopia:item/hay_fries"
     }
 }

src/main/resources/assets/unicopia/models/item/juice.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/juice"
+        "layer0": "unicopia:item/juice"
     }
 }

src/main/resources/assets/unicopia/models/item/library_door.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/door_library"
+        "layer0": "unicopia:item/library_door"
     }
 }

src/main/resources/assets/unicopia/models/item/meadow_brook_staff.json

@@ -1,6 +1,6 @@
 {
     "parent": "unicopia:item/handheld_staff",
     "textures": {
-        "layer0": "unicopia:items/staff_remembrance"
+        "layer0": "unicopia:item/meadow_brook_staff"
     }
 }

src/main/resources/assets/unicopia/models/item/misted_glass_door.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/misted_glass_door"
+        "layer0": "unicopia:item/misted_glass_door"
     }
 }

src/main/resources/assets/unicopia/models/item/moss.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/moss"
+        "layer0": "unicopia:item/moss"
     }
 }

src/main/resources/assets/unicopia/models/item/mug.json

@@ -1,7 +1,7 @@
 {
     "parent": "item/handheld",
     "textures": {
-        "layer0": "unicopia:items/mug"
+        "layer0": "unicopia:item/mug"
     },
     "display": {
         "thirdperson_righthand": {

src/main/resources/assets/unicopia/models/item/music_disc_crusade.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/record_crusade"
+        "layer0": "unicopia:item/music_disc_crusade"
     }
 }

src/main/resources/assets/unicopia/models/item/music_disc_funk.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/record_funk"
+        "layer0": "unicopia:item/music_disc_funk"
     }
 }

src/main/resources/assets/unicopia/models/item/music_disc_pet.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/record_pet"
+        "layer0": "unicopia:item/music_disc_pet"
     }
 }

src/main/resources/assets/unicopia/models/item/music_disc_popular.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/record_popular"
+        "layer0": "unicopia:item/music_disc_popular"
     }
 }

src/main/resources/assets/unicopia/models/item/racing_cloud_spawner.json

@@ -1,6 +1,6 @@
 {
     "parent": "unicopia:block/cloud_cube",
     "textures": {
-        "all": "unicopia:items/cloud"
+        "all": "unicopia:entity/cloud_spawner"
     }
 }

src/main/resources/assets/unicopia/models/item/remembrance_staff.json

@@ -1,6 +1,6 @@
 {
     "parent": "unicopia:item/handheld_staff",
     "textures": {
-        "layer0": "unicopia:items/staff_meadow_brook"
+        "layer0": "unicopia:item/remembrance_staff"
     }
 }

src/main/resources/assets/unicopia/models/item/rotten_apple.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_rotten"
+        "layer0": "unicopia:item/rotten_apple"
     }
 }

src/main/resources/assets/unicopia/models/item/rotten_cloudsdale_tomato.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/rotten_tomato"
+        "layer0": "unicopia:item/rotten_tomato"
     }
 }

src/main/resources/assets/unicopia/models/item/rotten_tomato.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/rotten_tomato"
+        "layer0": "unicopia:item/rotten_tomato"
     }
 }

src/main/resources/assets/unicopia/models/item/salad.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/salad"
+        "layer0": "unicopia:item/salad"
     }
 }

src/main/resources/assets/unicopia/models/item/slime_drop.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/slime_drop"
+        "layer0": "unicopia:item/slime_drop"
     }
 }

src/main/resources/assets/unicopia/models/item/sour_apple.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "minecraft:items/apple"
+        "layer0": "unicopia:item/sour_apple"
     }
 }

src/main/resources/assets/unicopia/models/item/spear.json

@@ -1,6 +1,6 @@
 {
     "parent": "unicopia:item/handheld_staff",
     "textures": {
-        "layer0": "unicopia:items/spear_wood"
+        "layer0": "unicopia:item/wooden_spear"
     }
 }

src/main/resources/assets/unicopia/models/item/spellbook.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/spellbook"
+        "layer0": "unicopia:item/spellbook"
     }
 }

src/main/resources/assets/unicopia/models/item/sugar_cereal.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "unicopia:items/sugar_cereal"
-    }
-}

src/main/resources/assets/unicopia/models/item/sweet_apple.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_sour"
+        "layer0": "unicopia:item/sweet_apple"
     }
 }

src/main/resources/assets/unicopia/models/item/tomato.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/tomato"
+        "layer0": "unicopia:item/tomato"
     }
 }

src/main/resources/assets/unicopia/models/item/tomato_seeds.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/tomato_seeds"
+        "layer0": "unicopia:item/tomato_seeds"
     }
 }

src/main/resources/assets/unicopia/models/item/wheat_worms.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/wheat_worms"
+        "layer0": "unicopia:item/wheat_worms"
     }
 }

src/main/resources/assets/unicopia/models/item/wild_cloud_spawner.json

@@ -1,6 +1,6 @@
 {
     "parent": "unicopia:block/cloud_cube",
     "textures": {
-        "all": "unicopia:items/cloud"
+        "all": "unicopia:entity/cloud_spawner"
     }
 }

src/main/resources/assets/unicopia/models/item/zap_apple.json

@@ -1,6 +1,6 @@
 {
     "parent": "item/generated",
     "textures": {
-        "layer0": "unicopia:items/apple_zap"
+        "layer0": "unicopia:item/apple_zap"
     }
 }

src/main/resources/assets/unicopia/models/item/zap_apple_green.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "unicopia:items/apple_green"
-    }
-}

src/main/resources/assets/unicopia/models/item/zap_apple_sweet.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "unicopia:items/apple_sweet"
-    }
-}

src/main/resources/assets/unicopia/models/item/zap_apple_zap.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "unicopia:items/apple_zap_cooked"
-    }
-}