Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 12 additions & 12 deletions src/main/java/io/github/pylonmc/pylon/PylonItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -989,63 +989,63 @@ private PylonItems() {
.set(DataComponentTypes.ITEM_MODEL, Material.GOLDEN_AXE.getKey())
.build();
static {
RebarItem.register(RebarItem.class, BRONZE_AXE);
RebarItem.register(BronzeTool.class, BRONZE_AXE);
PylonPages.TOOLS.addItem(BRONZE_AXE);
}

public static final ItemStack BRONZE_PICKAXE = ItemStackBuilder.rebarToolWeapon(Material.STONE_PICKAXE, PylonKeys.BRONZE_PICKAXE, RebarUtils.pickaxeMineable(), true, false, false)
.set(DataComponentTypes.ITEM_MODEL, Material.GOLDEN_PICKAXE.getKey())
.build();
static {
RebarItem.register(RebarItem.class, BRONZE_PICKAXE);
RebarItem.register(BronzeTool.class, BRONZE_PICKAXE);
PylonPages.TOOLS.addItem(BRONZE_PICKAXE);
}

public static final ItemStack BRONZE_SHOVEL = ItemStackBuilder.rebarToolWeapon(Material.STONE_SHOVEL, PylonKeys.BRONZE_SHOVEL, RebarUtils.shovelMineable(), true, false, false)
.set(DataComponentTypes.ITEM_MODEL, Material.GOLDEN_SHOVEL.getKey())
.build();
static {
RebarItem.register(RebarItem.class, BRONZE_SHOVEL);
RebarItem.register(BronzeTool.class, BRONZE_SHOVEL);
PylonPages.TOOLS.addItem(BRONZE_SHOVEL);
}

public static final ItemStack BRONZE_HOE = ItemStackBuilder.rebarToolWeapon(Material.STONE_HOE, PylonKeys.BRONZE_HOE, RebarUtils.hoeMineable(), true, false, false)
.set(DataComponentTypes.ITEM_MODEL, Material.GOLDEN_HOE.getKey())
.build();
static {
RebarItem.register(RebarItem.class, BRONZE_HOE);
RebarItem.register(BronzeTool.class, BRONZE_HOE);
PylonPages.TOOLS.addItem(BRONZE_HOE);
}

public static final ItemStack STEEL_AXE = ItemStackBuilder.rebarToolWeapon(Material.DIAMOND_AXE, PylonKeys.STEEL_AXE, RebarUtils.axeMineable(), true, false, true)
.set(DataComponentTypes.ITEM_MODEL, Material.NETHERITE_AXE.getKey())
.build();
static {
RebarItem.register(RebarItem.class, STEEL_AXE);
RebarItem.register(SteelTool.class, STEEL_AXE);
PylonPages.TOOLS.addItem(STEEL_AXE);
}

public static final ItemStack STEEL_PICKAXE = ItemStackBuilder.rebarToolWeapon(Material.DIAMOND_PICKAXE, PylonKeys.STEEL_PICKAXE, RebarUtils.pickaxeMineable(), true, false, false)
.set(DataComponentTypes.ITEM_MODEL, Material.NETHERITE_PICKAXE.getKey())
.build();
static {
RebarItem.register(RebarItem.class, STEEL_PICKAXE);
RebarItem.register(SteelTool.class, STEEL_PICKAXE);
PylonPages.TOOLS.addItem(STEEL_PICKAXE);
}

public static final ItemStack STEEL_SHOVEL = ItemStackBuilder.rebarToolWeapon(Material.DIAMOND_SHOVEL, PylonKeys.STEEL_SHOVEL, RebarUtils.shovelMineable(), true, false, false)
.set(DataComponentTypes.ITEM_MODEL, Material.NETHERITE_SHOVEL.getKey())
.build();
static {
RebarItem.register(RebarItem.class, STEEL_SHOVEL);
RebarItem.register(SteelTool.class, STEEL_SHOVEL);
PylonPages.TOOLS.addItem(STEEL_SHOVEL);
}

public static final ItemStack STEEL_HOE = ItemStackBuilder.rebarToolWeapon(Material.DIAMOND_HOE, PylonKeys.STEEL_HOE, RebarUtils.hoeMineable(), true, false, false)
.set(DataComponentTypes.ITEM_MODEL, Material.NETHERITE_HOE.getKey())
.build();
static {
RebarItem.register(RebarItem.class, STEEL_HOE);
RebarItem.register(SteelTool.class, STEEL_HOE);
PylonPages.TOOLS.addItem(STEEL_HOE);
}

Expand Down Expand Up @@ -1184,7 +1184,7 @@ private PylonItems() {
.set(DataComponentTypes.MAX_DAMAGE, Settings.get(PylonKeys.PALLADIUM_AXE).getOrThrow("durability", ConfigAdapter.INTEGER))
.build();
static {
RebarItem.register(RebarItem.class, PALLADIUM_AXE);
RebarItem.register(PalladiumTool.class, PALLADIUM_AXE);
PylonPages.TOOLS.addItem(PALLADIUM_AXE);
}

Expand All @@ -1195,7 +1195,7 @@ private PylonItems() {
.set(DataComponentTypes.MAX_DAMAGE, Settings.get(PylonKeys.PALLADIUM_PICKAXE).getOrThrow("durability", ConfigAdapter.INTEGER))
.build();
static {
RebarItem.register(RebarItem.class, PALLADIUM_PICKAXE);
RebarItem.register(PalladiumTool.class, PALLADIUM_PICKAXE);
PylonPages.TOOLS.addItem(PALLADIUM_PICKAXE);
}

Expand All @@ -1207,7 +1207,7 @@ private PylonItems() {
.set(DataComponentTypes.MAX_DAMAGE, Settings.get(PylonKeys.PALLADIUM_SHOVEL).getOrThrow("durability", ConfigAdapter.INTEGER))
.build();
static {
RebarItem.register(RebarItem.class, PALLADIUM_SHOVEL);
RebarItem.register(PalladiumTool.class, PALLADIUM_SHOVEL);
PylonPages.TOOLS.addItem(PALLADIUM_SHOVEL);
}

Expand All @@ -1218,7 +1218,7 @@ private PylonItems() {
.set(DataComponentTypes.MAX_DAMAGE, Settings.get(PylonKeys.PALLADIUM_HOE).getOrThrow("durability", ConfigAdapter.INTEGER))
.build();
static {
RebarItem.register(RebarItem.class, PALLADIUM_HOE);
RebarItem.register(PalladiumTool.class, PALLADIUM_HOE);
PylonPages.TOOLS.addItem(PALLADIUM_HOE);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
package io.github.pylonmc.pylon.content.armor;

import io.github.pylonmc.pylon.PylonKeys;
import io.github.pylonmc.pylon.util.PylonUtils;
import io.github.pylonmc.rebar.item.RebarItem;
import io.github.pylonmc.rebar.item.base.RebarArmor;
import io.github.pylonmc.rebar.item.base.RebarRepairable;
import net.kyori.adventure.key.Key;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

public class BronzeArmor extends RebarItem implements RebarArmor {
import java.util.List;

public class BronzeArmor extends RebarItem implements RebarArmor, RebarRepairable {
public BronzeArmor(@NotNull ItemStack stack) {
super(stack);
}

@Override
public @NotNull List<NamespacedKey> getRepairItems() {
return List.of(PylonKeys.BRONZE_INGOT);
}

@Override
public @NotNull Key getEquipmentType() {
return PylonUtils.pylonKey("bronze");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
package io.github.pylonmc.pylon.content.armor;

import io.github.pylonmc.pylon.PylonKeys;
import io.github.pylonmc.pylon.util.PylonUtils;
import io.github.pylonmc.rebar.item.RebarItem;
import io.github.pylonmc.rebar.item.base.RebarArmor;
import io.github.pylonmc.rebar.item.base.RebarRepairable;
import net.kyori.adventure.key.Key;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

public class PalladiumArmor extends RebarItem implements RebarArmor {
import java.util.List;

public class PalladiumArmor extends RebarItem implements RebarArmor, RebarRepairable {
public PalladiumArmor(@NotNull ItemStack stack) {
super(stack);
}

@Override
public @NotNull List<NamespacedKey> getRepairItems() {
return List.of(PylonKeys.PALLADIUM_INGOT);
}

@Override
public @NotNull Key getEquipmentType() {
return PylonUtils.pylonKey("palladium");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
package io.github.pylonmc.pylon.content.armor;

import io.github.pylonmc.pylon.PylonKeys;
import io.github.pylonmc.pylon.util.PylonUtils;
import io.github.pylonmc.rebar.item.RebarItem;
import io.github.pylonmc.rebar.item.base.RebarArmor;
import io.github.pylonmc.rebar.item.base.RebarRepairable;
import net.kyori.adventure.key.Key;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

public class SteelArmor extends RebarItem implements RebarArmor {
import java.util.List;

public class SteelArmor extends RebarItem implements RebarArmor, RebarRepairable {
public SteelArmor(@NotNull ItemStack stack) {
super(stack);
}

@Override
public @NotNull List<NamespacedKey> getRepairItems() {
return List.of(PylonKeys.STEEL_INGOT);
}

@Override
public @NotNull Key getEquipmentType() {
return PylonUtils.pylonKey("steel");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.github.pylonmc.pylon.content.tools;

import io.github.pylonmc.pylon.PylonKeys;
import io.github.pylonmc.rebar.item.RebarItem;
import io.github.pylonmc.rebar.item.base.RebarRepairable;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

import java.util.List;

public class BronzeTool extends RebarItem implements RebarRepairable {
public BronzeTool(@NotNull ItemStack stack) {
super(stack);
}

@Override
public @NotNull List<NamespacedKey> getRepairItems() {
return List.of(PylonKeys.BRONZE_INGOT);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.github.pylonmc.pylon.content.tools;

import io.github.pylonmc.pylon.PylonKeys;
import io.github.pylonmc.rebar.item.RebarItem;
import io.github.pylonmc.rebar.item.base.RebarRepairable;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

import java.util.List;

public class PalladiumTool extends RebarItem implements RebarRepairable {
public PalladiumTool(@NotNull ItemStack stack) {
super(stack);
}

@Override
public @NotNull List<NamespacedKey> getRepairItems() {
return List.of(PylonKeys.PALLADIUM_INGOT);
}
}
21 changes: 21 additions & 0 deletions src/main/java/io/github/pylonmc/pylon/content/tools/SteelTool.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package io.github.pylonmc.pylon.content.tools;

import io.github.pylonmc.pylon.PylonKeys;
import io.github.pylonmc.rebar.item.RebarItem;
import io.github.pylonmc.rebar.item.base.RebarRepairable;
import org.bukkit.NamespacedKey;
import org.bukkit.inventory.ItemStack;
import org.jetbrains.annotations.NotNull;

import java.util.List;

public class SteelTool extends RebarItem implements RebarRepairable {
public SteelTool(@NotNull ItemStack stack) {
super(stack);
}

@Override
public @NotNull List<NamespacedKey> getRepairItems() {
return List.of(PylonKeys.STEEL_INGOT);
}
}
Loading