Removed experimental Carpenter Blocks support.

Fixed chiseling mode icon.
raymondbh · May 24, 2016 · f1d6fce · f1d6fce
1 parent dff24e9
commit f1d6fce
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 14 deletions.
diff --git a/src/main/java/org/rbh/tfcadditions/Proxy/ClientProxy.java b/src/main/java/org/rbh/tfcadditions/Proxy/ClientProxy.java
@@ -38,8 +38,8 @@ public void Init(FMLInitializationEvent event){
         CTMRendrerID = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(new CTMRenderer(CTMRendrerID));
 
-        if(CarpentersBlocksHandler.isLoaded())
-            CarpentersBlocksHandler.Init();
+        //if(CarpentersBlocksHandler.isLoaded())
+        //    CarpentersBlocksHandler.Init();
 
         //if(NotEnoughItemsHandler.isLoaded())
         //    NotEnoughItemsHandler.HideNEIItems();

diff --git a/src/main/java/org/rbh/tfcadditions/Proxy/CommonProxy.java b/src/main/java/org/rbh/tfcadditions/Proxy/CommonProxy.java
@@ -31,8 +31,8 @@ public void preInit(FMLPreInitializationEvent event){
 
         Recipes.registerRecipes();
 
-        if(CarpentersBlocksHandler.isLoaded())
-            CarpentersBlocksHandler.preInit();
+        //if(CarpentersBlocksHandler.isLoaded())
+        //    CarpentersBlocksHandler.preInit();
     }
 
     public void Init(FMLInitializationEvent event){

diff --git a/src/main/java/org/rbh/tfcadditions/Tools/ChiselMode_Dent.java b/src/main/java/org/rbh/tfcadditions/Tools/ChiselMode_Dent.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.World;
 import org.rbh.tfcadditions.Api.Blocks;
 import org.rbh.tfcadditions.Reference.Reference;
-import org.rbh.tfcadditions.TFCAdditions;
 
 /**
  * Created by raymondbh on 15.07.2015.
@@ -28,20 +27,22 @@ public ChiselMode_Dent(String n){
         div = 1;
     }
 
+    @Override
     public ResourceLocation getResourceLocation(){
         return resourcelocation;
     }
 
-    public int getTexture_u(){
-        //TFCAdditions.LOG.info(new StringBuilder().append("Returning Chisel Mode Dent U value.").toString());
+    @Override
+    public int getTextureU(){
         return texture_u;
     }
 
-    public int getTexture_v(){
-        //TFCAdditions.LOG.info(new StringBuilder().append("Returning Chisel Mode Dent V value.").toString());
+    @Override
+    public int getTextureV(){
         return texture_v;
     }
 
+    @Override
     public int getDivX(Block block){
         if(block instanceof BlockStone){
             return div;
@@ -51,6 +52,7 @@ public int getDivX(Block block){
         }
     }
 
+    @Override
     public int getDivY(Block block){
         if(block instanceof BlockStone){
             return div;
@@ -60,6 +62,7 @@ public int getDivY(Block block){
         }
     }
 
+    @Override
     public int getDivZ(Block block){
         if(block instanceof BlockStone){
             return div;
@@ -69,6 +72,7 @@ public int getDivZ(Block block){
         }
     }
 
+    @Override
     public boolean onUsedHandler(World world, EntityPlayer player, int x, int y, int z, Block id, int meta, int side, float hitX, float hitY, float hitZ){
 
         if(TFC_Core.isNaturalStone(world.getBlock(x, y + 1, z)) && TFC_Core.isNaturalStone(world.getBlock(x, y+2, z))) {

diff --git a/src/main/java/org/rbh/tfcadditions/Tools/ChiselMode_DentSmall.java b/src/main/java/org/rbh/tfcadditions/Tools/ChiselMode_DentSmall.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.World;
 import org.rbh.tfcadditions.Api.Blocks;
 import org.rbh.tfcadditions.Reference.Reference;
-import org.rbh.tfcadditions.TFCAdditions;
 
 /**
  * Created by rbh on 31.07.2015.
@@ -28,20 +27,22 @@ public ChiselMode_DentSmall(String n){
         div = 1;
     }
 
+    @Override
     public ResourceLocation getResourceLocation(){
         return resourcelocation;
     }
 
-    public int getTexture_u(){
-        //TFCAdditions.LOG.info(new StringBuilder().append("Returning Chisel Mode Small Dent U value.").toString());
+    @Override
+    public int getTextureU(){
         return texture_u;
     }
 
-    public int getTexture_v(){
-        //TFCAdditions.LOG.info(new StringBuilder().append("Returning Chisel Mode Small Dent V value.").toString());
+    @Override
+    public int getTextureV(){
         return texture_v;
     }
 
+    @Override
     public int getDivX(Block block){
         if(block instanceof BlockStone){
             return div;
@@ -51,6 +52,7 @@ public int getDivX(Block block){
         }
     }
 
+    @Override
     public int getDivY(Block block){
         if(block instanceof BlockStone){
             return div;
@@ -60,6 +62,7 @@ public int getDivY(Block block){
         }
     }
 
+    @Override
     public int getDivZ(Block block){
         if(block instanceof BlockStone){
             return div;
@@ -69,6 +72,7 @@ public int getDivZ(Block block){
         }
     }
 
+    @Override
     public boolean onUsedHandler(World world, EntityPlayer player, int x, int y, int z, Block id, int meta, int side, float hitX, float hitY, float hitZ){
 
         if(TFC_Core.isNaturalStone(world.getBlock(x, y + 1, z)) && TFC_Core.isNaturalStone(world.getBlock(x, y+2, z))) {