From 6b1b1646a32d29ab089e211caeb6b1cdedc7c991 Mon Sep 17 00:00:00 2001 From: Steven Tracey Date: Wed, 3 Aug 2022 09:14:09 -0400 Subject: [PATCH] Reimplemented tools --- .../java/tech/nevets/vplus/items/VPItems.java | 1 + .../java/tech/nevets/vplus/items/VPTools.java | 23 +++++++++++++++---- .../nevets/vplus/items/tools/AxeBase.java | 10 +++++++- .../nevets/vplus/items/tools/HoeBase.java | 9 +++++++- .../nevets/vplus/items/tools/PickaxeBase.java | 10 +++++++- .../nevets/vplus/items/tools/ShovelBase.java | 9 +++++++- .../nevets/vplus/items/tools/SwordBase.java | 9 +++++++- 7 files changed, 61 insertions(+), 10 deletions(-) diff --git a/src/main/java/tech/nevets/vplus/items/VPItems.java b/src/main/java/tech/nevets/vplus/items/VPItems.java index 4b64e91..36533f0 100644 --- a/src/main/java/tech/nevets/vplus/items/VPItems.java +++ b/src/main/java/tech/nevets/vplus/items/VPItems.java @@ -29,5 +29,6 @@ public class VPItems { VPItemGroups.init(); VPFood.init(); VPArmor.init(); + VPTools.init(); } } diff --git a/src/main/java/tech/nevets/vplus/items/VPTools.java b/src/main/java/tech/nevets/vplus/items/VPTools.java index 8dcda73..178d566 100644 --- a/src/main/java/tech/nevets/vplus/items/VPTools.java +++ b/src/main/java/tech/nevets/vplus/items/VPTools.java @@ -1,16 +1,29 @@ package tech.nevets.vplus.items; -import net.minecraft.item.AxeItem; import net.minecraft.item.Item; -import net.minecraft.item.SwordItem; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; +import tech.nevets.vplus.items.tools.*; public class VPTools { + public VPTools() {} - private static void register(String id) { - Registry.register(Registry.ITEM, new Identifier("vplus", id + "_axe"), new AxeItem(VPMaterials.COPPER, new Item.Settings())); - + static { + register(VPMaterials.COPPER); + register(VPMaterials.EMERALD); + register(VPMaterials.SAPPHIRE); + register(VPMaterials.RUBY); + register(VPMaterials.JADE); } + + private static void register(VPMaterials material) { + Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_axe"), new AxeBase(material, new Item.Settings())); + Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_hoe"), new HoeBase(material, new Item.Settings())); + Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_pickaxe"), new PickaxeBase(material, new Item.Settings())); + Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_shovel"), new ShovelBase(material, new Item.Settings())); + Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_sword"), new SwordBase(material, new Item.Settings())); + } + + public static void init() {} } diff --git a/src/main/java/tech/nevets/vplus/items/tools/AxeBase.java b/src/main/java/tech/nevets/vplus/items/tools/AxeBase.java index 801a623..1567917 100644 --- a/src/main/java/tech/nevets/vplus/items/tools/AxeBase.java +++ b/src/main/java/tech/nevets/vplus/items/tools/AxeBase.java @@ -1,4 +1,12 @@ package tech.nevets.vplus.items.tools; -public class AxeBase { +import net.minecraft.item.AxeItem; +import net.minecraft.item.ToolMaterial; +import tech.nevets.vplus.items.VPItemGroups; + +public class AxeBase extends AxeItem { + + public AxeBase(ToolMaterial material, Settings settings) { + super(material, 5, -3.0F, settings.group(VPItemGroups.TOOLS)); + } } diff --git a/src/main/java/tech/nevets/vplus/items/tools/HoeBase.java b/src/main/java/tech/nevets/vplus/items/tools/HoeBase.java index 5f25c4c..3b48dfd 100644 --- a/src/main/java/tech/nevets/vplus/items/tools/HoeBase.java +++ b/src/main/java/tech/nevets/vplus/items/tools/HoeBase.java @@ -1,4 +1,11 @@ package tech.nevets.vplus.items.tools; -public class HoeBase { +import net.minecraft.item.HoeItem; +import net.minecraft.item.ToolMaterial; +import tech.nevets.vplus.items.VPItemGroups; + +public class HoeBase extends HoeItem { + public HoeBase(ToolMaterial material, Settings settings) { + super(material, -3, 0F, settings.group(VPItemGroups.TOOLS)); + } } diff --git a/src/main/java/tech/nevets/vplus/items/tools/PickaxeBase.java b/src/main/java/tech/nevets/vplus/items/tools/PickaxeBase.java index a9f9eb8..80ecf6d 100644 --- a/src/main/java/tech/nevets/vplus/items/tools/PickaxeBase.java +++ b/src/main/java/tech/nevets/vplus/items/tools/PickaxeBase.java @@ -1,4 +1,12 @@ package tech.nevets.vplus.items.tools; -public class PickaxeBase { +import net.minecraft.item.PickaxeItem; +import net.minecraft.item.ToolMaterial; +import tech.nevets.vplus.items.VPItemGroups; +import tech.nevets.vplus.items.VPTools; + +public class PickaxeBase extends PickaxeItem { + public PickaxeBase(ToolMaterial material, Settings settings) { + super(material, 1, -2.8F, settings.group(VPItemGroups.TOOLS)); + } } diff --git a/src/main/java/tech/nevets/vplus/items/tools/ShovelBase.java b/src/main/java/tech/nevets/vplus/items/tools/ShovelBase.java index 061ee46..a6e6414 100644 --- a/src/main/java/tech/nevets/vplus/items/tools/ShovelBase.java +++ b/src/main/java/tech/nevets/vplus/items/tools/ShovelBase.java @@ -1,4 +1,11 @@ package tech.nevets.vplus.items.tools; -public class ShovelBase { +import net.minecraft.item.ShovelItem; +import net.minecraft.item.ToolMaterial; +import tech.nevets.vplus.items.VPItemGroups; + +public class ShovelBase extends ShovelItem { + public ShovelBase(ToolMaterial material, Settings settings) { + super(material, 1, -3F, settings.group(VPItemGroups.TOOLS)); + } } diff --git a/src/main/java/tech/nevets/vplus/items/tools/SwordBase.java b/src/main/java/tech/nevets/vplus/items/tools/SwordBase.java index bd3e9ec..91b02b9 100644 --- a/src/main/java/tech/nevets/vplus/items/tools/SwordBase.java +++ b/src/main/java/tech/nevets/vplus/items/tools/SwordBase.java @@ -1,4 +1,11 @@ package tech.nevets.vplus.items.tools; -public class SwordBase { +import net.minecraft.item.AxeItem; +import net.minecraft.item.ToolMaterial; +import tech.nevets.vplus.items.VPItemGroups; + +public class SwordBase extends AxeItem { + public SwordBase(ToolMaterial material, Settings settings) { + super(material, 2, -2.4F, settings.group(VPItemGroups.COMBAT)); + } }