From 4789e61e2516963faa5a266bb4f9ed16fb598d8e Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Sat, 16 Nov 2024 23:05:03 +0100 Subject: [PATCH 1/2] Add AIOT to tool tags (Closes #1450) --- CHANGELOG.md | 1 + .../74807d958079a027731c973b9550985af6711175 | 7 +++- .../data/minecraft/tags/item/axes.json | 10 +++++ .../tags/item/cluster_max_harvestables.json | 10 +++++ .../data/minecraft/tags/item/pickaxes.json | 10 +++++ .../data/minecraft/tags/item/shovels.json | 10 +++++ .../data/minecraft/tags/item/swords.json | 10 +++++ .../data/ItemTagsGenerator.java | 41 +++++++++++++++++++ 8 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 src/generated/resources/data/minecraft/tags/item/axes.json create mode 100644 src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json create mode 100644 src/generated/resources/data/minecraft/tags/item/pickaxes.json create mode 100644 src/generated/resources/data/minecraft/tags/item/shovels.json create mode 100644 src/generated/resources/data/minecraft/tags/item/swords.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 43d8562e9..6b13c3553 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ * Fixed Farmer not playing well with non-vanilla farmland. * Added the ability to change the farmers work area with a compass. * Make blocks still drop items even when broken incorrectly. +* Add AIOT to the necessary tool related item tags (swords, pickaxes, axes, shovels) # 1.3.10+mc1.21.1 * Fixed Fluid placer not being harvestable. diff --git a/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 b/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 index 0303097dc..0f1fb38cc 100644 --- a/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 +++ b/src/generated/resources/.cache/74807d958079a027731c973b9550985af6711175 @@ -1,4 +1,4 @@ -// 1.21.1 2024-10-31T20:14:02.6354984 Tags for minecraft:item mod id actuallyadditions +// 1.21.1 2024-11-16T23:02:28.9307514 Tags for minecraft:item mod id actuallyadditions 87327118c2f16da245b76de4fdcaab149456d9b8 data/actuallyadditions/tags/item/coffee_beans.json f3ee78cd8c9563bd1828de2b4b336735f289f9f2 data/actuallyadditions/tags/item/crystals.json 441008b49b4bab00125100fc969cb6582eff7271 data/actuallyadditions/tags/item/crystal_blocks.json @@ -38,6 +38,11 @@ fb95ac8041521e1d2879f6fcb652266dcd9e0fb1 data/c/tags/item/storage_blocks/empower 148cd937543fd58b196403c18839b2698bf87fdf data/c/tags/item/storage_blocks/palis_crystal.json b9aa28a54d47054ba5653bec2f20e0a675ab5120 data/c/tags/item/storage_blocks/restonia_crystal.json fb4f349bc6fd89f26ef2ba72a9236f05eefd8ea2 data/c/tags/item/storage_blocks/void_crystal.json +67af57742b08793269bb4a594e224a05f55b83e5 data/minecraft/tags/item/axes.json +67af57742b08793269bb4a594e224a05f55b83e5 data/minecraft/tags/item/cluster_max_harvestables.json +67af57742b08793269bb4a594e224a05f55b83e5 data/minecraft/tags/item/pickaxes.json +67af57742b08793269bb4a594e224a05f55b83e5 data/minecraft/tags/item/shovels.json 51d50547b5f031f4fa6e62189af06059a407c009 data/minecraft/tags/item/slabs.json a60870f29ca48ea0d55ac32620ff5b4bb2f2f62e data/minecraft/tags/item/stairs.json +67af57742b08793269bb4a594e224a05f55b83e5 data/minecraft/tags/item/swords.json f74407e86c92d0d9435d62ff0f95999f3a84c674 data/minecraft/tags/item/walls.json diff --git a/src/generated/resources/data/minecraft/tags/item/axes.json b/src/generated/resources/data/minecraft/tags/item/axes.json new file mode 100644 index 000000000..ea7ea70d3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/axes.json @@ -0,0 +1,10 @@ +{ + "values": [ + "actuallyadditions:wooden_aiot", + "actuallyadditions:stone_aiot", + "actuallyadditions:iron_aiot", + "actuallyadditions:gold_aiot", + "actuallyadditions:diamond_aiot", + "actuallyadditions:netherite_aiot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json b/src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json new file mode 100644 index 000000000..ea7ea70d3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json @@ -0,0 +1,10 @@ +{ + "values": [ + "actuallyadditions:wooden_aiot", + "actuallyadditions:stone_aiot", + "actuallyadditions:iron_aiot", + "actuallyadditions:gold_aiot", + "actuallyadditions:diamond_aiot", + "actuallyadditions:netherite_aiot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/pickaxes.json b/src/generated/resources/data/minecraft/tags/item/pickaxes.json new file mode 100644 index 000000000..ea7ea70d3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/pickaxes.json @@ -0,0 +1,10 @@ +{ + "values": [ + "actuallyadditions:wooden_aiot", + "actuallyadditions:stone_aiot", + "actuallyadditions:iron_aiot", + "actuallyadditions:gold_aiot", + "actuallyadditions:diamond_aiot", + "actuallyadditions:netherite_aiot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/shovels.json b/src/generated/resources/data/minecraft/tags/item/shovels.json new file mode 100644 index 000000000..ea7ea70d3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/shovels.json @@ -0,0 +1,10 @@ +{ + "values": [ + "actuallyadditions:wooden_aiot", + "actuallyadditions:stone_aiot", + "actuallyadditions:iron_aiot", + "actuallyadditions:gold_aiot", + "actuallyadditions:diamond_aiot", + "actuallyadditions:netherite_aiot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/swords.json b/src/generated/resources/data/minecraft/tags/item/swords.json new file mode 100644 index 000000000..ea7ea70d3 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/item/swords.json @@ -0,0 +1,10 @@ +{ + "values": [ + "actuallyadditions:wooden_aiot", + "actuallyadditions:stone_aiot", + "actuallyadditions:iron_aiot", + "actuallyadditions:gold_aiot", + "actuallyadditions:diamond_aiot", + "actuallyadditions:netherite_aiot" + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index 29d6d5218..13641a923 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -120,5 +120,46 @@ public class ItemTagsGenerator extends ItemTagsProvider { ); tag(ActuallyTags.Items.CURIOS_CHARM).add(ActuallyItems.CRAFTER_ON_A_STICK.get()); + + tag(ItemTags.SWORDS).add( + ActuallyItems.WOODEN_AIOT.get(), + ActuallyItems.STONE_AIOT.get(), + ActuallyItems.IRON_AIOT.get(), + ActuallyItems.GOLD_AIOT.get(), + ActuallyItems.DIAMOND_AIOT.get(), + ActuallyItems.NETHERITE_AIOT.get() + ); + tag(ItemTags.AXES).add( + ActuallyItems.WOODEN_AIOT.get(), + ActuallyItems.STONE_AIOT.get(), + ActuallyItems.IRON_AIOT.get(), + ActuallyItems.GOLD_AIOT.get(), + ActuallyItems.DIAMOND_AIOT.get(), + ActuallyItems.NETHERITE_AIOT.get() + ); + tag(ItemTags.PICKAXES).add( + ActuallyItems.WOODEN_AIOT.get(), + ActuallyItems.STONE_AIOT.get(), + ActuallyItems.IRON_AIOT.get(), + ActuallyItems.GOLD_AIOT.get(), + ActuallyItems.DIAMOND_AIOT.get(), + ActuallyItems.NETHERITE_AIOT.get() + ); + tag(ItemTags.CLUSTER_MAX_HARVESTABLES).add( + ActuallyItems.WOODEN_AIOT.get(), + ActuallyItems.STONE_AIOT.get(), + ActuallyItems.IRON_AIOT.get(), + ActuallyItems.GOLD_AIOT.get(), + ActuallyItems.DIAMOND_AIOT.get(), + ActuallyItems.NETHERITE_AIOT.get() + ); + tag(ItemTags.SHOVELS).add( + ActuallyItems.WOODEN_AIOT.get(), + ActuallyItems.STONE_AIOT.get(), + ActuallyItems.IRON_AIOT.get(), + ActuallyItems.GOLD_AIOT.get(), + ActuallyItems.DIAMOND_AIOT.get(), + ActuallyItems.NETHERITE_AIOT.get() + ); } } From 6159fda4bd7ecb580cd6baa85a4fc020ae6f2fe8 Mon Sep 17 00:00:00 2001 From: Mrbysco Date: Sat, 16 Nov 2024 23:14:45 +0100 Subject: [PATCH 2/2] Fix the goggle rendering (Closes #1449) --- CHANGELOG.md | 1 + .../mod/material/ArmorMaterials.java | 3 +-- .../armor/goggles_armor_material_layer_2.png | Bin 1700 -> 0 bytes ..._material_layer_1.png => goggles_layer_1.png} | Bin 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_2.png rename src/main/resources/assets/actuallyadditions/textures/models/armor/{goggles_armor_material_layer_1.png => goggles_layer_1.png} (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b13c3553..616e903b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * Added the ability to change the farmers work area with a compass. * Make blocks still drop items even when broken incorrectly. * Add AIOT to the necessary tool related item tags (swords, pickaxes, axes, shovels) +* Fix the Engineer Goggles not rendering correctly # 1.3.10+mc1.21.1 * Fixed Fluid placer not being harvestable. diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/material/ArmorMaterials.java b/src/main/java/de/ellpeck/actuallyadditions/mod/material/ArmorMaterials.java index 1d81b594a..b0dca9c0e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/material/ArmorMaterials.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/material/ArmorMaterials.java @@ -46,8 +46,7 @@ public class ArmorMaterials { SoundEvents.ARMOR_EQUIP_GENERIC, () -> Ingredient.EMPTY, List.of( - new ArmorMaterial.Layer(ActuallyAdditions.modLoc("goggles"), "", true), - new ArmorMaterial.Layer(ActuallyAdditions.modLoc("goggles"), "_overlay", false) + new ArmorMaterial.Layer(ActuallyAdditions.modLoc("goggles"), "", true) ), 0.0F, 0.0F diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_2.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_2.png deleted file mode 100644 index 7ac1e1f0c62f85759273721906982bfc66fc6115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1700 zcmbVNO>f*p7-Y>Q&{h%w^o{wjq_jy0&-LLm{Z>_Ig zSu+e{y|>fdhwpWG(B+rmegC_AU%}_qV&`sU7_YtAJQs{_zJ1FuUV4=F59)*HBPMia zaj9cvO|k;ehH>@Uq~PLE)hJejG!MnyRwP}jN|>L*Yyw;wYAp^c)YjdQhR+0sN+Zy$pj^MIU- zuKFj1viDV`k4mAok3r@}<4wUjrQ)?N`&y3{iP~F8MwD6vy?ZCkr5;!BtsGEYUaQb- zvW6jLF6lcSBMu|<{pL+(&`8TPIa!4|m^ghWV6MwZ>oF*ljN~?T+sRzK^NpOyx!q>*ZC=bD?_O z(1hSvX)0OElOB;o;`S!-un?Y)+lq6{Tb#&E4k6&d;(S+&qoxF!^RwF^wE&KP<+*~! zL^u?~X$VH*B{<+b#)>FHV|a_0FW5dVQ@D_Pw94A3lE4^qNfKWOERxv4uJi;BD2;KO z$4R0n^&HP{%6?i&Y$vTC$0zfPbX$EkAB|EpEgr^2b16boG}WM_IbTlCiN|wUo}V8N z6_7rqN@mt8oz!Dqs;vRU?wM6+KS_MWkDo66`BFL4v?~4Fs(lgZ^RS2^&j$)RtZg>V z*iA2*CB^=4zNULCeQN=SX4njuT^J_IKCW`0E}={RaCZ4e=