moved renderer package to client package, added Space Elevator Tether and a TESR, added Space Elevator Capacitor

4 files changed, 127 insertions, 12 deletions

diff --git a/src/main/java/common/blocks/Block_ItemProxyCable.java b/src/main/java/common/blocks/Block_ItemProxyCable.java
index 8682a2a6dc..ce2f1e9820 100644
--- a/src/main/java/common/blocks/Block_ItemProxyCable.java
+++ b/src/main/java/common/blocks/Block_ItemProxyCable.java
@@ -2,7 +2,6 @@ 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;
@@ -12,7 +11,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import render.ConduitRenderer;
+import client.renderer.ConduitRenderer;
 
 public class Block_ItemProxyCable extends Block {
 	
@@ -57,10 +56,7 @@ public class Block_ItemProxyCable extends Block {
 
 	@Override
 	public int getRenderType() {
-		if (FMLCommonHandler.instance().getSide().isClient()) {
-			return ConduitRenderer.RID;
-		} else
-			return 0;
+		return ConduitRenderer.RID;
 	}
 
 	@Override
diff --git a/src/main/java/common/blocks/Block_SpaceElevator.java b/src/main/java/common/blocks/Block_SpaceElevator.java
index 39e8fdaf28..524f34ba46 100644
--- a/src/main/java/common/blocks/Block_SpaceElevator.java
+++ b/src/main/java/common/blocks/Block_SpaceElevator.java
@@ -29,7 +29,6 @@ public class Block_SpaceElevator extends BaseGTUpdateableBlock {
         final String blockName = "kekztech_spaceelevator_block";
         INSTANCE.setBlockName(blockName);
         INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
-        INSTANCE.setBlockTextureName(KekzCore.MODID + ":" + "ControlRod");
         INSTANCE.setHardness(7.0f);
         INSTANCE.setResistance(10.0f);
         GameRegistry.registerBlock(INSTANCE, IB_SpaceElevator.class, blockName);
@@ -39,8 +38,8 @@ public class Block_SpaceElevator extends BaseGTUpdateableBlock {
 
     @Override
     public void registerBlockIcons(IIconRegister ir) {
-        baseTop = ir.registerIcon("kekztech:SpaceElevatorBase_side");
-        baseSide = ir.registerIcon("kekztech:SpaceElevatorBase_top");
+        baseTop = ir.registerIcon("kekztech:SpaceElevatorBase_top");
+        baseSide = ir.registerIcon("kekztech:SpaceElevatorBase_side");
         coilHolder = ir.registerIcon("kekztech:CoilHolder");
     }
 
@@ -53,9 +52,10 @@ public class Block_SpaceElevator extends BaseGTUpdateableBlock {
 
     @Override
     public IIcon getIcon(int side, int meta) {
-        switch(meta) {
-            case 0: return (side < 2) ? baseTop : baseSide;
-            default: return coilHolder;
+        if(meta == 0) {
+            return (side < 2) ? baseTop : baseSide;
+        } else {
+            return coilHolder;
         }
     }
 }
diff --git a/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java b/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java
new file mode 100644
index 0000000000..1e8bde9d40
--- /dev/null
+++ b/src/main/java/common/blocks/Block_SpaceElevatorCapacitor.java
@@ -0,0 +1,49 @@
+package common.blocks;
+
+import common.itemBlocks.IB_SpaceElevator;
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.util.IIcon;
+
+public class Block_SpaceElevatorCapacitor extends BaseGTUpdateableBlock {
+
+    private static final Block_SpaceElevatorCapacitor INSTANCE = new Block_SpaceElevatorCapacitor();
+
+    private IIcon top;
+    private IIcon side;
+
+    private Block_SpaceElevatorCapacitor() {
+        super(Material.iron);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_spaceelevatorcapacitor_block";
+        INSTANCE.setBlockName(blockName);
+        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
+        INSTANCE.setHardness(5.0f);
+        INSTANCE.setResistance(3.0f);
+        GameRegistry.registerBlock(INSTANCE, blockName);
+
+        return INSTANCE;
+    }
+
+    @Override
+    public void registerBlockIcons(IIconRegister ir) {
+        top = ir.registerIcon("kekztech:SpaceElevatorCapacitor_top_fullbase");
+        side = ir.registerIcon("kekztech:SpaceElevatorCapacitor_side_fullbase");
+    }
+
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        return (side < 2) ? this.top : this.side;
+    }
+
+    @Override
+    public int getLightValue() {
+        return 2;
+    }
+}
diff --git a/src/main/java/common/blocks/Block_SpaceElevatorTether.java b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
new file mode 100644
index 0000000000..3031cd8a12
--- /dev/null
+++ b/src/main/java/common/blocks/Block_SpaceElevatorTether.java
@@ -0,0 +1,70 @@
+package common.blocks;
+
+import common.tileentities.TE_ItemProxyCable;
+import common.tileentities.TE_SpaceElevatorTether;
+import cpw.mods.fml.common.registry.GameRegistry;
+import kekztech.KekzCore;
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+public class Block_SpaceElevatorTether extends BaseGTUpdateableBlock {
+
+    private static final Block_SpaceElevatorTether INSTANCE = new Block_SpaceElevatorTether();
+
+    private IIcon top;
+    private IIcon side;
+
+    private Block_SpaceElevatorTether() {
+        super(Material.glass);
+    }
+
+    public static Block registerBlock() {
+        final String blockName = "kekztech_spaceelevatortether_block";
+        INSTANCE.setBlockName(blockName);
+        INSTANCE.setCreativeTab(CreativeTabs.tabMisc);
+        INSTANCE.setHardness(15.0f);
+        INSTANCE.setResistance(15.0f);
+        GameRegistry.registerBlock(INSTANCE, blockName);
+
+        return INSTANCE;
+    }
+
+    @Override
+    public void registerBlockIcons(IIconRegister ir) {
+        top = ir.registerIcon("kekztech:Tether_top");
+        side = ir.registerIcon("kekztech:Tether_side");
+    }
+
+    @Override
+    public IIcon getIcon(int side, int meta) {
+        return (side < 2) ? this.top : this.side;
+    }
+
+    @Override
+    public TileEntity createTileEntity(World world, int p_149915_2_) {
+        return new TE_SpaceElevatorTether();
+    }
+
+    @Override
+    public boolean hasTileEntity(int metadata) {
+        return true;
+    }
+
+    @Override
+    public boolean isOpaqueCube()
+    {
+        return false;
+    }
+
+    @Override
+    public boolean renderAsNormalBlock()
+    {
+        return false;
+    }
+
+}