mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-21 21:02:24 +00:00
Chisel 1.5.3
This commit is contained in:
1 parent
1525907cdd
commit
48e0c168b6
20 files changed
+1301
-1839
No files matched your search
+2
-2
@@ -3,8 +3,8 @@ package info.jbcs.minecraft.chisel.block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public class BlockPoweredMarble extends BlockCarvable {
|
||||
public BlockPoweredMarble(Material m) {
|
||||
public class BlockCarvablePowered extends BlockCarvable {
|
||||
public BlockCarvablePowered(Material m) {
|
||||
super(m);
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.CarvableHelper;
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.ChiselBlocks;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
@@ -19,12 +20,12 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs {
|
||||
|
||||
@Override
|
||||
public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) {
|
||||
Chisel.blockIce.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
|
||||
ChiselBlocks.blockIce.harvestBlock(par1World, par2EntityPlayer, par3, par4, par5, par6);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int quantityDropped(Random par1Random) {
|
||||
return Chisel.blockIce.quantityDropped(par1Random);
|
||||
return ChiselBlocks.blockIce.quantityDropped(par1Random);
|
||||
}
|
||||
@Override
|
||||
public int damageDropped(int i) {
|
||||
@@ -33,7 +34,7 @@ public class BlockMarbleIceStairs extends BlockMarbleStairs {
|
||||
|
||||
@Override
|
||||
public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {
|
||||
Chisel.blockIce.updateTick(par1World, par2, par3, par4, par5Random);
|
||||
ChiselBlocks.blockIce.updateTick(par1World, par2, par3, par4, par5Random);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -22,15 +22,15 @@ public class BlockMarbleStairsMaker {
|
||||
blockBase=base;
|
||||
}
|
||||
|
||||
public void create(){
|
||||
create(null);
|
||||
public void create(String name){
|
||||
create(null, name);
|
||||
}
|
||||
|
||||
public void create(BlockMarbleStairsMakerCreator creator){
|
||||
public void create(BlockMarbleStairsMakerCreator creator, String name){
|
||||
blocks=new BlockMarbleStairs[carverHelper.variations.size()/2];
|
||||
|
||||
for(int i=0;i<blocks.length;i++){
|
||||
String n=blockName+"."+i;
|
||||
String n=name+"."+i;
|
||||
blocks[i]=creator==null?
|
||||
new BlockMarbleStairs(blockBase, i*2, carverHelper):
|
||||
creator.create(blockBase, i*2, carverHelper);
|
||||
@@ -42,7 +42,7 @@ public class BlockMarbleStairsMaker {
|
||||
CarvableVariation variation=carverHelper.variations.get(i*2+meta);
|
||||
|
||||
for(int j=0;j<8;j++)
|
||||
carverHelper.registerVariation(blockName+".orientation."+j,variation,blocks[i],j+meta*8);
|
||||
carverHelper.registerVariation(name+".orientation."+j,variation,blocks[i],j+meta*8);
|
||||
|
||||
CraftingManager.getInstance().addRecipe(new ItemStack(blocks[i], 4, meta*8), new Object[] { "* ", "** ", "***", '*', new ItemStack(blockBase, 1, i*2+meta)});
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user