diff --git a/CHANGELOG.md b/CHANGELOG.md index 890a6eebb..2b3cccdda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * 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) +* Fix the Engineer Goggles not rendering correctly * Added the ability for fluid collectors to collect water and lava from filled cauldrons. # 1.3.10+mc1.21.1 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() + ); } } 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 7ac1e1f0c..000000000 Binary files a/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_2.png and /dev/null differ diff --git a/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_1.png b/src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_layer_1.png similarity index 100% rename from src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_armor_material_layer_1.png rename to src/main/resources/assets/actuallyadditions/textures/models/armor/goggles_layer_1.png