mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-12 16:27:45 +00:00
Names are now in as well as textures
This commit is contained in:
1 parent
db750e09de
commit
edef471772
6 files changed
+82
-33
No files matched your search
@@ -0,0 +1,57 @@
|
||||
package info.jbcs.minecraft.chisel.block;
|
||||
|
||||
import info.jbcs.minecraft.chisel.api.ICarvable;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import info.jbcs.minecraft.chisel.init.ModTabs;
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockVoidstone extends Block implements ICarvable{
|
||||
|
||||
public static IIcon iconParticle, topBottom, pillarSide;
|
||||
public static CarvableHelper carvableHelper;
|
||||
|
||||
public BlockVoidstone() {
|
||||
super(Material.rock);
|
||||
carvableHelper = new CarvableHelper();
|
||||
setHardness(5.0F);
|
||||
setResistance(10.0F);
|
||||
setCreativeTab(ModTabs.tabChiselBlocks);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void randomDisplayTick(World world, int x, int y, int z, Random random)
|
||||
{
|
||||
if(General.rand.nextInt(4) == 0 && world.isRemote)
|
||||
GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z);
|
||||
}
|
||||
|
||||
@Override
|
||||
public IIcon getIcon(int side, int meta){
|
||||
if(side == 0 || side == 1){
|
||||
return topBottom;
|
||||
} else {
|
||||
return pillarSide;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister icon){
|
||||
iconParticle = icon.registerIcon("Chisel:voidstone/particles/star");
|
||||
topBottom = icon.registerIcon("Chisel:voidstone/pillar-top");
|
||||
pillarSide = icon.registerIcon("Chisel:voidstone/pillar-side");
|
||||
}
|
||||
|
||||
@Override
|
||||
public CarvableVariation getVariation(int metadata) {
|
||||
return carvableHelper.getVariation(metadata);
|
||||
}
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
package info.jbcs.minecraft.chisel.block.tileentity;
|
||||
|
||||
import info.jbcs.minecraft.chisel.client.GeneralChiselClient;
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
public class BlockVoidstone extends Block {
|
||||
|
||||
public static IIcon iconParticle;
|
||||
|
||||
protected BlockVoidstone() {
|
||||
super(Material.rock);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void randomDisplayTick(World world, int x, int y, int z, Random random)
|
||||
{
|
||||
if(General.rand.nextInt(4) == 0 && world.isRemote)
|
||||
GeneralChiselClient.spawnVoidstoneFX(world, this, x, y, z);
|
||||
}
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import info.jbcs.minecraft.chisel.Configurations;
|
||||
import info.jbcs.minecraft.chisel.block.BlockHolystone;
|
||||
import info.jbcs.minecraft.chisel.block.BlockLavastone;
|
||||
import info.jbcs.minecraft.chisel.block.BlockSnakestoneObsidian;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.block.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntityBallOMossFX;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntityHolystoneFX;
|
||||
import info.jbcs.minecraft.chisel.entity.fx.EntitySnakestoneObsidianFX;
|
||||
@@ -17,7 +17,6 @@ import net.minecraft.client.particle.EntityDiggingFX;
|
||||
import net.minecraft.client.particle.EntityLavaFX;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.world.World;
|
||||
import sun.security.krb5.Config;
|
||||
|
||||
import java.util.Random;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package info.jbcs.minecraft.chisel.entity.fx;
|
||||
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.block.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.utils.General;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
|
||||
@@ -4,7 +4,7 @@ import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import info.jbcs.minecraft.chisel.Chisel;
|
||||
import info.jbcs.minecraft.chisel.Configurations;
|
||||
import info.jbcs.minecraft.chisel.block.*;
|
||||
import info.jbcs.minecraft.chisel.block.tileentity.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.block.BlockVoidstone;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableHelper;
|
||||
import info.jbcs.minecraft.chisel.carving.CarvableVariation;
|
||||
import info.jbcs.minecraft.chisel.carving.Carving;
|
||||
@@ -69,7 +69,7 @@ public class ModBlocks {
|
||||
public static BlockCarvable pumpkin;
|
||||
public static BlockCarvable jackOLantern;
|
||||
public static BlockCarvable voidstone;
|
||||
public static BlockVoidstone voidstonePillar;
|
||||
public static BlockVoidstone voidstonePillar = new BlockVoidstone();
|
||||
public static Block autoChisel;
|
||||
public static BlockSnakestone snakestone;
|
||||
public static BlockSnakestone sandSnakestone;
|
||||
@@ -1266,8 +1266,16 @@ public class ModBlocks {
|
||||
if(Configurations.featureEnabled("voidstone")){
|
||||
voidstone = (BlockCarvable) new BlockCarvable().setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone);
|
||||
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.0.desc"), 0, "voidstone/metalborder");
|
||||
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.1.desc"), 1, "voidstone/pillar-side");
|
||||
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.2.desc"), 2, voidstonePillar, 0);
|
||||
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.1.desc"), 1, "voidstone/quarters");
|
||||
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.2.desc"), 2, "voidstone/skulls");
|
||||
voidstone.carverHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.3.desc"), 3, "voidstone/smooth");
|
||||
voidstone.carverHelper.register(voidstone, "voidstone");
|
||||
}
|
||||
|
||||
if(Configurations.featureEnabled("voidstonePillars")){
|
||||
voidstonePillar = (BlockVoidstone) new BlockVoidstone().setStepSound(Block.soundTypeStone);
|
||||
voidstonePillar.carvableHelper.addVariation(StatCollector.translateToLocal("chisel.tile.voidstone.0.desc"), 0, "voidstone/pillar-side");
|
||||
voidstonePillar.carvableHelper.register(voidstonePillar, "voidstonePillar");
|
||||
}
|
||||
|
||||
Blocks.stone.setHarvestLevel("chisel", 0, 0);
|
||||
|
||||
Reference in new issue
Block a user