Migrate legacy Block references to MantleBlock

SlimeKnights · Dec 9, 2013 · c973e41 · c973e41
1 parent 1547849
commit c973e41
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 15 deletions.
diff --git a/src/main/java/tconstruct/blocks/ConveyorBase.java b/src/main/java/tconstruct/blocks/ConveyorBase.java
@@ -1,5 +1,6 @@
 package tconstruct.blocks;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -17,7 +18,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class ConveyorBase extends Block
+public class ConveyorBase extends MantleBlock
 {
     public ConveyorBase(int ID, Material material)
     {

diff --git a/src/main/java/tconstruct/blocks/GlassBlockConnected.java b/src/main/java/tconstruct/blocks/GlassBlockConnected.java
@@ -1,6 +1,8 @@
 package tconstruct.blocks;
 
 import java.util.ArrayList;
+
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -13,7 +15,7 @@
  * 
  */
 
-public class GlassBlockConnected extends Block
+public class GlassBlockConnected extends MantleBlock
 {
     protected Icon[] icons = new Icon[16];
     private boolean shouldRenderSelectionBox = true;

diff --git a/src/main/java/tconstruct/blocks/GolemHeadBlock.java b/src/main/java/tconstruct/blocks/GolemHeadBlock.java
@@ -1,5 +1,6 @@
 package tconstruct.blocks;
 
+import mantle.blocks.MantleBlock;
 import tconstruct.blocks.logic.GolemCoreLogic;
 import tconstruct.common.TContent;
 import net.minecraft.block.Block;
@@ -12,7 +13,7 @@
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 
-public class GolemHeadBlock extends Block
+public class GolemHeadBlock extends MantleBlock
 {
     /*public static int headSideTex = ModLoader.addOverride("/terrain.png", "/GGE/golemheadside.png");
     public static int headTopTex = ModLoader.addOverride("/terrain.png", "/GGE/golemheadtop&bottom.png");

diff --git a/src/main/java/tconstruct/blocks/SlabBase.java b/src/main/java/tconstruct/blocks/SlabBase.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -16,7 +17,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class SlabBase extends Block
+public class SlabBase extends MantleBlock
 {
     Block modelBlock;
     int startingMeta;

diff --git a/src/main/java/tconstruct/blocks/SlimePad.java b/src/main/java/tconstruct/blocks/SlimePad.java
@@ -1,5 +1,6 @@
 package tconstruct.blocks;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -18,7 +19,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class SlimePad extends Block
+public class SlimePad extends MantleBlock
 {
 
     public SlimePad(int par1, Material par2Material)

diff --git a/src/main/java/tconstruct/blocks/StoneTorch.java b/src/main/java/tconstruct/blocks/StoneTorch.java
@@ -7,6 +7,7 @@
 
 import java.util.Random;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -18,7 +19,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class StoneTorch extends Block
+public class StoneTorch extends MantleBlock
 {
     public StoneTorch(int id)
     {

diff --git a/src/main/java/tconstruct/blocks/TConstructBlock.java b/src/main/java/tconstruct/blocks/TConstructBlock.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import mantle.blocks.MantleBlock;
 import tconstruct.library.TConstructRegistry;
 
 import net.minecraft.block.Block;
@@ -13,7 +14,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class TConstructBlock extends Block
+public class TConstructBlock extends MantleBlock
 {
     public String[] textureNames;
     public Icon[] icons;

diff --git a/src/main/java/tconstruct/blocks/slime/SlimeGrass.java b/src/main/java/tconstruct/blocks/slime/SlimeGrass.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Random;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -19,7 +20,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class SlimeGrass extends Block
+public class SlimeGrass extends MantleBlock
 {
     public String[] textureNames = { "slimegrass_green_top", "slimedirt_blue", "slimegrass_green_blue_side", "slimegrass_green_dirt_side" };//green, purple
     public Icon[] icons;

diff --git a/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java b/src/main/java/tconstruct/blocks/traps/BarricadeBlock.java
@@ -1,5 +1,6 @@
 package tconstruct.blocks.traps;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -15,7 +16,7 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class BarricadeBlock extends Block
+public class BarricadeBlock extends MantleBlock
 {
     Block modelBlock;
     int modelMeta;

diff --git a/src/main/java/tconstruct/blocks/traps/Landmine.java b/src/main/java/tconstruct/blocks/traps/Landmine.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Random;
 
+import mantle.blocks.MantleBlock;
 import tconstruct.library.TConstructRegistry;
 
 import net.minecraft.block.Block;
@@ -19,7 +20,7 @@
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class Landmine extends Block
+public class Landmine extends MantleBlock
 {
     /** The mob type that can trigger this pressure plate. */
     private EnumMobType triggerMobType;

diff --git a/src/main/java/tconstruct/blocks/traps/Punji.java b/src/main/java/tconstruct/blocks/traps/Punji.java
@@ -1,30 +1,27 @@
 package tconstruct.blocks.traps;
 
-import java.util.List;
 import java.util.Random;
 
+import mantle.blocks.MantleBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.renderer.texture.IconRegister;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.util.DamageSource;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import tconstruct.client.block.PunjiRender;
-import tconstruct.common.TContent;
 import tconstruct.common.TRepo;
 import tconstruct.library.TConstructRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
-public class Punji extends Block
+public class Punji extends MantleBlock
 {
 
     public Punji(int id)