mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-12 16:27:45 +00:00
Fixed, it please dont touch
This commit is contained in:
TheCricket committed
1 parent
9e5761d77d
commit
beacca40d7
3 files changed
+54
-72
No files matched your search
@@ -4,71 +4,55 @@ import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.api.ICarvable;
|
||||
import com.cricketcraft.chisel.carving.CarvableHelper;
|
||||
import com.cricketcraft.chisel.carving.CarvableVariation;
|
||||
import com.cricketcraft.chisel.init.ModTabs;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.BlockPumpkin;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class BlockCarvablePumpkin extends BlockPumpkin implements ICarvable{
|
||||
public CarvableHelper carverHelper;
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon[] face = new IIcon[16];
|
||||
@SideOnly(Side.CLIENT)
|
||||
private IIcon top, side;
|
||||
private IIcon top, face;
|
||||
|
||||
private boolean isJackolantern;
|
||||
private int blockMetadata;
|
||||
|
||||
public BlockCarvablePumpkin(boolean isOn) {
|
||||
super(isOn);
|
||||
setCreativeTab(ModTabs.tabChiselBlocks);
|
||||
carverHelper = new CarvableHelper();
|
||||
this.isJackolantern = isOn;
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public IIcon getIcon(int side, int meta)
|
||||
{
|
||||
switch(side)
|
||||
{
|
||||
case 0:
|
||||
return this.top;// bottom
|
||||
case 1:
|
||||
return this.top;// top
|
||||
case 3:
|
||||
return this.face[meta];
|
||||
default:
|
||||
return this.side; // sides
|
||||
}
|
||||
if(side == 0 || side == 1)
|
||||
return top;
|
||||
if(side != 3)
|
||||
return blockIcon;
|
||||
return face;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void registerBlockIcons(IIconRegister icon){
|
||||
System.out.println(carverHelper.getVariation(blockMetadata).texture);
|
||||
top = icon.registerIcon(Chisel.MOD_ID + ":pumpkin/pumpkin_top");
|
||||
side = icon.registerIcon(Chisel.MOD_ID + ":pumpkin/pumpkin_side");
|
||||
for(int x = 0; x < 16; x++){
|
||||
face[x] = icon.registerIcon(Chisel.MOD_ID + ":pumpkin/pumpkin_face_" + (x + 1) + (isJackolantern ? "_on" : "_off"));
|
||||
}
|
||||
face = icon.registerIcon(Chisel.MOD_ID + ":" + carverHelper.getVariation(blockMetadata).texture);
|
||||
this.blockIcon = icon.registerIcon(Chisel.MOD_ID + ":pumpkin/pumpkin_side");
|
||||
}
|
||||
|
||||
@Override
|
||||
public CarvableVariation getVariation(int metadata) {
|
||||
blockMetadata = metadata;
|
||||
return carverHelper.getVariation(metadata);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
/*@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List subItems){
|
||||
for(int x = 0; x < 16; x++){
|
||||
subItems.add(new ItemStack(this, 1, x));
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
@@ -1,10 +1,5 @@
|
||||
package com.cricketcraft.chisel.carving;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.Configurations;
|
||||
import com.cricketcraft.chisel.block.BlockMarbleSlab;
|
||||
@@ -13,7 +8,7 @@ import com.cricketcraft.chisel.client.render.CTM;
|
||||
import com.cricketcraft.chisel.client.render.TextureSubmap;
|
||||
import com.cricketcraft.chisel.item.ItemCarvable;
|
||||
import com.cricketcraft.chisel.utils.GeneralClient;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockPane;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -22,7 +17,11 @@ import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
public class CarvableHelper
|
||||
{
|
||||
@@ -330,11 +329,9 @@ public class CarvableHelper
|
||||
if(variation.block == null)
|
||||
{
|
||||
Carving.chisel.addVariation(name, block, blockMeta, variation.metadata);
|
||||
block.setHarvestLevel("chisel", 0, blockMeta);
|
||||
} else
|
||||
{
|
||||
Carving.chisel.addVariation(name, variation.block, variation.blockMeta, variation.metadata);
|
||||
variation.block.setHarvestLevel("chisel", 0, variation.blockMeta);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1281,23 +1281,23 @@ public class ModBlocks {
|
||||
if(Configurations.featureEnabled("pumpkin"))
|
||||
{
|
||||
Carving.chisel.addVariation("pumpkin", Blocks.pumpkin, 0, 0);
|
||||
pumpkin = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.0.desc"), 0, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.1.desc"), 1, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.2.desc"), 2, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.3.desc"), 3, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.4.desc"), 4, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.5.desc"), 5, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.6.desc"), 6, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.7.desc"), 7, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.8.desc"), 8, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.9.desc"), 9, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.10.desc"), 10, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.11.desc"), 11, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.12.desc"), 12, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.13.desc"), 13, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.14.desc"), 14, pumpkin);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.15.desc"), 15, pumpkin);
|
||||
pumpkin = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ModTabs.tabChiselBlocks);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.0.desc"), 0, "pumpkin/pumpkin_face_1_off", pumpkin, 0);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.1.desc"), 1, "pumpkin/pumpkin_face_2_off", pumpkin, 1);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.2.desc"), 2, "pumpkin/pumpkin_face_3_off", pumpkin, 2);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.3.desc"), 3, "pumpkin/pumpkin_face_4_off", pumpkin, 3);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.4.desc"), 4, "pumpkin/pumpkin_face_5_off", pumpkin, 4);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.5.desc"), 5, "pumpkin/pumpkin_face_6_off", pumpkin, 5);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.6.desc"), 6, "pumpkin/pumpkin_face_7_off", pumpkin, 6);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.7.desc"), 7, "pumpkin/pumpkin_face_8_off", pumpkin, 7);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.8.desc"), 8, "pumpkin/pumpkin_face_9_off", pumpkin, 8);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.9.desc"), 9, "pumpkin/pumpkin_face_10_off", pumpkin, 9);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.10.desc"), 10, "pumpkin/pumpkin_face_11_off", pumpkin, 10);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.11.desc"), 11, "pumpkin/pumpkin_face_12_off", pumpkin, 11);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.12.desc"), 12, "pumpkin/pumpkin_face_13_off", pumpkin, 12);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.13.desc"), 13, "pumpkin/pumpkin_face_14_off", pumpkin, 13);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.14.desc"), 14, "pumpkin/pumpkin_face_15_off", pumpkin, 14);
|
||||
pumpkin.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.15.desc"), 15, "pumpkin/pumpkin_face_16_off", pumpkin, 15);
|
||||
pumpkin.carverHelper.register(pumpkin, "pumpkin");
|
||||
Carving.chisel.registerOre("pumpkin", "pumpkin");
|
||||
}
|
||||
@@ -1305,23 +1305,24 @@ public class ModBlocks {
|
||||
if(Configurations.featureEnabled("jackolantern"))
|
||||
{
|
||||
Carving.chisel.addVariation("jackolantern", Blocks.pumpkin, 0, 0);
|
||||
jackolantern = (BlockCarvablePumpkin) new BlockCarvablePumpkin(false).setHardness(2.0F).setResistance(5F).setStepSound(Block.soundTypeStone);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.0.desc"), 0, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.1.desc"), 1, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.2.desc"), 2, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.3.desc"), 3, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.4.desc"), 4, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.5.desc"), 5, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.6.desc"), 6, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.7.desc"), 7, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.8.desc"), 8, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.9.desc"), 9, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.10.desc"), 10, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.11.desc"), 11, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.12.desc"), 12, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.13.desc"), 13, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.14.desc"), 14, jackolantern);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.jackolantern.15.desc"), 15, jackolantern);
|
||||
jackolantern = (BlockCarvablePumpkin) new BlockCarvablePumpkin(true).setHardness(2.0F).setResistance(10.0F).setCreativeTab(ModTabs.tabChiselBlocks);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.0.desc"), 0, "pumpkin/pumpkin_face_1_on", jackolantern, 0);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.1.desc"), 1, "pumpkin/pumpkin_face_2_on", jackolantern, 1);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.2.desc"), 2, "pumpkin/pumpkin_face_3_on", jackolantern, 2);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.3.desc"), 3, "pumpkin/pumpkin_face_4_on", jackolantern, 3);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.4.desc"), 4, "pumpkin/pumpkin_face_5_on", jackolantern, 4);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.5.desc"), 5, "pumpkin/pumpkin_face_6_on", jackolantern, 5);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.6.desc"), 6, "pumpkin/pumpkin_face_7_on", jackolantern, 6);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.7.desc"), 7, "pumpkin/pumpkin_face_8_on", jackolantern, 7);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.8.desc"), 8, "pumpkin/pumpkin_face_9_on", jackolantern, 8);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.9.desc"), 9, "pumpkin/pumpkin_face_10_on", jackolantern, 9);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.10.desc"), 10, "pumpkin/pumpkin_face_11_on", jackolantern, 10);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.11.desc"), 11, "pumpkin/pumpkin_face_12_on", jackolantern, 11);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.12.desc"), 12, "pumpkin/pumpkin_face_13_on", jackolantern, 12);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.13.desc"), 13, "pumpkin/pumpkin_face_14_on", jackolantern, 13);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.14.desc"), 14, "pumpkin/pumpkin_face_15_on", jackolantern, 14);
|
||||
jackolantern.carverHelper.addVariation(StatCollector.translateToLocal("tile.pumpkin.15.desc"), 15, "pumpkin/pumpkin_face_16_on", jackolantern, 15);
|
||||
jackolantern.carverHelper.register(jackolantern, "jackolantern");
|
||||
Carving.chisel.registerOre("jackolantern", "jackolantern");
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user