From fe9ca0b2656edea98332291e46f3f8324da40a2e Mon Sep 17 00:00:00 2001 From: bconlon Date: Sun, 5 Jan 2025 21:54:02 -0800 Subject: [PATCH] feat: initial hide bundle --- .../assets/aether_ii/items/hide_bundle.json | 39 ++++++++++++++++++ .../assets/aether_ii/lang/en_us.json | 1 + .../aether_ii/models/item/hide_bundle.json | 6 +++ .../models/item/hide_bundle_open_back.json | 6 +++ .../models/item/hide_bundle_open_front.json | 6 +++ .../data/minecraft/tags/item/bundles.json | 5 +++ .../data/generators/AetherIILanguageData.java | 1 + .../generators/models/AetherIIItemModels.java | 3 +- .../generators/tags/AetherIIItemTagData.java | 1 + .../aetherii/item/AetherIICreativeTabs.java | 1 + .../aetherii/item/AetherIIItems.java | 2 + .../aether_ii/textures/item/hide_bundle.png | Bin 0 -> 296 bytes 12 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/assets/aether_ii/items/hide_bundle.json create mode 100644 src/generated/resources/assets/aether_ii/models/item/hide_bundle.json create mode 100644 src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_back.json create mode 100644 src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_front.json create mode 100644 src/generated/resources/data/minecraft/tags/item/bundles.json create mode 100644 src/main/resources/assets/aether_ii/textures/item/hide_bundle.png diff --git a/src/generated/resources/assets/aether_ii/items/hide_bundle.json b/src/generated/resources/assets/aether_ii/items/hide_bundle.json new file mode 100644 index 000000000..a3b1a5d21 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/items/hide_bundle.json @@ -0,0 +1,39 @@ +{ + "model": { + "type": "minecraft:select", + "cases": [ + { + "model": { + "type": "minecraft:condition", + "on_false": { + "type": "minecraft:model", + "model": "aether_ii:item/hide_bundle" + }, + "on_true": { + "type": "minecraft:composite", + "models": [ + { + "type": "minecraft:model", + "model": "aether_ii:item/hide_bundle_open_back" + }, + { + "type": "minecraft:bundle/selected_item" + }, + { + "type": "minecraft:model", + "model": "aether_ii:item/hide_bundle_open_front" + } + ] + }, + "property": "minecraft:bundle/has_selected_item" + }, + "when": "gui" + } + ], + "fallback": { + "type": "minecraft:model", + "model": "aether_ii:item/hide_bundle" + }, + "property": "minecraft:display_context" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/lang/en_us.json b/src/generated/resources/assets/aether_ii/lang/en_us.json index 0f1554b88..81ba19c71 100644 --- a/src/generated/resources/assets/aether_ii/lang/en_us.json +++ b/src/generated/resources/assets/aether_ii/lang/en_us.json @@ -779,6 +779,7 @@ "item.aether_ii.green_swet_gel": "Green Swet Gel", "item.aether_ii.green_swet_jelly": "Green Swet Jelly", "item.aether_ii.healing_stone": "Healing Stone", + "item.aether_ii.hide_bundle": "Hide Bundle", "item.aether_ii.highfields_burrukai_spawn_egg": "Burrukai Spawn Egg", "item.aether_ii.highfields_kirrid_spawn_egg": "Kirrid Spawn Egg", "item.aether_ii.highfields_taegore_spawn_egg": "Taegore Spawn Egg", diff --git a/src/generated/resources/assets/aether_ii/models/item/hide_bundle.json b/src/generated/resources/assets/aether_ii/models/item/hide_bundle.json new file mode 100644 index 000000000..580f2664a --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/item/hide_bundle.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "aether_ii:item/hide_bundle" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_back.json b/src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_back.json new file mode 100644 index 000000000..f751b3e21 --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_back.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/template_bundle_open_back", + "textures": { + "layer0": "aether_ii:item/hide_bundle_open_back" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_front.json b/src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_front.json new file mode 100644 index 000000000..bb45fc1db --- /dev/null +++ b/src/generated/resources/assets/aether_ii/models/item/hide_bundle_open_front.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/template_bundle_open_front", + "textures": { + "layer0": "aether_ii:item/hide_bundle_open_front" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/bundles.json b/src/generated/resources/data/minecraft/tags/item/bundles.json new file mode 100644 index 000000000..e307f4462 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/bundles.json @@ -0,0 +1,5 @@ +{ + "values": [ + "aether_ii:hide_bundle" + ] +} \ No newline at end of file diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java index eb8cf11da..51bad1004 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/AetherIILanguageData.java @@ -796,6 +796,7 @@ protected void addTranslations() { this.addItem(AetherIIItems.SKEPHID_SPAWN_EGG, "Skephid Spawn Egg"); // Misc + this.addItem(AetherIIItems.HIDE_BUNDLE, "Hide Bundle"); this.addItem(AetherIIItems.MOA_EGG, "Moa Egg"); this.addItem(AetherIIItems.MOA_FEED, "Moa Feed"); this.addItem(AetherIIItems.BLUEBERRY_MOA_FEED, "Blueberry Moa Feed"); diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIItemModels.java b/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIItemModels.java index bbb2c25c1..c8a13960e 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIItemModels.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/models/AetherIIItemModels.java @@ -185,7 +185,7 @@ public void run() { this.generateGliderItem(AetherIIItems.GOLDEN_AERCLOUD_GLIDER.get(), false); this.generateGliderItem(AetherIIItems.BLUE_AERCLOUD_GLIDER.get(), true); this.generateGliderItem(AetherIIItems.PURPLE_AERCLOUD_GLIDER.get(), true); -// + // Skyroot Buckets this.generateFlatItem(AetherIIItems.SKYROOT_BUCKET.get(), ModelTemplates.FLAT_ITEM); this.generateFlatItem(AetherIIItems.SKYROOT_WATER_BUCKET.get(), ModelTemplates.FLAT_ITEM); @@ -235,6 +235,7 @@ public void run() { this.generateSpawnEgg(AetherIIItems.SKEPHID_SPAWN_EGG.get(), 0x7D96AB, 0xF7CC94); // Misc + this.generateBundleModels(AetherIIItems.HIDE_BUNDLE.get()); this.generateMoaEggItem(AetherIIItems.MOA_EGG.get()); this.generateFlatItem(AetherIIItems.MOA_FEED.get(), ModelTemplates.FLAT_ITEM); this.generateFlatItem(AetherIIItems.BLUEBERRY_MOA_FEED.get(), ModelTemplates.FLAT_ITEM); diff --git a/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIItemTagData.java b/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIItemTagData.java index 6c006c9a8..3cc0be99b 100644 --- a/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIItemTagData.java +++ b/src/main/java/com/aetherteam/aetherii/data/generators/tags/AetherIIItemTagData.java @@ -595,6 +595,7 @@ public void addTags(HolderLookup.Provider provider) { AetherIIItems.ARKENIUM_PICKAXE.get(), AetherIIItems.GRAVITITE_PICKAXE.get() ); + this.tag(ItemTags.BUNDLES).add(AetherIIItems.HIDE_BUNDLE.get()); this.tag(ItemTags.SWORDS).addTag(AetherIITags.Items.TOOLS_SHORTSWORDS); this.tag(ItemTags.AXES).add( AetherIIItems.SKYROOT_AXE.get(), diff --git a/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java b/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java index b5f44592c..247491be6 100644 --- a/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java +++ b/src/main/java/com/aetherteam/aetherii/item/AetherIICreativeTabs.java @@ -534,6 +534,7 @@ public class AetherIICreativeTabs { output.accept(AetherIIItems.GOLDEN_AERCLOUD_GLIDER.get()); output.accept(AetherIIItems.BLUE_AERCLOUD_GLIDER.get()); output.accept(AetherIIItems.PURPLE_AERCLOUD_GLIDER.get()); + output.accept(AetherIIItems.HIDE_BUNDLE.get()); output.accept(AetherIIItems.MOA_SADDLE.get()); output.accept(AetherIIItems.IRRADIATED_ARMOR.get()); output.accept(AetherIIItems.IRRADIATED_WEAPON.get()); diff --git a/src/main/java/com/aetherteam/aetherii/item/AetherIIItems.java b/src/main/java/com/aetherteam/aetherii/item/AetherIIItems.java index cfa18c19e..5ac4e3cfe 100644 --- a/src/main/java/com/aetherteam/aetherii/item/AetherIIItems.java +++ b/src/main/java/com/aetherteam/aetherii/item/AetherIIItems.java @@ -78,6 +78,7 @@ import net.minecraft.world.entity.EntityType; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.*; +import net.minecraft.world.item.component.BundleContents; import net.minecraft.world.item.component.Consumables; import net.minecraft.world.item.equipment.ArmorType; import net.minecraft.world.level.block.Blocks; @@ -324,6 +325,7 @@ public class AetherIIItems { public static final DeferredItem SKEPHID_SPAWN_EGG = register("skephid_spawn_egg", (properties) -> new SpawnEggItem(AetherIIEntityTypes.SKEPHID.get(), properties)); // Misc + public static final DeferredItem HIDE_BUNDLE = register("hide_bundle", BundleItem::new, () -> new Item.Properties().stacksTo(1).component(DataComponents.BUNDLE_CONTENTS, BundleContents.EMPTY)); public static final DeferredItem MOA_EGG = register("moa_egg", MoaEggItem::new, () -> new Item.Properties().stacksTo(1).component(AetherIIDataComponents.MOA_EGG_TYPE.get(), MoaEggType.defaultType())); public static final DeferredItem MOA_FEED = register("moa_feed"); public static final DeferredItem BLUEBERRY_MOA_FEED = register("blueberry_moa_feed"); diff --git a/src/main/resources/assets/aether_ii/textures/item/hide_bundle.png b/src/main/resources/assets/aether_ii/textures/item/hide_bundle.png new file mode 100644 index 0000000000000000000000000000000000000000..704ca21de6b18f467d55c3e51e127795b1f79f33 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~mUKs7M+SzC z{oH>NS%G}@0G|-o!B( zS^@7`cOb=E666>B9|4nJ@ErzW#^d=bQh|N7$FgyfW&fw|l=d#Wzp$Py%$8z}q literal 0 HcmV?d00001