From 7b2a9b3799e4d8b074d7a13479bd6bbce92c43ed Mon Sep 17 00:00:00 2001 From: Sollace Date: Sun, 26 Apr 2020 11:02:21 +0200 Subject: [PATCH] More renames and translation/texture fixes --- .../unicopia/item/MagicGemItem.java | 4 +- .../minelittlepony/unicopia/item/UItems.java | 18 ++--- .../resources/assets/unicopia/lang/en_us.json | 73 ++++++++---------- .../models/block/apple_leaves_heavy.json | 2 +- .../block/flower_pot/cross_rotated.json | 65 ---------------- .../models/block/flower_pot/feather.json | 6 -- .../models/block/flower_pot/meadowbrook.json | 6 -- .../models/block/tomato_plant/stage0.json | 6 +- .../unicopia/models/item/alfalfa_leaves.json | 2 +- .../unicopia/models/item/alfalfa_seeds.json | 2 +- .../unicopia/models/item/alicorn_amulet.json | 2 +- .../assets/unicopia/models/item/apple.json | 6 -- .../unicopia/models/item/apple_cider.json | 26 +------ .../unicopia/models/item/apple_seeds.json | 2 +- .../unicopia/models/item/apple_sweet.json | 6 -- .../unicopia/models/item/bag_of_holding.json | 2 +- .../unicopia/models/item/bakery_door.json | 2 +- .../{apple_green.json => boop_o_roops.json} | 2 +- .../unicopia/models/item/burned_juice.json | 2 +- .../assets/unicopia/models/item/cereal.json | 2 +- .../unicopia/models/item/chitin_shell.json | 2 +- .../unicopia/models/item/cloud_matter.json | 2 +- .../models/item/cloudsdale_tomato.json | 2 +- .../item/construction_cloud_spawner.json | 2 +- .../models/item/cooked_zap_apple.json | 2 +- .../unicopia/models/item/corrupted_gem.json | 4 +- .../models/item/daffodil_daisy_sandwich.json | 2 +- .../assets/unicopia/models/item/dew_drop.json | 2 +- .../unicopia/models/item/diamond_door.json | 2 +- .../assets/unicopia/models/item/gem.json | 4 +- .../{zap_apple_sour.json => green_apple.json} | 2 +- .../unicopia/models/item/hay_burger.json | 2 +- .../unicopia/models/item/hay_fries.json | 2 +- .../assets/unicopia/models/item/juice.json | 2 +- .../unicopia/models/item/library_door.json | 2 +- ...membrance.json => meadow_brook_staff.json} | 2 +- .../models/item/misted_glass_door.json | 2 +- .../assets/unicopia/models/item/moss.json | 2 +- .../assets/unicopia/models/item/mug.json | 2 +- .../models/item/music_disc_crusade.json | 2 +- .../unicopia/models/item/music_disc_funk.json | 2 +- .../unicopia/models/item/music_disc_pet.json | 2 +- .../models/item/music_disc_popular.json | 2 +- .../models/item/racing_cloud_spawner.json | 2 +- ...adow_brook.json => remembrance_staff.json} | 2 +- .../unicopia/models/item/rotten_apple.json | 2 +- .../models/item/rotten_cloudsdale_tomato.json | 2 +- .../unicopia/models/item/rotten_tomato.json | 2 +- .../assets/unicopia/models/item/salad.json | 2 +- .../unicopia/models/item/slime_drop.json | 2 +- .../{zap_apple_red.json => sour_apple.json} | 2 +- .../assets/unicopia/models/item/spear.json | 2 +- .../unicopia/models/item/spellbook.json | 2 +- .../unicopia/models/item/sugar_cereal.json | 6 -- .../{apple_sour.json => sweet_apple.json} | 2 +- .../assets/unicopia/models/item/tomato.json | 2 +- .../unicopia/models/item/tomato_seeds.json | 2 +- .../unicopia/models/item/wheat_worms.json | 2 +- .../models/item/wild_cloud_spawner.json | 2 +- .../unicopia/models/item/zap_apple.json | 2 +- .../unicopia/models/item/zap_apple_green.json | 6 -- .../unicopia/models/item/zap_apple_sweet.json | 6 -- .../unicopia/models/item/zap_apple_zap.json | 6 -- .../cloud.png => entity/cloud_spawner.png} | Bin .../{items => item}/alfalfa_leaves.png | Bin .../{items => item}/alfalfa_seeds.png | Bin .../{items => item}/alicorn_amulet.png | Bin .../textures/{items => item}/apple_cider.png | Bin .../textures/{items => item}/apple_seeds.png | Bin .../textures/{items => item}/apple_zap.png | Bin .../bag_o.png => item/bag_of_holding.png} | Bin .../door_bakery.png => item/bakery_door.png} | Bin .../boop_o_roops.png} | Bin .../textures/{items => item}/burned_juice.png | Bin .../textures/{items => item}/cereal.png | Bin .../textures/{items => item}/chitin_shell.png | Bin .../textures/{items => item}/cloud_matter.png | Bin .../cooked_zap_apple.png} | Bin .../{items => item}/corrupted_gem.png | Bin .../{items => item}/corrupted_gem_overlay.png | Bin .../daffodil_daisy_sandwich.png | Bin .../textures/{items => item}/dew_drop.png | Bin .../diamond_door.png} | Bin .../{items => item}/empty_gem_slot.png | Bin .../unicopia/textures/{items => item}/gem.png | Bin .../textures/{items => item}/gem_overlay.png | Bin .../apple_green.png => item/green_apple.png} | Bin .../textures/{items => item}/hay_burger.png | Bin .../textures/{items => item}/hay_fries.png | Bin .../textures/{items => item}/juice.png | Bin .../library_door.png} | Bin .../meadow_brook_staff.png} | Bin .../{items => item}/misted_glass_door.png | Bin .../textures/{items => item}/moss.png | Bin .../unicopia/textures/{items => item}/mug.png | Bin .../music_disc_crusade.png} | Bin .../music_disc_funk.png} | Bin .../music_disc_pet.png} | Bin .../music_disc_popular.png} | Bin .../remembrance_staff.png} | Bin .../rotten_apple.png} | Bin .../{items => item}/rotten_tomato.png | Bin .../textures/{items => item}/salad.png | Bin .../textures/{items => item}/slime_drop.png | Bin .../apple_sour.png => item/sour_apple.png} | Bin .../textures/{items => item}/spellbook.png | Bin .../apple_sweet.png => item/sweet_apple.png} | Bin .../textures/{items => item}/tomato.png | Bin .../textures/{items => item}/tomato_seeds.png | Bin .../textures/{items => item}/wheat_worms.png | Bin .../spear_wood.png => item/wooden_spear.png} | Bin 111 files changed, 99 insertions(+), 243 deletions(-) delete mode 100644 src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flower_pot/feather.json delete mode 100644 src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json delete mode 100644 src/main/resources/assets/unicopia/models/item/apple.json delete mode 100644 src/main/resources/assets/unicopia/models/item/apple_sweet.json rename src/main/resources/assets/unicopia/models/item/{apple_green.json => boop_o_roops.json} (56%) rename src/main/resources/assets/unicopia/models/item/{zap_apple_sour.json => green_apple.json} (56%) rename src/main/resources/assets/unicopia/models/item/{staff_remembrance.json => meadow_brook_staff.json} (58%) rename src/main/resources/assets/unicopia/models/item/{staff_meadow_brook.json => remembrance_staff.json} (57%) rename src/main/resources/assets/unicopia/models/item/{zap_apple_red.json => sour_apple.json} (57%) delete mode 100644 src/main/resources/assets/unicopia/models/item/sugar_cereal.json rename src/main/resources/assets/unicopia/models/item/{apple_sour.json => sweet_apple.json} (56%) delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_apple_green.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_apple_sweet.json delete mode 100644 src/main/resources/assets/unicopia/models/item/zap_apple_zap.json rename src/main/resources/assets/unicopia/textures/{items/cloud.png => entity/cloud_spawner.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/alfalfa_leaves.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/alfalfa_seeds.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/alicorn_amulet.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/apple_cider.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/apple_seeds.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/apple_zap.png (100%) rename src/main/resources/assets/unicopia/textures/{items/bag_o.png => item/bag_of_holding.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/door_bakery.png => item/bakery_door.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/sugar_cereal.png => item/boop_o_roops.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/burned_juice.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/cereal.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/chitin_shell.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/cloud_matter.png (100%) rename src/main/resources/assets/unicopia/textures/{items/apple_zap_cooked.png => item/cooked_zap_apple.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/corrupted_gem.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/corrupted_gem_overlay.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/daffodil_daisy_sandwich.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/dew_drop.png (100%) rename src/main/resources/assets/unicopia/textures/{items/door_diamond.png => item/diamond_door.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/empty_gem_slot.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/gem.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/gem_overlay.png (100%) rename src/main/resources/assets/unicopia/textures/{items/apple_green.png => item/green_apple.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/hay_burger.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/hay_fries.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/juice.png (100%) rename src/main/resources/assets/unicopia/textures/{items/door_library.png => item/library_door.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/staff_meadow_brook.png => item/meadow_brook_staff.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/misted_glass_door.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/moss.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/mug.png (100%) rename src/main/resources/assets/unicopia/textures/{items/record_crusade.png => item/music_disc_crusade.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/record_funk.png => item/music_disc_funk.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/record_pet.png => item/music_disc_pet.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/record_popular.png => item/music_disc_popular.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/staff_remembrance.png => item/remembrance_staff.png} (100%) rename src/main/resources/assets/unicopia/textures/{items/apple_rotten.png => item/rotten_apple.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/rotten_tomato.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/salad.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/slime_drop.png (100%) rename src/main/resources/assets/unicopia/textures/{items/apple_sour.png => item/sour_apple.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/spellbook.png (100%) rename src/main/resources/assets/unicopia/textures/{items/apple_sweet.png => item/sweet_apple.png} (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/tomato.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/tomato_seeds.png (100%) rename src/main/resources/assets/unicopia/textures/{items => item}/wheat_worms.png (100%) rename src/main/resources/assets/unicopia/textures/{items/spear_wood.png => item/wooden_spear.png} (100%) diff --git a/src/main/java/com/minelittlepony/unicopia/item/MagicGemItem.java b/src/main/java/com/minelittlepony/unicopia/item/MagicGemItem.java index f57d34f3..a197ff4a 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/MagicGemItem.java +++ b/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) ))); } diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 0afedd9b..148fa587 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/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() diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 7cb8b253..86e12bae 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/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", diff --git a/src/main/resources/assets/unicopia/models/block/apple_leaves_heavy.json b/src/main/resources/assets/unicopia/models/block/apple_leaves_heavy.json index 932f59e2..11f22539 100644 --- a/src/main/resources/assets/unicopia/models/block/apple_leaves_heavy.json +++ b/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 ], diff --git a/src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json b/src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json deleted file mode 100644 index 0f044592..00000000 --- a/src/main/resources/assets/unicopia/models/block/flower_pot/cross_rotated.json +++ /dev/null @@ -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" } - } - } - ] -} diff --git a/src/main/resources/assets/unicopia/models/block/flower_pot/feather.json b/src/main/resources/assets/unicopia/models/block/flower_pot/feather.json deleted file mode 100644 index 45fc9246..00000000 --- a/src/main/resources/assets/unicopia/models/block/flower_pot/feather.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flower_pot/cross_rotated", - "textures": { - "plant": "minecraft:items/feather" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json b/src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json deleted file mode 100644 index 6d7381c8..00000000 --- a/src/main/resources/assets/unicopia/models/block/flower_pot/meadowbrook.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "unicopia:block/flower_pot/cross_rotated", - "textures": { - "plant": "unicopia:items/staff_meadow_brook" - } -} diff --git a/src/main/resources/assets/unicopia/models/block/tomato_plant/stage0.json b/src/main/resources/assets/unicopia/models/block/tomato_plant/stage0.json index 33e99f9e..4d744f15 100644 --- a/src/main/resources/assets/unicopia/models/block/tomato_plant/stage0.json +++ b/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 ], diff --git a/src/main/resources/assets/unicopia/models/item/alfalfa_leaves.json b/src/main/resources/assets/unicopia/models/item/alfalfa_leaves.json index 09eca0fa..acbc2406 100644 --- a/src/main/resources/assets/unicopia/models/item/alfalfa_leaves.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/alfalfa_seeds.json b/src/main/resources/assets/unicopia/models/item/alfalfa_seeds.json index dee78568..6ef6c0e6 100644 --- a/src/main/resources/assets/unicopia/models/item/alfalfa_seeds.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/alicorn_amulet.json b/src/main/resources/assets/unicopia/models/item/alicorn_amulet.json index ec3915b1..1606db9f 100644 --- a/src/main/resources/assets/unicopia/models/item/alicorn_amulet.json +++ b/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": { diff --git a/src/main/resources/assets/unicopia/models/item/apple.json b/src/main/resources/assets/unicopia/models/item/apple.json deleted file mode 100644 index 9d3a7a06..00000000 --- a/src/main/resources/assets/unicopia/models/item/apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "minecraft:item/apple" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/apple_cider.json b/src/main/resources/assets/unicopia/models/item/apple_cider.json index 100f88a1..4f3020f4 100644 --- a/src/main/resources/assets/unicopia/models/item/apple_cider.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/apple_seeds.json b/src/main/resources/assets/unicopia/models/item/apple_seeds.json index 9b051338..7cbb88a9 100644 --- a/src/main/resources/assets/unicopia/models/item/apple_seeds.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/apple_sweet.json b/src/main/resources/assets/unicopia/models/item/apple_sweet.json deleted file mode 100644 index c2151e3f..00000000 --- a/src/main/resources/assets/unicopia/models/item/apple_sweet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:items/apple_sweet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/bag_of_holding.json b/src/main/resources/assets/unicopia/models/item/bag_of_holding.json index 335de150..73fc0d5c 100644 --- a/src/main/resources/assets/unicopia/models/item/bag_of_holding.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/bakery_door.json b/src/main/resources/assets/unicopia/models/item/bakery_door.json index f468dcc0..2cbad7a1 100644 --- a/src/main/resources/assets/unicopia/models/item/bakery_door.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/apple_green.json b/src/main/resources/assets/unicopia/models/item/boop_o_roops.json similarity index 56% rename from src/main/resources/assets/unicopia/models/item/apple_green.json rename to src/main/resources/assets/unicopia/models/item/boop_o_roops.json index ec3fc640..30df4316 100644 --- a/src/main/resources/assets/unicopia/models/item/apple_green.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/burned_juice.json b/src/main/resources/assets/unicopia/models/item/burned_juice.json index 7d3d4b72..a12a89b8 100644 --- a/src/main/resources/assets/unicopia/models/item/burned_juice.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/cereal.json b/src/main/resources/assets/unicopia/models/item/cereal.json index ce05147e..a92340ba 100644 --- a/src/main/resources/assets/unicopia/models/item/cereal.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/chitin_shell.json b/src/main/resources/assets/unicopia/models/item/chitin_shell.json index ffdcd3a8..2a249fba 100644 --- a/src/main/resources/assets/unicopia/models/item/chitin_shell.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/cloud_matter.json b/src/main/resources/assets/unicopia/models/item/cloud_matter.json index c6439a05..dc6fc761 100644 --- a/src/main/resources/assets/unicopia/models/item/cloud_matter.json +++ b/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": { diff --git a/src/main/resources/assets/unicopia/models/item/cloudsdale_tomato.json b/src/main/resources/assets/unicopia/models/item/cloudsdale_tomato.json index cfc42301..dfe20694 100644 --- a/src/main/resources/assets/unicopia/models/item/cloudsdale_tomato.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/construction_cloud_spawner.json b/src/main/resources/assets/unicopia/models/item/construction_cloud_spawner.json index ee7f4484..542a675b 100644 --- a/src/main/resources/assets/unicopia/models/item/construction_cloud_spawner.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json b/src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json index 6dc1c575..e2c131f9 100644 --- a/src/main/resources/assets/unicopia/models/item/cooked_zap_apple.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/corrupted_gem.json b/src/main/resources/assets/unicopia/models/item/corrupted_gem.json index ca291e38..e253f118 100644 --- a/src/main/resources/assets/unicopia/models/item/corrupted_gem.json +++ b/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": { diff --git a/src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json b/src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json index 54a23b86..68ee4c6a 100644 --- a/src/main/resources/assets/unicopia/models/item/daffodil_daisy_sandwich.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/dew_drop.json b/src/main/resources/assets/unicopia/models/item/dew_drop.json index 649b1b57..dd06a590 100644 --- a/src/main/resources/assets/unicopia/models/item/dew_drop.json +++ b/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": { diff --git a/src/main/resources/assets/unicopia/models/item/diamond_door.json b/src/main/resources/assets/unicopia/models/item/diamond_door.json index 6ac870bf..f34f4821 100644 --- a/src/main/resources/assets/unicopia/models/item/diamond_door.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/gem.json b/src/main/resources/assets/unicopia/models/item/gem.json index 570263ea..71f14755 100644 --- a/src/main/resources/assets/unicopia/models/item/gem.json +++ b/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": { diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_sour.json b/src/main/resources/assets/unicopia/models/item/green_apple.json similarity index 56% rename from src/main/resources/assets/unicopia/models/item/zap_apple_sour.json rename to src/main/resources/assets/unicopia/models/item/green_apple.json index 3901a3eb..c0ce5d05 100644 --- a/src/main/resources/assets/unicopia/models/item/zap_apple_sour.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/hay_burger.json b/src/main/resources/assets/unicopia/models/item/hay_burger.json index bf90409b..21dd88c2 100644 --- a/src/main/resources/assets/unicopia/models/item/hay_burger.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/hay_fries.json b/src/main/resources/assets/unicopia/models/item/hay_fries.json index a1f24863..7634cbb5 100644 --- a/src/main/resources/assets/unicopia/models/item/hay_fries.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/juice.json b/src/main/resources/assets/unicopia/models/item/juice.json index 48cd3d8b..616a1ef5 100644 --- a/src/main/resources/assets/unicopia/models/item/juice.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/library_door.json b/src/main/resources/assets/unicopia/models/item/library_door.json index 69f1018c..fd548d58 100644 --- a/src/main/resources/assets/unicopia/models/item/library_door.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/staff_remembrance.json b/src/main/resources/assets/unicopia/models/item/meadow_brook_staff.json similarity index 58% rename from src/main/resources/assets/unicopia/models/item/staff_remembrance.json rename to src/main/resources/assets/unicopia/models/item/meadow_brook_staff.json index 97844a9d..aeaf16f0 100644 --- a/src/main/resources/assets/unicopia/models/item/staff_remembrance.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/misted_glass_door.json b/src/main/resources/assets/unicopia/models/item/misted_glass_door.json index efea724b..0e126a3b 100644 --- a/src/main/resources/assets/unicopia/models/item/misted_glass_door.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/moss.json b/src/main/resources/assets/unicopia/models/item/moss.json index e9deda1e..47ddfb01 100644 --- a/src/main/resources/assets/unicopia/models/item/moss.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/mug.json b/src/main/resources/assets/unicopia/models/item/mug.json index fa757e62..78012844 100644 --- a/src/main/resources/assets/unicopia/models/item/mug.json +++ b/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": { diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json b/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json index d0acdde2..b90c915a 100644 --- a/src/main/resources/assets/unicopia/models/item/music_disc_crusade.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_funk.json b/src/main/resources/assets/unicopia/models/item/music_disc_funk.json index 733e7c04..2e659fa5 100644 --- a/src/main/resources/assets/unicopia/models/item/music_disc_funk.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_pet.json b/src/main/resources/assets/unicopia/models/item/music_disc_pet.json index d3b467ed..fd19ed13 100644 --- a/src/main/resources/assets/unicopia/models/item/music_disc_pet.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/music_disc_popular.json b/src/main/resources/assets/unicopia/models/item/music_disc_popular.json index c38eba0c..aed62677 100644 --- a/src/main/resources/assets/unicopia/models/item/music_disc_popular.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/racing_cloud_spawner.json b/src/main/resources/assets/unicopia/models/item/racing_cloud_spawner.json index ee7f4484..542a675b 100644 --- a/src/main/resources/assets/unicopia/models/item/racing_cloud_spawner.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/staff_meadow_brook.json b/src/main/resources/assets/unicopia/models/item/remembrance_staff.json similarity index 57% rename from src/main/resources/assets/unicopia/models/item/staff_meadow_brook.json rename to src/main/resources/assets/unicopia/models/item/remembrance_staff.json index ef5084be..68e2efdd 100644 --- a/src/main/resources/assets/unicopia/models/item/staff_meadow_brook.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/rotten_apple.json b/src/main/resources/assets/unicopia/models/item/rotten_apple.json index eee71611..19a75b16 100644 --- a/src/main/resources/assets/unicopia/models/item/rotten_apple.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/rotten_cloudsdale_tomato.json b/src/main/resources/assets/unicopia/models/item/rotten_cloudsdale_tomato.json index 83747491..b5a25d36 100644 --- a/src/main/resources/assets/unicopia/models/item/rotten_cloudsdale_tomato.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/rotten_tomato.json b/src/main/resources/assets/unicopia/models/item/rotten_tomato.json index 83747491..b5a25d36 100644 --- a/src/main/resources/assets/unicopia/models/item/rotten_tomato.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/salad.json b/src/main/resources/assets/unicopia/models/item/salad.json index 1f548360..cbf2ff97 100644 --- a/src/main/resources/assets/unicopia/models/item/salad.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/slime_drop.json b/src/main/resources/assets/unicopia/models/item/slime_drop.json index 4b2eb5cd..23eec786 100644 --- a/src/main/resources/assets/unicopia/models/item/slime_drop.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_red.json b/src/main/resources/assets/unicopia/models/item/sour_apple.json similarity index 57% rename from src/main/resources/assets/unicopia/models/item/zap_apple_red.json rename to src/main/resources/assets/unicopia/models/item/sour_apple.json index 490a104a..a1050863 100644 --- a/src/main/resources/assets/unicopia/models/item/zap_apple_red.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/spear.json b/src/main/resources/assets/unicopia/models/item/spear.json index 5063676f..72b8f7d6 100644 --- a/src/main/resources/assets/unicopia/models/item/spear.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/spellbook.json b/src/main/resources/assets/unicopia/models/item/spellbook.json index aba9e944..2f2a4302 100644 --- a/src/main/resources/assets/unicopia/models/item/spellbook.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/sugar_cereal.json b/src/main/resources/assets/unicopia/models/item/sugar_cereal.json deleted file mode 100644 index bde35e7c..00000000 --- a/src/main/resources/assets/unicopia/models/item/sugar_cereal.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:items/sugar_cereal" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/apple_sour.json b/src/main/resources/assets/unicopia/models/item/sweet_apple.json similarity index 56% rename from src/main/resources/assets/unicopia/models/item/apple_sour.json rename to src/main/resources/assets/unicopia/models/item/sweet_apple.json index 3901a3eb..bfb72305 100644 --- a/src/main/resources/assets/unicopia/models/item/apple_sour.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/tomato.json b/src/main/resources/assets/unicopia/models/item/tomato.json index cfc42301..dfe20694 100644 --- a/src/main/resources/assets/unicopia/models/item/tomato.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/tomato_seeds.json b/src/main/resources/assets/unicopia/models/item/tomato_seeds.json index 5430f61b..0f5a7698 100644 --- a/src/main/resources/assets/unicopia/models/item/tomato_seeds.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/wheat_worms.json b/src/main/resources/assets/unicopia/models/item/wheat_worms.json index 936f6330..b5dd6e0f 100644 --- a/src/main/resources/assets/unicopia/models/item/wheat_worms.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/wild_cloud_spawner.json b/src/main/resources/assets/unicopia/models/item/wild_cloud_spawner.json index ee7f4484..542a675b 100644 --- a/src/main/resources/assets/unicopia/models/item/wild_cloud_spawner.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple.json b/src/main/resources/assets/unicopia/models/item/zap_apple.json index f4a69e56..8abb8be6 100644 --- a/src/main/resources/assets/unicopia/models/item/zap_apple.json +++ b/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" } } diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_green.json b/src/main/resources/assets/unicopia/models/item/zap_apple_green.json deleted file mode 100644 index ec3fc640..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_apple_green.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:items/apple_green" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_sweet.json b/src/main/resources/assets/unicopia/models/item/zap_apple_sweet.json deleted file mode 100644 index c2151e3f..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_apple_sweet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:items/apple_sweet" - } -} diff --git a/src/main/resources/assets/unicopia/models/item/zap_apple_zap.json b/src/main/resources/assets/unicopia/models/item/zap_apple_zap.json deleted file mode 100644 index 6dc1c575..00000000 --- a/src/main/resources/assets/unicopia/models/item/zap_apple_zap.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "unicopia:items/apple_zap_cooked" - } -} diff --git a/src/main/resources/assets/unicopia/textures/items/cloud.png b/src/main/resources/assets/unicopia/textures/entity/cloud_spawner.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/cloud.png rename to src/main/resources/assets/unicopia/textures/entity/cloud_spawner.png diff --git a/src/main/resources/assets/unicopia/textures/items/alfalfa_leaves.png b/src/main/resources/assets/unicopia/textures/item/alfalfa_leaves.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/alfalfa_leaves.png rename to src/main/resources/assets/unicopia/textures/item/alfalfa_leaves.png diff --git a/src/main/resources/assets/unicopia/textures/items/alfalfa_seeds.png b/src/main/resources/assets/unicopia/textures/item/alfalfa_seeds.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/alfalfa_seeds.png rename to src/main/resources/assets/unicopia/textures/item/alfalfa_seeds.png diff --git a/src/main/resources/assets/unicopia/textures/items/alicorn_amulet.png b/src/main/resources/assets/unicopia/textures/item/alicorn_amulet.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/alicorn_amulet.png rename to src/main/resources/assets/unicopia/textures/item/alicorn_amulet.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_cider.png b/src/main/resources/assets/unicopia/textures/item/apple_cider.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_cider.png rename to src/main/resources/assets/unicopia/textures/item/apple_cider.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_seeds.png b/src/main/resources/assets/unicopia/textures/item/apple_seeds.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_seeds.png rename to src/main/resources/assets/unicopia/textures/item/apple_seeds.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_zap.png b/src/main/resources/assets/unicopia/textures/item/apple_zap.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_zap.png rename to src/main/resources/assets/unicopia/textures/item/apple_zap.png diff --git a/src/main/resources/assets/unicopia/textures/items/bag_o.png b/src/main/resources/assets/unicopia/textures/item/bag_of_holding.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/bag_o.png rename to src/main/resources/assets/unicopia/textures/item/bag_of_holding.png diff --git a/src/main/resources/assets/unicopia/textures/items/door_bakery.png b/src/main/resources/assets/unicopia/textures/item/bakery_door.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/door_bakery.png rename to src/main/resources/assets/unicopia/textures/item/bakery_door.png diff --git a/src/main/resources/assets/unicopia/textures/items/sugar_cereal.png b/src/main/resources/assets/unicopia/textures/item/boop_o_roops.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/sugar_cereal.png rename to src/main/resources/assets/unicopia/textures/item/boop_o_roops.png diff --git a/src/main/resources/assets/unicopia/textures/items/burned_juice.png b/src/main/resources/assets/unicopia/textures/item/burned_juice.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/burned_juice.png rename to src/main/resources/assets/unicopia/textures/item/burned_juice.png diff --git a/src/main/resources/assets/unicopia/textures/items/cereal.png b/src/main/resources/assets/unicopia/textures/item/cereal.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/cereal.png rename to src/main/resources/assets/unicopia/textures/item/cereal.png diff --git a/src/main/resources/assets/unicopia/textures/items/chitin_shell.png b/src/main/resources/assets/unicopia/textures/item/chitin_shell.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/chitin_shell.png rename to src/main/resources/assets/unicopia/textures/item/chitin_shell.png diff --git a/src/main/resources/assets/unicopia/textures/items/cloud_matter.png b/src/main/resources/assets/unicopia/textures/item/cloud_matter.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/cloud_matter.png rename to src/main/resources/assets/unicopia/textures/item/cloud_matter.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_zap_cooked.png b/src/main/resources/assets/unicopia/textures/item/cooked_zap_apple.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_zap_cooked.png rename to src/main/resources/assets/unicopia/textures/item/cooked_zap_apple.png diff --git a/src/main/resources/assets/unicopia/textures/items/corrupted_gem.png b/src/main/resources/assets/unicopia/textures/item/corrupted_gem.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/corrupted_gem.png rename to src/main/resources/assets/unicopia/textures/item/corrupted_gem.png diff --git a/src/main/resources/assets/unicopia/textures/items/corrupted_gem_overlay.png b/src/main/resources/assets/unicopia/textures/item/corrupted_gem_overlay.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/corrupted_gem_overlay.png rename to src/main/resources/assets/unicopia/textures/item/corrupted_gem_overlay.png diff --git a/src/main/resources/assets/unicopia/textures/items/daffodil_daisy_sandwich.png b/src/main/resources/assets/unicopia/textures/item/daffodil_daisy_sandwich.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/daffodil_daisy_sandwich.png rename to src/main/resources/assets/unicopia/textures/item/daffodil_daisy_sandwich.png diff --git a/src/main/resources/assets/unicopia/textures/items/dew_drop.png b/src/main/resources/assets/unicopia/textures/item/dew_drop.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/dew_drop.png rename to src/main/resources/assets/unicopia/textures/item/dew_drop.png diff --git a/src/main/resources/assets/unicopia/textures/items/door_diamond.png b/src/main/resources/assets/unicopia/textures/item/diamond_door.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/door_diamond.png rename to src/main/resources/assets/unicopia/textures/item/diamond_door.png diff --git a/src/main/resources/assets/unicopia/textures/items/empty_gem_slot.png b/src/main/resources/assets/unicopia/textures/item/empty_gem_slot.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/empty_gem_slot.png rename to src/main/resources/assets/unicopia/textures/item/empty_gem_slot.png diff --git a/src/main/resources/assets/unicopia/textures/items/gem.png b/src/main/resources/assets/unicopia/textures/item/gem.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/gem.png rename to src/main/resources/assets/unicopia/textures/item/gem.png diff --git a/src/main/resources/assets/unicopia/textures/items/gem_overlay.png b/src/main/resources/assets/unicopia/textures/item/gem_overlay.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/gem_overlay.png rename to src/main/resources/assets/unicopia/textures/item/gem_overlay.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_green.png b/src/main/resources/assets/unicopia/textures/item/green_apple.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_green.png rename to src/main/resources/assets/unicopia/textures/item/green_apple.png diff --git a/src/main/resources/assets/unicopia/textures/items/hay_burger.png b/src/main/resources/assets/unicopia/textures/item/hay_burger.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/hay_burger.png rename to src/main/resources/assets/unicopia/textures/item/hay_burger.png diff --git a/src/main/resources/assets/unicopia/textures/items/hay_fries.png b/src/main/resources/assets/unicopia/textures/item/hay_fries.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/hay_fries.png rename to src/main/resources/assets/unicopia/textures/item/hay_fries.png diff --git a/src/main/resources/assets/unicopia/textures/items/juice.png b/src/main/resources/assets/unicopia/textures/item/juice.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/juice.png rename to src/main/resources/assets/unicopia/textures/item/juice.png diff --git a/src/main/resources/assets/unicopia/textures/items/door_library.png b/src/main/resources/assets/unicopia/textures/item/library_door.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/door_library.png rename to src/main/resources/assets/unicopia/textures/item/library_door.png diff --git a/src/main/resources/assets/unicopia/textures/items/staff_meadow_brook.png b/src/main/resources/assets/unicopia/textures/item/meadow_brook_staff.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/staff_meadow_brook.png rename to src/main/resources/assets/unicopia/textures/item/meadow_brook_staff.png diff --git a/src/main/resources/assets/unicopia/textures/items/misted_glass_door.png b/src/main/resources/assets/unicopia/textures/item/misted_glass_door.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/misted_glass_door.png rename to src/main/resources/assets/unicopia/textures/item/misted_glass_door.png diff --git a/src/main/resources/assets/unicopia/textures/items/moss.png b/src/main/resources/assets/unicopia/textures/item/moss.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/moss.png rename to src/main/resources/assets/unicopia/textures/item/moss.png diff --git a/src/main/resources/assets/unicopia/textures/items/mug.png b/src/main/resources/assets/unicopia/textures/item/mug.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/mug.png rename to src/main/resources/assets/unicopia/textures/item/mug.png diff --git a/src/main/resources/assets/unicopia/textures/items/record_crusade.png b/src/main/resources/assets/unicopia/textures/item/music_disc_crusade.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/record_crusade.png rename to src/main/resources/assets/unicopia/textures/item/music_disc_crusade.png diff --git a/src/main/resources/assets/unicopia/textures/items/record_funk.png b/src/main/resources/assets/unicopia/textures/item/music_disc_funk.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/record_funk.png rename to src/main/resources/assets/unicopia/textures/item/music_disc_funk.png diff --git a/src/main/resources/assets/unicopia/textures/items/record_pet.png b/src/main/resources/assets/unicopia/textures/item/music_disc_pet.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/record_pet.png rename to src/main/resources/assets/unicopia/textures/item/music_disc_pet.png diff --git a/src/main/resources/assets/unicopia/textures/items/record_popular.png b/src/main/resources/assets/unicopia/textures/item/music_disc_popular.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/record_popular.png rename to src/main/resources/assets/unicopia/textures/item/music_disc_popular.png diff --git a/src/main/resources/assets/unicopia/textures/items/staff_remembrance.png b/src/main/resources/assets/unicopia/textures/item/remembrance_staff.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/staff_remembrance.png rename to src/main/resources/assets/unicopia/textures/item/remembrance_staff.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_rotten.png b/src/main/resources/assets/unicopia/textures/item/rotten_apple.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_rotten.png rename to src/main/resources/assets/unicopia/textures/item/rotten_apple.png diff --git a/src/main/resources/assets/unicopia/textures/items/rotten_tomato.png b/src/main/resources/assets/unicopia/textures/item/rotten_tomato.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/rotten_tomato.png rename to src/main/resources/assets/unicopia/textures/item/rotten_tomato.png diff --git a/src/main/resources/assets/unicopia/textures/items/salad.png b/src/main/resources/assets/unicopia/textures/item/salad.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/salad.png rename to src/main/resources/assets/unicopia/textures/item/salad.png diff --git a/src/main/resources/assets/unicopia/textures/items/slime_drop.png b/src/main/resources/assets/unicopia/textures/item/slime_drop.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/slime_drop.png rename to src/main/resources/assets/unicopia/textures/item/slime_drop.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_sour.png b/src/main/resources/assets/unicopia/textures/item/sour_apple.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_sour.png rename to src/main/resources/assets/unicopia/textures/item/sour_apple.png diff --git a/src/main/resources/assets/unicopia/textures/items/spellbook.png b/src/main/resources/assets/unicopia/textures/item/spellbook.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/spellbook.png rename to src/main/resources/assets/unicopia/textures/item/spellbook.png diff --git a/src/main/resources/assets/unicopia/textures/items/apple_sweet.png b/src/main/resources/assets/unicopia/textures/item/sweet_apple.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/apple_sweet.png rename to src/main/resources/assets/unicopia/textures/item/sweet_apple.png diff --git a/src/main/resources/assets/unicopia/textures/items/tomato.png b/src/main/resources/assets/unicopia/textures/item/tomato.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/tomato.png rename to src/main/resources/assets/unicopia/textures/item/tomato.png diff --git a/src/main/resources/assets/unicopia/textures/items/tomato_seeds.png b/src/main/resources/assets/unicopia/textures/item/tomato_seeds.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/tomato_seeds.png rename to src/main/resources/assets/unicopia/textures/item/tomato_seeds.png diff --git a/src/main/resources/assets/unicopia/textures/items/wheat_worms.png b/src/main/resources/assets/unicopia/textures/item/wheat_worms.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/wheat_worms.png rename to src/main/resources/assets/unicopia/textures/item/wheat_worms.png diff --git a/src/main/resources/assets/unicopia/textures/items/spear_wood.png b/src/main/resources/assets/unicopia/textures/item/wooden_spear.png similarity index 100% rename from src/main/resources/assets/unicopia/textures/items/spear_wood.png rename to src/main/resources/assets/unicopia/textures/item/wooden_spear.png