diff --git a/DummyCore/Blocks/MultiBlock.java b/DummyCore/Blocks/MultiBlock.java index 31a85f2..d2c8f9c 100644 --- a/DummyCore/Blocks/MultiBlock.java +++ b/DummyCore/Blocks/MultiBlock.java @@ -33,14 +33,20 @@ public class MultiBlock extends Block{ protected static List blockTextures = new ArrayList(); protected static int id = -1; public static int blockuid; - public static Icon[] icon; + public static Icon[] icon = new Icon[4096]; protected static IDummyMultiBlock[] handler = new IDummyMultiBlock[1024]; public static int blocks; public MultiBlock(int par1) { super(par1, Material.web); blockuid = par1; + this.setTickRandomly(true); } + public int tickRate(World par1World) + { + return 50; + } + private static void addBlockName(int i, String name) { blockNames.add(i, name); @@ -175,12 +181,18 @@ public class MultiBlock extends Block{ @Override public Icon getIcon(int par1, int par2) { - for(int i = 0; i < 1024; ++i) - { - if(handler[i] != null && i == par2) - return handler[i].getIcon(par1, par2); + try { + for(int i = 0; i < 1024; ++i) + { + if(handler[i] != null && i == par2) + return handler[i].getIcon(par1, par2); + } + return this.icon[par2]; + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + return null; } - return this.icon[par2]; } @SideOnly(Side.CLIENT) @@ -298,6 +310,31 @@ public class MultiBlock extends Block{ return 16777215; } + @Override + public ArrayList getBlockDropped(World world, int x, int y, int z, int metadata, int fortune) + { + for(int i = 0; i < 1024; ++i) + { + if(handler[i] != null && i == metadata) + { + ArrayList ret = handler[i].getBlockDropped(world, x, y, z, metadata, fortune); + if(ret != null) + return ret; + } + } + return super.getBlockDropped(world, x, y, z, metadata, fortune); + } + + @Override + public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + { + for(int i = 0; i < 1024; ++i) + { + if(handler[i] != null && i == par4) + handler[i].updateTick(par1World, par2, par3, par4, par5Random); + } + } + @Override public int damageDropped(int par1) { diff --git a/DummyCore/Utils/Coord2D.java b/DummyCore/Utils/Coord2D.java index bfe6905..8c16405 100644 --- a/DummyCore/Utils/Coord2D.java +++ b/DummyCore/Utils/Coord2D.java @@ -22,6 +22,9 @@ public class Coord2D { this(0,0); } - + public String toString() + { + return x+","+z; + } } diff --git a/DummyCore/Utils/DummyPacketHandler.java b/DummyCore/Utils/DummyPacketHandler.java index ef3bfc5..aa67ce5 100644 --- a/DummyCore/Utils/DummyPacketHandler.java +++ b/DummyCore/Utils/DummyPacketHandler.java @@ -22,6 +22,7 @@ public class DummyPacketHandler implements IPacketHandler{ int y = 0; int z = 0; String gameData = "data"; + System.out.println("data"); try { Side s = FMLCommonHandler.instance().getEffectiveSide(); if(s == Side.CLIENT) diff --git a/DummyCore/Utils/EnumRarityColor.java b/DummyCore/Utils/EnumRarityColor.java new file mode 100644 index 0000000..8cb4388 --- /dev/null +++ b/DummyCore/Utils/EnumRarityColor.java @@ -0,0 +1,39 @@ +package DummyCore.Utils; + +public enum EnumRarityColor { + BROKEN("8","Broken"), + COMMON("f","Common"), + GOOD("a","Good"), + UNCOMMON("2","Uncommon"), + RARE("9","Rare"), + UNIQUE("d","Unique"), + EPIC("e","Epic"), + LEGENDARY("6","Legendary"), + EXCEPTIONAL("b","Exceptional"), + PERFECT("3","Perfect"), + ULTIMATE("c","Ultimate"), + TURQUOISE("4","Turquoise"), + ; + EnumRarityColor(String s, String s1) + { + value = s; + name = s1; + } + + private String value; + private String name; + + public String getRarityColor() + { + String ret = new String(); + ret += "\247"; + ret+=value; + return ret; + } + + public String getName() + { + return name; + } + +} diff --git a/DummyCore/Utils/IDummyMultiBlock.java b/DummyCore/Utils/IDummyMultiBlock.java index dce967a..4fdb253 100644 --- a/DummyCore/Utils/IDummyMultiBlock.java +++ b/DummyCore/Utils/IDummyMultiBlock.java @@ -1,5 +1,6 @@ package DummyCore.Utils; +import java.util.ArrayList; import java.util.List; import java.util.Random; @@ -58,4 +59,8 @@ public interface IDummyMultiBlock { public Icon getIcon(int par1, int par2); public int getRenderColor(int par1); + + public ArrayList getBlockDropped(World world, int x, int y, int z, int metadata, int fortune); + + public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random); }