Refactor thaum spark

5 files changed, 60 insertions, 60 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
index 7d35a216f0..581c81d15f 100644
--- a/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
+++ b/src/main/java/com/github/technus/tectech/loader/NetworkDispatcher.java
@@ -2,7 +2,7 @@ package com.github.technus.tectech.loader;
 
 import com.github.technus.tectech.mechanics.data.ChunkDataMessage;
 import com.github.technus.tectech.mechanics.data.PlayerDataMessage;
-import com.github.technus.tectech.mechanics.data.RendererMessage;
+import com.github.technus.tectech.mechanics.spark.RendererMessage;
 import com.github.technus.tectech.mechanics.alignment.AlignmentMessage;
 import com.github.technus.tectech.thing.metaTileEntity.hatch.TextParametersMessage;
 import com.github.technus.tectech.mechanics.pipe.PipeActivityMessage;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java
index 514b8b88ad..f2fd17817d 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/RendererMessage.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/spark/RendererMessage.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.mechanics.data;
+package com.github.technus.tectech.mechanics.spark;
 
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.network.simpleimpl.IMessage;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java b/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java
index 99f3696aa9..604624828c 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/data/ThaumSpark.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/spark/ThaumSpark.java
@@ -1,54 +1,54 @@
-package com.github.technus.tectech.mechanics.data;

-

-import java.io.Serializable;

-import java.util.Objects;

-

-public class ThaumSpark implements Serializable {

-    //This works regardless of if TC is loaded

-    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);

-    }

-}

+package com.github.technus.tectech.mechanics.spark;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+public class ThaumSpark implements Serializable {
+    //This works regardless of if TC is loaded
+    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 15263e2042..89093bdba7 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
@@ -3,8 +3,8 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.loader.NetworkDispatcher;
 import com.github.technus.tectech.mechanics.constructable.IConstructable;
-import com.github.technus.tectech.mechanics.data.RendererMessage;
-import com.github.technus.tectech.mechanics.data.ThaumSpark;
+import com.github.technus.tectech.mechanics.spark.RendererMessage;
+import com.github.technus.tectech.mechanics.spark.ThaumSpark;
 import com.github.technus.tectech.mechanics.structure.adders.IHatchAdder;
 import com.github.technus.tectech.mechanics.structure.Structure;
 import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;
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 0c282ac94f..ed36dec7cb 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
@@ -4,8 +4,8 @@ import com.github.technus.tectech.util.CommonValues;
 import com.github.technus.tectech.TecTech;

 import com.github.technus.tectech.util.Util;

 import com.github.technus.tectech.loader.NetworkDispatcher;

-import com.github.technus.tectech.mechanics.data.RendererMessage;

-import com.github.technus.tectech.mechanics.data.ThaumSpark;

+import com.github.technus.tectech.mechanics.spark.RendererMessage;

+import com.github.technus.tectech.mechanics.spark.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;