From 09c81a117a939ddc7bd22d80b591993c7e21308a Mon Sep 17 00:00:00 2001
From: Steven Tracey <steven@nevets.tech>
Date: Wed, 3 Aug 2022 09:31:41 -0400
Subject: [PATCH] Merge conflict 1

---
 .../java/tech/nevets/vplus/items/VPFuels.java | 20 +++++++++++++++++
 .../java/tech/nevets/vplus/items/VPTools.java | 22 +++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 src/main/java/tech/nevets/vplus/items/VPFuels.java

diff --git a/src/main/java/tech/nevets/vplus/items/VPFuels.java b/src/main/java/tech/nevets/vplus/items/VPFuels.java
new file mode 100644
index 0000000..ef33e54
--- /dev/null
+++ b/src/main/java/tech/nevets/vplus/items/VPFuels.java
@@ -0,0 +1,20 @@
+package tech.nevets.vplus.items;
+
+import net.fabricmc.fabric.api.registry.FuelRegistry;
+import net.minecraft.item.ItemConvertible;
+import tech.nevets.vplus.blocks.VPBlocks;
+
+public class VPFuels {
+
+    public VPFuels() {}
+
+    static {
+        register(VPBlocks.SATURATED_LAVA_SPONGE_BLOCK, 20000);
+    }
+
+    private static void register(ItemConvertible fuel, int duration) {
+        FuelRegistry.INSTANCE.add(fuel, duration);
+    }
+
+    public static void init() {}
+}
diff --git a/src/main/java/tech/nevets/vplus/items/VPTools.java b/src/main/java/tech/nevets/vplus/items/VPTools.java
index 178d566..0fc5988 100644
--- a/src/main/java/tech/nevets/vplus/items/VPTools.java
+++ b/src/main/java/tech/nevets/vplus/items/VPTools.java
@@ -1,10 +1,14 @@
 package tech.nevets.vplus.items;
 
 import net.minecraft.item.Item;
+import net.minecraft.item.ToolItem;
+import net.minecraft.item.ToolMaterial;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.registry.Registry;
 import tech.nevets.vplus.items.tools.*;
 
+import java.lang.reflect.InvocationTargetException;
+
 public class VPTools {
 
     public VPTools() {}
@@ -25,5 +29,23 @@ public class VPTools {
         Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_sword"), new SwordBase(material, new Item.Settings()));
     }
 
+    private static void register(VPMaterials material, Class<? extends ToolItem> T, String toolName) {
+        try {
+            Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_" + toolName), T.getConstructor(ToolMaterial.class, Item.Settings.class).newInstance(material, new Item.Settings().group(VPItemGroups.TOOLS)));
+        } catch (InvocationTargetException | InstantiationException | IllegalAccessException | NoSuchMethodException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static void registerAll(VPMaterials[] materials, Class<? extends ToolItem> T, String toolName) {
+        for (VPMaterials material : materials) {
+            try {
+                Registry.register(Registry.ITEM, new Identifier("vplus", material.getName() + "_" + toolName), T.getConstructor(ToolMaterial.class, Item.Settings.class).newInstance(material, new Item.Settings().group(VPItemGroups.TOOLS)));
+            } catch (InvocationTargetException | InstantiationException | IllegalAccessException | NoSuchMethodException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
     public static void init() {}
 }