From 9c0b78d8016f735dd0dd2716de3312d9ad50dc6c Mon Sep 17 00:00:00 2001
From: Bass <tudurap.com@gmail.com>
Date: Thu, 29 Aug 2019 03:19:48 +0100
Subject: A

---
 .../tectech/mechanics/commands/ThaumSpark.java     | 53 ----------------------
 .../tectech/mechanics/data/RendererMessage.java    |  1 -
 .../technus/tectech/mechanics/data/ThaumSpark.java | 53 ++++++++++++++++++++++
 .../multi/GT_MetaTileEntity_TM_teslaCoil.java      |  2 +-
 .../single/GT_MetaTileEntity_TeslaCoil.java        |  2 +-
 5 files changed, 55 insertions(+), 56 deletions(-)
 delete mode 100644 src/main/java/com/github/technus/tectech/mechanics/commands/ThaumSpark.java
 create mode 100644 src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java

(limited to 'src/main')

diff --git a/src/main/java/com/github/technus/tectech/mechanics/commands/ThaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/commands/ThaumSpark.java
deleted file mode 100644
index e26d9855f4..0000000000
--- a/src/main/java/com/github/technus/tectech/mechanics/commands/ThaumSpark.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.github.technus.tectech.mechanics.commands;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class ThaumSpark implements Serializable {
-    private static final long serialVersionUID = -7037856938316679566L;
-    public int x, y, z, wID;
-    public byte xR, yR, zR;
-
-    public ThaumSpark(){
-        this.x = 0;
-        this.z = 0;
-        this.y = 0;
-
-        this.xR = 0;
-        this.yR = 0;
-        this.zR = 0;
-
-        this.wID = 0;
-    }
-
-    public ThaumSpark(int x, int y, int z, byte xR, byte yR, byte zR, int wID) {
-        this.x = x;
-        this.z = z;
-        this.y = y;
-
-        this.xR = xR;
-        this.yR = yR;
-        this.zR = zR;
-
-        this.wID = wID;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-        ThaumSpark that = (ThaumSpark) o;
-        return x == that.x &&
-                y == that.y &&
-                z == that.z &&
-                wID == that.wID &&
-                xR == that.xR &&
-                yR == that.yR &&
-                zR == that.zR;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(x, y, z, wID, xR, yR, zR);
-    }
-}
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
index 9eed417718..449b68a846 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
@@ -1,6 +1,5 @@
 package com.github.technus.tectech.mechanics.data;
 
-import com.github.technus.tectech.mechanics.commands.ThaumSpark;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
 import cpw.mods.fml.common.network.simpleimpl.MessageContext;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java
new file mode 100644
index 0000000000..59462679de
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java
@@ -0,0 +1,53 @@
+package com.github.technus.tectech.mechanics.data;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ThaumSpark implements Serializable {
+    private static final long serialVersionUID = -7037856938316679566L;
+    public int x, y, z, wID;
+    public byte xR, yR, zR;
+
+    public ThaumSpark(){
+        this.x = 0;
+        this.z = 0;
+        this.y = 0;
+
+        this.xR = 0;
+        this.yR = 0;
+        this.zR = 0;
+
+        this.wID = 0;
+    }
+
+    public ThaumSpark(int x, int y, int z, byte xR, byte yR, byte zR, int wID) {
+        this.x = x;
+        this.z = z;
+        this.y = y;
+
+        this.xR = xR;
+        this.yR = yR;
+        this.zR = zR;
+
+        this.wID = wID;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ThaumSpark that = (ThaumSpark) o;
+        return x == that.x &&
+                y == that.y &&
+                z == that.z &&
+                wID == that.wID &&
+                xR == that.xR &&
+                yR == that.yR &&
+                zR == that.zR;
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(x, y, z, wID, xR, yR, zR);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index fe36f730bb..a82bf9be99 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -4,7 +4,7 @@ import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.data.RendererMessage;
-import com.github.technus.tectech.mechanics.commands.ThaumSpark;
+import com.github.technus.tectech.mechanics.data.ThaumSpark;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
index ac115388ba..efa85a6ea5 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
@@ -5,7 +5,7 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.Util;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.data.RendererMessage;
-import com.github.technus.tectech.mechanics.commands.ThaumSpark;
+import com.github.technus.tectech.mechanics.data.ThaumSpark;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil_Ultimate;
 import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_teslaCoil;
-- 
cgit