diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItems.java b/src/main/java/com/minelittlepony/unicopia/item/UItems.java index 51ba29e0..ee357920 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/UItems.java +++ b/src/main/java/com/minelittlepony/unicopia/item/UItems.java @@ -127,6 +127,13 @@ public interface UItems { GlassesItem SUNGLASSES = register("sunglasses", new GlassesItem(new FabricItemSettings().maxCount(1)), ItemGroups.COMBAT); GlassesItem BROKEN_SUNGLASSES = register("broken_sunglasses", new GlassesItem(new FabricItemSettings().maxCount(1)), ItemGroups.COMBAT); + Item ALICORN_BADGE = register(Race.ALICORN); + Item PEGASUS_BADGE = register(Race.PEGASUS); + Item UNICORN_BADGE = register(Race.UNICORN); + Item EARTH_BADGE = register(Race.EARTH); + Item BAT_BADGE = register(Race.BAT); + Item CHANGELING_BADGE = register(Race.CHANGELING); + static T register(String name, T item, ItemGroup group) { return ItemGroupRegistry.register(register(name, item), group); } @@ -151,6 +158,10 @@ public interface UItems { ) {}, ItemGroups.TOOLS); } + static Item register(Race race) { + return register(race.getId().withPath(p -> p + "_badge"), new Item(new Settings())); + } + static void bootstrap() { AppleItem.registerTickCallback(Items.APPLE); FuelRegistry.INSTANCE.add(WOODEN_POLEARM, 200); diff --git a/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java b/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java index ce7d898e..26fe630d 100644 --- a/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java +++ b/src/main/java/com/minelittlepony/unicopia/item/group/UItemGroups.java @@ -20,11 +20,11 @@ public interface UItemGroups { .filter(item -> ((ToxicHolder)item).getToxic(item.getDefaultStack()) != Toxic.EMPTY); }); - ItemGroup EARTH_PONY_ITEMS = ItemGroupRegistry.createGroupFromTag("earth_pony", UItems.APPLE_PIE::getDefaultStack); - ItemGroup UNICORN_ITEMS = ItemGroupRegistry.createGroupFromTag("unicorn", UItems.SPELLBOOK::getDefaultStack); - ItemGroup PEGASUS_ITEMS = ItemGroupRegistry.createGroupFromTag("pegasus", UItems.PEGASUS_FEATHER::getDefaultStack); - ItemGroup BAT_PONY_ITEMS = ItemGroupRegistry.createGroupFromTag("bat_pony", UItems.SUNGLASSES::getDefaultStack); - ItemGroup CHANGELING_ITEMS = ItemGroupRegistry.createGroupFromTag("changeling", UItems.LOVE_BOTTLE::getDefaultStack); + ItemGroup EARTH_PONY_ITEMS = ItemGroupRegistry.createGroupFromTag("earth_pony", UItems.EARTH_BADGE::getDefaultStack); + ItemGroup UNICORN_ITEMS = ItemGroupRegistry.createGroupFromTag("unicorn", UItems.UNICORN_BADGE::getDefaultStack); + ItemGroup PEGASUS_ITEMS = ItemGroupRegistry.createGroupFromTag("pegasus", UItems.PEGASUS_BADGE::getDefaultStack); + ItemGroup BAT_PONY_ITEMS = ItemGroupRegistry.createGroupFromTag("bat_pony", UItems.BAT_BADGE::getDefaultStack); + ItemGroup CHANGELING_ITEMS = ItemGroupRegistry.createGroupFromTag("changeling", UItems.CHANGELING_BADGE::getDefaultStack); static void bootstrap() { ItemGroupRegistry.bootstrap(); diff --git a/src/main/resources/assets/unicopia/lang/en_us.json b/src/main/resources/assets/unicopia/lang/en_us.json index 724d44ec..bcfe7eba 100644 --- a/src/main/resources/assets/unicopia/lang/en_us.json +++ b/src/main/resources/assets/unicopia/lang/en_us.json @@ -26,6 +26,13 @@ "item.unicopia.spellbook": "Spellbook", "emi.category.unicopia.spellbook": "Spellbook", + "item.unicopia.alicorn_badge": "Alicorn Emblem", + "item.unicopia.unicorn_badge": "Unicorn Emblem", + "item.unicopia.pegasus_badge": "Pegasus Emblem", + "item.unicopia.earth_badge": "Earth Pony Emblem", + "item.unicopia.changeling_badge": "Changeling Emblem", + "item.unicopia.bat_badge": "Bat Pony Emblem", + "item.unicopia.butterfly_spawn_egg": "Butterfly Spawn Egg", "item.unicopia.butterfly": "Butterfly", diff --git a/src/main/resources/assets/unicopia/models/item/alicorn_badge.json b/src/main/resources/assets/unicopia/models/item/alicorn_badge.json new file mode 100644 index 00000000..53b3c08f --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/alicorn_badge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/alicorn_badge" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/bat_badge.json b/src/main/resources/assets/unicopia/models/item/bat_badge.json new file mode 100644 index 00000000..a53d94a5 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/bat_badge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/bat_badge" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/changeling_badge.json b/src/main/resources/assets/unicopia/models/item/changeling_badge.json new file mode 100644 index 00000000..bf9829ed --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/changeling_badge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/changeling_badge" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/earth_badge.json b/src/main/resources/assets/unicopia/models/item/earth_badge.json new file mode 100644 index 00000000..5a6fec00 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/earth_badge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/earth_badge" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/pegasus_badge.json b/src/main/resources/assets/unicopia/models/item/pegasus_badge.json new file mode 100644 index 00000000..ab10dde8 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/pegasus_badge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/pegasus_badge" + } +} diff --git a/src/main/resources/assets/unicopia/models/item/unicorn_badge.json b/src/main/resources/assets/unicopia/models/item/unicorn_badge.json new file mode 100644 index 00000000..92eefb40 --- /dev/null +++ b/src/main/resources/assets/unicopia/models/item/unicorn_badge.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "unicopia:item/unicorn_badge" + } +} diff --git a/src/main/resources/assets/unicopia/textures/item/alicorn_badge.png b/src/main/resources/assets/unicopia/textures/item/alicorn_badge.png new file mode 100644 index 00000000..33be65ec Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/alicorn_badge.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/bat_badge.png b/src/main/resources/assets/unicopia/textures/item/bat_badge.png new file mode 100644 index 00000000..6a836e88 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/bat_badge.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/changeling_badge.png b/src/main/resources/assets/unicopia/textures/item/changeling_badge.png new file mode 100644 index 00000000..43f62a8c Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/changeling_badge.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/earth_badge.png b/src/main/resources/assets/unicopia/textures/item/earth_badge.png new file mode 100644 index 00000000..5385e98a Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/earth_badge.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/pegasus_badge.png b/src/main/resources/assets/unicopia/textures/item/pegasus_badge.png new file mode 100644 index 00000000..66bdcfdc Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/pegasus_badge.png differ diff --git a/src/main/resources/assets/unicopia/textures/item/unicorn_badge.png b/src/main/resources/assets/unicopia/textures/item/unicorn_badge.png new file mode 100644 index 00000000..1b4c23f4 Binary files /dev/null and b/src/main/resources/assets/unicopia/textures/item/unicorn_badge.png differ diff --git a/src/main/resources/data/unicopia/advancements/unicopia/bat/night_route.json b/src/main/resources/data/unicopia/advancements/unicopia/bat/night_route.json index 9d90152c..572b1896 100644 --- a/src/main/resources/data/unicopia/advancements/unicopia/bat/night_route.json +++ b/src/main/resources/data/unicopia/advancements/unicopia/bat/night_route.json @@ -2,7 +2,7 @@ "parent": "unicopia:unicopia/root", "display": { "icon": { - "item": "minecraft:black_candle" + "item": "unicopia:bat_badge" }, "title": { "translate": "advancements.unicopia.night_route.title" diff --git a/src/main/resources/data/unicopia/advancements/unicopia/earth/earth_route.json b/src/main/resources/data/unicopia/advancements/unicopia/earth/earth_route.json index 032ca041..c9adaf77 100644 --- a/src/main/resources/data/unicopia/advancements/unicopia/earth/earth_route.json +++ b/src/main/resources/data/unicopia/advancements/unicopia/earth/earth_route.json @@ -2,7 +2,7 @@ "parent": "unicopia:unicopia/root", "display": { "icon": { - "item": "minecraft:apple" + "item": "unicopia:earth_badge" }, "title": { "translate": "advancements.unicopia.earth_route.title" diff --git a/src/main/resources/data/unicopia/advancements/unicopia/pegasus/sky_route.json b/src/main/resources/data/unicopia/advancements/unicopia/pegasus/sky_route.json index 98b62c59..a2ce5825 100644 --- a/src/main/resources/data/unicopia/advancements/unicopia/pegasus/sky_route.json +++ b/src/main/resources/data/unicopia/advancements/unicopia/pegasus/sky_route.json @@ -2,7 +2,7 @@ "parent": "unicopia:unicopia/root", "display": { "icon": { - "item": "unicopia:pegasus_feather" + "item": "unicopia:pegasus_badge" }, "title": { "translate": "advancements.unicopia.sky_route.title" diff --git a/src/main/resources/data/unicopia/advancements/unicopia/root.json b/src/main/resources/data/unicopia/advancements/unicopia/root.json index 52f286c5..f554b338 100644 --- a/src/main/resources/data/unicopia/advancements/unicopia/root.json +++ b/src/main/resources/data/unicopia/advancements/unicopia/root.json @@ -1,7 +1,7 @@ { "display": { "icon": { - "item": "unicopia:gryphon_feather" + "item": "unicopia:alicorn_badge" }, "title": { "translate": "advancements.unicopia.root.title"