Merge branch 'master' into bassAdditions

5 files changed, 16 insertions, 12 deletions

diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index d8555e19fe..9321a1b2bc 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -2,7 +2,9 @@ package com.github.technus.tectech.proxy;
 
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.entity.fx.BlockHint;
+import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.block.QuantumGlassRender;
+import com.github.technus.tectech.thing.block.QuantumStuffBlock;
 import com.github.technus.tectech.thing.block.QuantumStuffRender;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
@@ -32,11 +34,11 @@ public class ClientProxy extends CommonProxy {
 
     @Override
     public void registerRenderInfo() {
-        QuantumGlassRender.renderID = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry.registerBlockHandler(QuantumGlassRender.renderID, new QuantumGlassRender());
+        QuantumGlassBlock.renderID = RenderingRegistry.getNextAvailableRenderId();
+        RenderingRegistry.registerBlockHandler(QuantumGlassBlock.renderID, new QuantumGlassRender());
 
-        QuantumStuffRender.renderID = RenderingRegistry.getNextAvailableRenderId();
-        RenderingRegistry.registerBlockHandler(QuantumStuffRender.renderID, new QuantumStuffRender());
+        QuantumStuffBlock.renderID = RenderingRegistry.getNextAvailableRenderId();
+        RenderingRegistry.registerBlockHandler(QuantumStuffBlock.renderID, new QuantumStuffRender());
 
         if(Loader.isModLoaded("openmodularturrets")) new TT_turret_loader().run();
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
index 7e2a0d6111..81b6787435 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassBlock.java
@@ -18,6 +18,7 @@ import static com.github.technus.tectech.auxiliary.Reference.MODID;
  */
 public final class QuantumGlassBlock extends BlockBase {
     public static IIcon stuff;
+    public static int renderID;
     public static QuantumGlassBlock INSTANCE;
 
     public QuantumGlassBlock() {
@@ -66,6 +67,7 @@ public final class QuantumGlassBlock extends BlockBase {
         return false;
     }
 
+    @Override
     @SideOnly(Side.CLIENT)
     public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
         Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_);
@@ -74,10 +76,11 @@ public final class QuantumGlassBlock extends BlockBase {
 
     @Override
     public int getRenderType() {
-        return QuantumGlassRender.renderID;
+        return QuantumGlassBlock.renderID;
     }
 
     @Override
+    @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister p_149651_1_) {
         super.registerBlockIcons(p_149651_1_);
         stuff = this.blockIcon;
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java
index 27cbfb925f..0cbac64692 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumGlassRender.java
@@ -12,7 +12,6 @@ import org.lwjgl.opengl.GL11;
  * Created by danie_000 on 19.12.2016.
  */
 public final class QuantumGlassRender implements ISimpleBlockRenderingHandler {
-    public static int renderID;
 
     public QuantumGlassRender() {
     }
@@ -120,6 +119,6 @@ public final class QuantumGlassRender implements ISimpleBlockRenderingHandler {
 
     @Override
     public int getRenderId() {
-        return QuantumGlassRender.renderID;
+        return QuantumGlassBlock.renderID;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java
index a244ed2829..9480d28c75 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffBlock.java
@@ -22,6 +22,7 @@ import static com.github.technus.tectech.auxiliary.Reference.MODID;
  */
 public final class QuantumStuffBlock extends BlockBase {
     public static IIcon stuff;
+    public static int renderID;
     public static QuantumStuffBlock INSTANCE;
 
     public QuantumStuffBlock() {
@@ -41,6 +42,7 @@ public final class QuantumStuffBlock extends BlockBase {
     }
 
     @Override
+    @SideOnly(Side.CLIENT)
     public void registerBlockIcons(IIconRegister p_149651_1_) {
         super.registerBlockIcons(p_149651_1_);
         stuff = this.blockIcon;
@@ -82,7 +84,7 @@ public final class QuantumStuffBlock extends BlockBase {
 
     @Override
     public int getRenderType() {
-        return QuantumStuffRender.renderID;
+        return QuantumStuffBlock.renderID;
     }
 
     public static void run() {
diff --git a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java
index 7890ecd028..7bcc52af43 100644
--- a/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java
+++ b/src/main/java/com/github/technus/tectech/thing/block/QuantumStuffRender.java
@@ -14,8 +14,6 @@ import org.lwjgl.opengl.GL11;
  * Created by danie_000 on 19.12.2016.
  */
 public final class QuantumStuffRender implements ISimpleBlockRenderingHandler {
-    public static int renderID;
-    private static Vec3 pos;
     private static Tessellator tes=Tessellator.instance;
 
     public QuantumStuffRender() {}
@@ -79,7 +77,7 @@ public final class QuantumStuffRender implements ISimpleBlockRenderingHandler {
     }
 
     private void tesAbuse(int x, int y, int z, float sx, float sy, float sz, float rotX, float rotY, float rotZ,float sideU, float sideV){
-        pos=Vec3.createVectorHelper(sx,sy,sz);
+        Vec3 pos = Vec3.createVectorHelper(sx, sy, sz);
         pos.rotateAroundX(rotX);
         pos.rotateAroundY(rotY);
         pos.rotateAroundZ(rotZ);
@@ -94,6 +92,6 @@ public final class QuantumStuffRender implements ISimpleBlockRenderingHandler {
 
     @Override
     public int getRenderId() {
-        return QuantumStuffRender.renderID;
+        return QuantumStuffBlock.renderID;
     }
 }