From 4263af8a88fb179ceeae94e3f65ca51f5e7a1ba0 Mon Sep 17 00:00:00 2001 From: Satherov Date: Tue, 9 Jun 2026 05:57:58 +0200 Subject: [PATCH 1/2] Alloy Pickaxe --- .../allthemodium/items/alloy_pickaxe.json | 6 ++++++ .../assets/allthemodium/lang/en_us.json | 1 + .../models/item/alloy_pickaxe.json | 6 ++++++ .../data/c/tags/item/enchantables.json | 1 + .../resources/data/c/tags/item/tools.json | 1 + .../data/c/tags/item/tools/mining_tool.json | 1 + .../tags/item/cluster_max_harvestables.json | 1 + .../tags/item/enchantable/durability.json | 1 + .../tags/item/enchantable/mining.json | 1 + .../tags/item/enchantable/mining_loot.json | 1 + .../tags/item/enchantable/vanishing.json | 1 + .../data/minecraft/tags/item/pickaxes.json | 1 + .../allthemodium/core/registry/ATMItems.java | 9 +++++---- .../data/provider/ATMLanguageProvider.java | 1 + .../provider/tags/ATMItemTagsProvider.java | 18 +++++++++--------- .../{alloy_pick.png => alloy_pickaxe.png} | Bin 16 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 src/generated/resources/assets/allthemodium/items/alloy_pickaxe.json create mode 100644 src/generated/resources/assets/allthemodium/models/item/alloy_pickaxe.json rename src/main/resources/assets/allthemodium/textures/item/{alloy_pick.png => alloy_pickaxe.png} (100%) diff --git a/src/generated/resources/assets/allthemodium/items/alloy_pickaxe.json b/src/generated/resources/assets/allthemodium/items/alloy_pickaxe.json new file mode 100644 index 00000000..fe0b98fe --- /dev/null +++ b/src/generated/resources/assets/allthemodium/items/alloy_pickaxe.json @@ -0,0 +1,6 @@ +{ + "model": { + "type": "minecraft:model", + "model": "allthemodium:item/alloy_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/allthemodium/lang/en_us.json b/src/generated/resources/assets/allthemodium/lang/en_us.json index 0db4cfab..f898e2af 100644 --- a/src/generated/resources/assets/allthemodium/lang/en_us.json +++ b/src/generated/resources/assets/allthemodium/lang/en_us.json @@ -109,6 +109,7 @@ "item.allthemodium.alloy_axe": "Allthemodium Alloy Axe", "item.allthemodium.alloy_mace": "Allthemodium Alloy Mace", "item.allthemodium.alloy_paxel": "Allthemodium Alloy Paxel", + "item.allthemodium.alloy_pickaxe": "Allthemodium Alloy Pickaxe", "item.allthemodium.alloy_shovel": "Allthemodium Alloy Shovel", "item.allthemodium.alloy_sword": "Allthemodium Alloy Sword", "item.allthemodium.alloy_trident": "Allthemodium Alloy Trident", diff --git a/src/generated/resources/assets/allthemodium/models/item/alloy_pickaxe.json b/src/generated/resources/assets/allthemodium/models/item/alloy_pickaxe.json new file mode 100644 index 00000000..e48ec5ae --- /dev/null +++ b/src/generated/resources/assets/allthemodium/models/item/alloy_pickaxe.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "allthemodium:item/alloy_pickaxe" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/c/tags/item/enchantables.json b/src/generated/resources/data/c/tags/item/enchantables.json index fbf604f2..eb4a4352 100644 --- a/src/generated/resources/data/c/tags/item/enchantables.json +++ b/src/generated/resources/data/c/tags/item/enchantables.json @@ -34,6 +34,7 @@ "allthemodium:unobtainium_mace", "allthemodium:unobtainium_crossbow", "allthemodium:alloy_sword", + "allthemodium:alloy_pickaxe", "allthemodium:alloy_axe", "allthemodium:alloy_shovel", "allthemodium:alloy_paxel", diff --git a/src/generated/resources/data/c/tags/item/tools.json b/src/generated/resources/data/c/tags/item/tools.json index 02baef0f..688eefd5 100644 --- a/src/generated/resources/data/c/tags/item/tools.json +++ b/src/generated/resources/data/c/tags/item/tools.json @@ -3,6 +3,7 @@ "allthemodium:allthemodium_pickaxe", "allthemodium:vibranium_pickaxe", "allthemodium:unobtainium_pickaxe", + "allthemodium:alloy_pickaxe", "allthemodium:allthemodium_axe", "allthemodium:vibranium_axe", "allthemodium:unobtainium_axe", diff --git a/src/generated/resources/data/c/tags/item/tools/mining_tool.json b/src/generated/resources/data/c/tags/item/tools/mining_tool.json index e73b500d..9d24b670 100644 --- a/src/generated/resources/data/c/tags/item/tools/mining_tool.json +++ b/src/generated/resources/data/c/tags/item/tools/mining_tool.json @@ -3,6 +3,7 @@ "allthemodium:allthemodium_pickaxe", "allthemodium:vibranium_pickaxe", "allthemodium:unobtainium_pickaxe", + "allthemodium:alloy_pickaxe", "allthemodium:allthemodium_axe", "allthemodium:vibranium_axe", "allthemodium:unobtainium_axe", 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 index 7cd0f3b9..8fe4dd98 100644 --- a/src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json +++ b/src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json @@ -3,6 +3,7 @@ "allthemodium:allthemodium_pickaxe", "allthemodium:vibranium_pickaxe", "allthemodium:unobtainium_pickaxe", + "allthemodium:alloy_pickaxe", "allthemodium:alloy_paxel" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json b/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json index fbf604f2..eb4a4352 100644 --- a/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/durability.json @@ -34,6 +34,7 @@ "allthemodium:unobtainium_mace", "allthemodium:unobtainium_crossbow", "allthemodium:alloy_sword", + "allthemodium:alloy_pickaxe", "allthemodium:alloy_axe", "allthemodium:alloy_shovel", "allthemodium:alloy_paxel", diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json b/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json index e73b500d..9d24b670 100644 --- a/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/mining.json @@ -3,6 +3,7 @@ "allthemodium:allthemodium_pickaxe", "allthemodium:vibranium_pickaxe", "allthemodium:unobtainium_pickaxe", + "allthemodium:alloy_pickaxe", "allthemodium:allthemodium_axe", "allthemodium:vibranium_axe", "allthemodium:unobtainium_axe", diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json b/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json index e73b500d..9d24b670 100644 --- a/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json @@ -3,6 +3,7 @@ "allthemodium:allthemodium_pickaxe", "allthemodium:vibranium_pickaxe", "allthemodium:unobtainium_pickaxe", + "allthemodium:alloy_pickaxe", "allthemodium:allthemodium_axe", "allthemodium:vibranium_axe", "allthemodium:unobtainium_axe", diff --git a/src/generated/resources/data/minecraft/tags/item/enchantable/vanishing.json b/src/generated/resources/data/minecraft/tags/item/enchantable/vanishing.json index fbf604f2..eb4a4352 100644 --- a/src/generated/resources/data/minecraft/tags/item/enchantable/vanishing.json +++ b/src/generated/resources/data/minecraft/tags/item/enchantable/vanishing.json @@ -34,6 +34,7 @@ "allthemodium:unobtainium_mace", "allthemodium:unobtainium_crossbow", "allthemodium:alloy_sword", + "allthemodium:alloy_pickaxe", "allthemodium:alloy_axe", "allthemodium:alloy_shovel", "allthemodium:alloy_paxel", diff --git a/src/generated/resources/data/minecraft/tags/item/pickaxes.json b/src/generated/resources/data/minecraft/tags/item/pickaxes.json index 7cd0f3b9..8fe4dd98 100644 --- a/src/generated/resources/data/minecraft/tags/item/pickaxes.json +++ b/src/generated/resources/data/minecraft/tags/item/pickaxes.json @@ -3,6 +3,7 @@ "allthemodium:allthemodium_pickaxe", "allthemodium:vibranium_pickaxe", "allthemodium:unobtainium_pickaxe", + "allthemodium:alloy_pickaxe", "allthemodium:alloy_paxel" ] } \ No newline at end of file diff --git a/src/main/java/net/allthemods/allthemodium/core/registry/ATMItems.java b/src/main/java/net/allthemods/allthemodium/core/registry/ATMItems.java index 3c02b8ad..00b325cc 100644 --- a/src/main/java/net/allthemods/allthemodium/core/registry/ATMItems.java +++ b/src/main/java/net/allthemods/allthemodium/core/registry/ATMItems.java @@ -146,12 +146,13 @@ public class ATMItems { .fireResistant() )); - public static final DeferredHolder ALLOY_SWORD = ATMItems.register("alloy_sword", p -> new Item(p.sword(ATMToolMaterials.UNOBTAINIUM, 20.0F, 1.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder ALLOY_AXE = ATMItems.register("alloy_axe", p -> new AxeItem(ATMToolMaterials.UNOBTAINIUM, 18.0F, -2.6F, p.component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); - public static final DeferredHolder ALLOY_SHOVEL = ATMItems.register("alloy_shovel", p -> new ShovelItem(ATMToolMaterials.UNOBTAINIUM, 8.0F, -0.4F, p.component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder ALLOY_SWORD = ATMItems.register("alloy_sword", p -> new Item(p.sword(ATMToolMaterials.ALLOY, 20.0F, 1.5F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder ALLOY_PICKAXE = ATMItems.register("alloy_pickaxe", p -> new Item(p.pickaxe(ATMToolMaterials.ALLOY, 8.0F, -0.4F).component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder ALLOY_AXE = ATMItems.register("alloy_axe", p -> new AxeItem(ATMToolMaterials.ALLOY, 18.0F, -2.6F, p.component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); + public static final DeferredHolder ALLOY_SHOVEL = ATMItems.register("alloy_shovel", p -> new ShovelItem(ATMToolMaterials.ALLOY, 8.0F, -0.4F, p.component(DataComponents.UNBREAKABLE, Unit.INSTANCE).fireResistant().rarity(Rarity.EPIC))); public static final DeferredHolder ALLOY_PAXEL = ATMItems.register("alloy_paxel", p -> new PaxelItem(p .rarity(Rarity.EPIC) - .tool(ATMToolMaterials.UNOBTAINIUM, ATMTags.Blocks.MINEABLE_WITH_PAXEL, 12.0F, -0.6F, 2.0F) + .tool(ATMToolMaterials.ALLOY, ATMTags.Blocks.MINEABLE_WITH_PAXEL, 12.0F, -0.6F, 2.0F) .component(DataComponents.UNBREAKABLE, Unit.INSTANCE) .fireResistant() diff --git a/src/main/java/net/allthemods/allthemodium/data/provider/ATMLanguageProvider.java b/src/main/java/net/allthemods/allthemodium/data/provider/ATMLanguageProvider.java index fcf73531..8e6dc1a4 100644 --- a/src/main/java/net/allthemods/allthemodium/data/provider/ATMLanguageProvider.java +++ b/src/main/java/net/allthemods/allthemodium/data/provider/ATMLanguageProvider.java @@ -227,6 +227,7 @@ private void addItems() { this.addItem(ATMItems.UNOBTAINIUM_MACE, "Unobtainium Mace"); this.addItem(ATMItems.ALLOY_SWORD, "Allthemodium Alloy Sword"); + this.addItem(ATMItems.ALLOY_PICKAXE, "Allthemodium Alloy Pickaxe"); this.addItem(ATMItems.ALLOY_AXE, "Allthemodium Alloy Axe"); this.addItem(ATMItems.ALLOY_SHOVEL, "Allthemodium Alloy Shovel"); this.addItem(ATMItems.ALLOY_PAXEL, "Allthemodium Alloy Paxel"); diff --git a/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMItemTagsProvider.java b/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMItemTagsProvider.java index 66505663..e3ccb541 100644 --- a/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMItemTagsProvider.java +++ b/src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMItemTagsProvider.java @@ -233,7 +233,7 @@ protected void addTags(HolderLookup.Provider registries) { ATMItems.ALLTHEMODIUM_SWORD.get(), ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.ALLTHEMODIUM_MACE.get(), ATMItems.ALLTHEMODIUM_BOW.get(), ATMItems.VIBRANIUM_SWORD.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.VIBRANIUM_MACE.get(), ATMItems.VIBRANIUM_SHIELD.get(), ATMItems.UNOBTAINIUM_SWORD.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_HOE.get(), ATMItems.UNOBTAINIUM_MACE.get(), ATMItems.UNOBTAINIUM_CROSSBOW.get(), - ATMItems.ALLOY_SWORD.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLOY_PAXEL.get(), ATMItems.ALLOY_MACE.get(), ATMItems.ALLOY_TRIDENT.get() + ATMItems.ALLOY_SWORD.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLOY_PAXEL.get(), ATMItems.ALLOY_MACE.get(), ATMItems.ALLOY_TRIDENT.get() ); this.tag(ItemTags.VANISHING_ENCHANTABLE) .add(ATMItems.ALLTHEMODIUM_HELMET.get(), ATMItems.ALLTHEMODIUM_CHESTPLATE.get(), ATMItems.ALLTHEMODIUM_LEGGINGS.get(), ATMItems.ALLTHEMODIUM_BOOTS.get(), @@ -242,7 +242,7 @@ protected void addTags(HolderLookup.Provider registries) { ATMItems.ALLTHEMODIUM_SWORD.get(), ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.ALLTHEMODIUM_MACE.get(), ATMItems.ALLTHEMODIUM_BOW.get(), ATMItems.VIBRANIUM_SWORD.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.VIBRANIUM_MACE.get(), ATMItems.VIBRANIUM_SHIELD.get(), ATMItems.UNOBTAINIUM_SWORD.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_HOE.get(), ATMItems.UNOBTAINIUM_MACE.get(), ATMItems.UNOBTAINIUM_CROSSBOW.get(), - ATMItems.ALLOY_SWORD.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLOY_PAXEL.get(), ATMItems.ALLOY_MACE.get(), ATMItems.ALLOY_TRIDENT.get() + ATMItems.ALLOY_SWORD.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLOY_PAXEL.get(), ATMItems.ALLOY_MACE.get(), ATMItems.ALLOY_TRIDENT.get() ); this.tag(ItemTags.SWORDS).add(ATMItems.ALLTHEMODIUM_SWORD.get(), ATMItems.VIBRANIUM_SWORD.get(), ATMItems.UNOBTAINIUM_SWORD.get(), ATMItems.ALLOY_SWORD.get()).add(ATMItems.ALLOY_PAXEL.get()); @@ -250,7 +250,7 @@ protected void addTags(HolderLookup.Provider registries) { .add(ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.ALLOY_AXE.get()) .add(ATMItems.ALLOY_PAXEL.get()); this.tag(ItemTags.PICKAXES) - .add(ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get()) + .add(ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.ALLOY_PICKAXE.get()) .add(ATMItems.ALLOY_PAXEL.get()); this.tag(ItemTags.SHOVELS) .add(ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.ALLOY_SHOVEL.get()) @@ -279,7 +279,7 @@ protected void addTags(HolderLookup.Provider registries) { .add(ATMItems.ALLOY_PAXEL.get()); this.tag(ItemTags.MINING_ENCHANTABLE) .add( - ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), + ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.UNOBTAINIUM_HOE.get(), @@ -287,7 +287,7 @@ protected void addTags(HolderLookup.Provider registries) { ); this.tag(ItemTags.MINING_LOOT_ENCHANTABLE) .add( - ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), + ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.UNOBTAINIUM_HOE.get(), @@ -299,7 +299,7 @@ protected void addTags(HolderLookup.Provider registries) { this.tag(Tags.Items.TOOLS) .add( - ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), + ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.UNOBTAINIUM_HOE.get(), @@ -320,7 +320,7 @@ protected void addTags(HolderLookup.Provider registries) { this.tag(Tags.Items.RANGED_WEAPON_TOOLS).add(ATMItems.ALLTHEMODIUM_BOW.get(), ATMItems.UNOBTAINIUM_CROSSBOW.get()); this.tag(Tags.Items.MINING_TOOL_TOOLS) .add( - ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), + ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.UNOBTAINIUM_HOE.get(), @@ -333,11 +333,11 @@ protected void addTags(HolderLookup.Provider registries) { ATMItems.ALLTHEMODIUM_SWORD.get(), ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.ALLTHEMODIUM_AXE.get(), ATMItems.ALLTHEMODIUM_SHOVEL.get(), ATMItems.ALLTHEMODIUM_HOE.get(), ATMItems.ALLTHEMODIUM_MACE.get(), ATMItems.ALLTHEMODIUM_BOW.get(), ATMItems.VIBRANIUM_SWORD.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.VIBRANIUM_AXE.get(), ATMItems.VIBRANIUM_SHOVEL.get(), ATMItems.VIBRANIUM_HOE.get(), ATMItems.VIBRANIUM_MACE.get(), ATMItems.VIBRANIUM_SHIELD.get(), ATMItems.UNOBTAINIUM_SWORD.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_AXE.get(), ATMItems.UNOBTAINIUM_SHOVEL.get(), ATMItems.UNOBTAINIUM_HOE.get(), ATMItems.UNOBTAINIUM_MACE.get(), ATMItems.UNOBTAINIUM_CROSSBOW.get(), - ATMItems.ALLOY_SWORD.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLOY_PAXEL.get(), ATMItems.ALLOY_MACE.get(), ATMItems.ALLOY_TRIDENT.get() + ATMItems.ALLOY_SWORD.get(), ATMItems.ALLOY_PICKAXE.get(), ATMItems.ALLOY_AXE.get(), ATMItems.ALLOY_SHOVEL.get(), ATMItems.ALLOY_PAXEL.get(), ATMItems.ALLOY_MACE.get(), ATMItems.ALLOY_TRIDENT.get() ); this.tag(ItemTags.CLUSTER_MAX_HARVESTABLES) - .add(ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get()) + .add(ATMItems.ALLTHEMODIUM_PICKAXE.get(), ATMItems.VIBRANIUM_PICKAXE.get(), ATMItems.UNOBTAINIUM_PICKAXE.get(), ATMItems.ALLOY_PICKAXE.get()) .add(ATMItems.ALLOY_PAXEL.get()); this.tag(ItemTags.TRIM_MATERIALS).add(ATMItems.ALLTHEMODIUM_INGOT.get(), ATMItems.VIBRANIUM_INGOT.get(), ATMItems.UNOBTAINIUM_INGOT.get()); diff --git a/src/main/resources/assets/allthemodium/textures/item/alloy_pick.png b/src/main/resources/assets/allthemodium/textures/item/alloy_pickaxe.png similarity index 100% rename from src/main/resources/assets/allthemodium/textures/item/alloy_pick.png rename to src/main/resources/assets/allthemodium/textures/item/alloy_pickaxe.png From 4e24715e8eb8d1c1a3ca457dda7549191b402652 Mon Sep 17 00:00:00 2001 From: Satherov Date: Tue, 9 Jun 2026 19:16:35 +0200 Subject: [PATCH 2/2] apparently this thing was waterlogged... --- .../allthemodium/common/blocks/TeleportPad.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/allthemods/allthemodium/common/blocks/TeleportPad.java b/src/main/java/net/allthemods/allthemodium/common/blocks/TeleportPad.java index f48af0c9..3f750e91 100644 --- a/src/main/java/net/allthemods/allthemodium/common/blocks/TeleportPad.java +++ b/src/main/java/net/allthemods/allthemodium/common/blocks/TeleportPad.java @@ -14,6 +14,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.FluidTags; import net.minecraft.util.Util; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.ai.village.poi.PoiManager; @@ -30,6 +31,7 @@ import net.minecraft.world.level.block.state.properties.BlockStateProperties; import net.minecraft.world.level.block.state.properties.BooleanProperty; import net.minecraft.world.level.levelgen.Heightmap; +import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.Fluids; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.shapes.CollisionContext; @@ -67,7 +69,7 @@ public class TeleportPad extends Block implements SimpleWaterloggedBlock { public TeleportPad(Properties properties) { super(properties.strength(3.0F)); - this.registerDefaultState(this.defaultBlockState().setValue(TeleportPad.SPAWNED, false)); + this.registerDefaultState(this.defaultBlockState().setValue(TeleportPad.WATERLOGGED, false).setValue(TeleportPad.SPAWNED, false)); } private static int getDestinationMode() { @@ -80,7 +82,13 @@ private static boolean isTweaksLoaded() { @Override public BlockState getStateForPlacement(BlockPlaceContext context) { - return this.defaultBlockState().setValue(TeleportPad.WATERLOGGED, context.getLevel().getFluidState(context.getClickedPos()).is(Fluids.WATER)); + FluidState state = context.getLevel().getFluidState(context.getClickedPos()); + return this.defaultBlockState().setValue(TeleportPad.WATERLOGGED, state.is(FluidTags.WATER) && state.isFull()); + } + + @Override + protected FluidState getFluidState(BlockState state) { + return state.getValue(TeleportPad.WATERLOGGED) ? Fluids.WATER.getSource(false) : super.getFluidState(state); } @Override