mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-17 03:05:10 +00:00
1.5.4c, fixed a crash bug
This commit is contained in:
1 parent
d7f9007a28
commit
82a6c90c8c
4 files changed
+19
-28
No files matched your search
@@ -37,7 +37,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry.Type;
|
||||
|
||||
|
||||
@Mod(modid = "chisel", name = "Chisel", version = "1.5.4b")
|
||||
@Mod(modid = "chisel", name = "Chisel", version = "1.5.4c")
|
||||
public class Chisel
|
||||
{
|
||||
public static ItemChisel chisel;
|
||||
@@ -50,7 +50,6 @@ public class Chisel
|
||||
public static CreativeTabs tabChisel;
|
||||
|
||||
public static boolean configExists;
|
||||
public static boolean dropIceShards;
|
||||
public static boolean oldPillars;
|
||||
public static boolean disableCTM;
|
||||
public static double concreteVelocity;
|
||||
|
||||
@@ -60,12 +60,10 @@ public class BlockMarbleIce extends BlockIce implements ICarvable
|
||||
@Override
|
||||
public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6)
|
||||
{
|
||||
if(!Chisel.dropIceShards)
|
||||
{
|
||||
super.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
|
||||
return;
|
||||
}
|
||||
super.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
|
||||
return;
|
||||
|
||||
/*
|
||||
par2EntityPlayer.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1);
|
||||
par2EntityPlayer.addExhaustion(0.025F);
|
||||
|
||||
@@ -80,23 +78,8 @@ public class BlockMarbleIce extends BlockIce implements ICarvable
|
||||
{
|
||||
this.dropBlockAsItem(par1World, par3, par4, par5, itemstack);
|
||||
}
|
||||
} else
|
||||
{
|
||||
int i1 = EnchantmentHelper.getFortuneModifier(par2EntityPlayer);
|
||||
this.dropBlockAsItem(par1World, par3, par4, par5, par6, i1);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Item getItemDropped(int par1, Random par2Random, int par3)
|
||||
{
|
||||
return Chisel.dropIceShards ? Chisel.itemIceshard : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int quantityDropped(Random par1Random)
|
||||
{
|
||||
return Chisel.dropIceShards ? 1 + par1Random.nextInt(5) : 0;
|
||||
*/
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -15,6 +15,7 @@ import java.util.Set;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockPane;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -58,6 +59,11 @@ public class CarvableHelper
|
||||
addVariation(description, metadata, null, bb, blockMeta);
|
||||
}
|
||||
|
||||
public void addVariation(String description, int metadata, Block bb, int blockMeta, Material material)
|
||||
{
|
||||
addVariation(description, metadata, null, bb, blockMeta);
|
||||
}
|
||||
|
||||
public void addVariation(String description, int metadata, String texture)
|
||||
{
|
||||
addVariation(description, metadata, texture, null, 0);
|
||||
@@ -68,8 +74,10 @@ public class CarvableHelper
|
||||
if(variations.size() >= 16)
|
||||
return;
|
||||
|
||||
if(blockName == null && block != null) blockName = block.getLocalizedName();
|
||||
else if(blockName == null && description != null) blockName = description;
|
||||
if(blockName == null && block != null)
|
||||
blockName = block.getLocalizedName();
|
||||
else if(blockName == null && description != null)
|
||||
blockName = description;
|
||||
|
||||
CarvableVariation variation = new CarvableVariation();
|
||||
variation.description = description;
|
||||
@@ -322,7 +330,8 @@ public class CarvableHelper
|
||||
LanguageRegistry.addName(new ItemStack(block, 1, blockMeta), Chisel.blockDescriptions ? variation.blockName : variation.description);
|
||||
//TODO Multipart registry goes here
|
||||
|
||||
if(forbidChiseling) return;
|
||||
if(forbidChiseling)
|
||||
return;
|
||||
|
||||
if(variation.block == null)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user