Skip to content

Alloy Pickaxe #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Satherov wants to merge 2 commits into
base: 26.1
Choose a base branch
from
Open

Alloy Pickaxe #224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4263af8
Alloy Pickaxe
Satherov Jun 9, 2026
4e24715
apparently this thing was waterlogged...
Satherov Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/generated/resources/assets/allthemodium/items/alloy_pickaxe.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/assets/allthemodium/lang/en_us.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions src/generated/resources/assets/allthemodium/models/item/alloy_pickaxe.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/enchantables.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/tools.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/c/tags/item/tools/mining_tool.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/item/cluster_max_harvestables.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/item/enchantable/durability.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/item/enchantable/mining.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/item/enchantable/mining_loot.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/item/enchantable/vanishing.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/generated/resources/data/minecraft/tags/item/pickaxes.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 10 additions & 2 deletions src/main/java/net/allthemods/allthemodium/common/blocks/TeleportPad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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() {
Expand All @@ -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
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/net/allthemods/allthemodium/core/registry/ATMItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,13 @@ public class ATMItems {
.fireResistant()
));

public static final DeferredHolder<Item, Item> 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<Item, Item> 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<Item, Item> 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<Item, Item> 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<Item, Item> 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<Item, Item> 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<Item, Item> 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<Item, Item> 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()

Expand Down
1 change: 1 addition & 0 deletions src/main/java/net/allthemods/allthemodium/data/provider/ATMLanguageProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/net/allthemods/allthemodium/data/provider/tags/ATMItemTagsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand All @@ -242,15 +242,15 @@ 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());
this.tag(ItemTags.AXES)
.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())
Expand Down Expand Up @@ -279,15 +279,15 @@ 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(),
ATMItems.ALLOY_PAXEL.get()
);
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(),
Expand All @@ -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(),
Expand All @@ -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(),
Expand All @@ -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());
Expand Down
0 ...allthemodium/textures/item/alloy_pick.png → ...themodium/textures/item/alloy_pickaxe.png
View file
Open in desktop
File renamed without changes
Loading