fixing 1.8 branch errors

kurrycat2004 · Apr 17, 2023 · f578681 · f578681
1 parent 4885cf5
commit f578681
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 7 deletions.
diff --git a/src/main/java/io/github/kurrycat/mpkmod/compatability/API.java b/src/main/java/io/github/kurrycat/mpkmod/compatability/API.java
@@ -18,7 +18,6 @@
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
 import org.apache.logging.log4j.MarkerManager;
-import sun.reflect.Reflection;
 
 import java.awt.*;
 import java.time.Instant;
@@ -46,14 +45,14 @@ public class API {
     public static Map<String, Procedure> keyBindingMap = new HashMap<>();
 
     public static boolean discordRpcInitialized = false;
-    public static HashMap<String, Option> optionsMap;
     private static FunctionHolder functionHolder;
-
+    public static HashMap<String, Option> optionsMap;
     /*@Option.Field
     public static String testOption = "String Option";*/
 
     /* public static int metronome = 0;*/
 
+
     /**
      * Gets called at the beginning of mod init<br>
      * Register GUIs here using {@link #registerGUIScreen(String, MPKGuiScreen) registerGuiScreen}

diff --git a/src/main/java/io/github/kurrycat/mpkmod/compatability/MCClasses/Player.java b/src/main/java/io/github/kurrycat/mpkmod/compatability/MCClasses/Player.java
@@ -3,7 +3,6 @@
 import io.github.kurrycat.mpkmod.ticks.TickInput;
 import io.github.kurrycat.mpkmod.util.BoundingBox3D;
 import io.github.kurrycat.mpkmod.util.Vector3D;
-import net.minecraftforge.event.entity.player.PlayerUseItemEvent;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;

diff --git a/src/main/java/io/github/kurrycat/mpkmod/gui/screens/options_gui/Option.java b/src/main/java/io/github/kurrycat/mpkmod/gui/screens/options_gui/Option.java
@@ -7,7 +7,7 @@
 import io.github.kurrycat.mpkmod.save.Serializer;
 import io.github.kurrycat.mpkmod.util.ClassUtil;
 import io.github.kurrycat.mpkmod.util.JSONConfig;
-import net.minecraft.util.Tuple;
+import io.github.kurrycat.mpkmod.util.Tuple;
 
 import java.awt.*;
 import java.lang.annotation.ElementType;

diff --git a/src/main/java/io/github/kurrycat/mpkmod/util/ClassUtil.java b/src/main/java/io/github/kurrycat/mpkmod/util/ClassUtil.java
@@ -1,7 +1,5 @@
 package io.github.kurrycat.mpkmod.util;
 
-import net.minecraft.util.Tuple;
-
 import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;

diff --git a/src/main/java/io/github/kurrycat/mpkmod/util/Tuple.java b/src/main/java/io/github/kurrycat/mpkmod/util/Tuple.java
@@ -0,0 +1,27 @@
+package io.github.kurrycat.mpkmod.util;
+
+public class Tuple<A, B> {
+    private A a;
+    private B b;
+
+    public Tuple(A a, B b) {
+        this.a = a;
+        this.b = b;
+    }
+
+    public A getFirst() {
+        return this.a;
+    }
+
+    public void setFirst(A a) {
+        this.a = a;
+    }
+
+    public B getSecond() {
+        return this.b;
+    }
+
+    public void setSecond(B b) {
+        this.b = b;
+    }
+}