aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/common')
-rw-r--r--src/main/java/common/Blocks.java2
-rw-r--r--src/main/java/common/blocks/Block_ItemProxyCable.java22
2 files changed, 23 insertions, 1 deletions
diff --git a/src/main/java/common/Blocks.java b/src/main/java/common/Blocks.java
index d7211e2b13..5c9a94ee3a 100644
--- a/src/main/java/common/Blocks.java
+++ b/src/main/java/common/Blocks.java
@@ -60,7 +60,7 @@ public class Blocks {
registerBlocks_TFFT();
registerBlocks_Nuclear();
//registerBlocks_ItemServer();
- //registerBlocks_ItemProxy();
+ registerBlocks_ItemProxy();
registerBlocks_Jars();
registerBlocks_LSC();
diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index 23f082a2bd..e32e4cb8f0 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -2,13 +2,17 @@ package common.blocks;
import common.itemBlocks.IB_ItemProxyCable;
import common.tileentities.TE_ItemProxyCable;
+import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
import kekztech.KekzCore;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
+import render.ConduitRenderer;
public class Block_ItemProxyCable extends Block {
@@ -49,4 +53,22 @@ public class Block_ItemProxyCable extends Block {
return true;
}
+ @Override
+ @SideOnly(Side.CLIENT)
+ public int getRenderBlockPass() {
+ return 1;
+ }
+
+ @Override
+ public int getRenderType() {
+ if (FMLCommonHandler.instance().getSide().isClient()) {
+ return ConduitRenderer.RID;
+ } else
+ return 0;
+ }
+
+ @Override
+ public boolean renderAsNormalBlock() {
+ return false;
+ }
}