Better balls, fancier Infinity block, update todo

This commit is contained in:
Alex Spinks committed 2015-08-03 21:19:20 +01:00
1 parent 97f87ce024
commit 915f3056be
11 files changed
+55 -56

No files matched your search

@@ -196,6 +196,9 @@ public class LudicrousEvents {
event.newSpeed *= 5;
if(!event.entityPlayer.isInsideOfMaterial(Material.water) && !EnchantmentHelper.getAquaAffinityModifier(event.entityPlayer))
event.newSpeed *= 5;
if(held.getTagCompound().getBoolean("hammer")) {
event.newSpeed *= 0.1;
}
}
}
}
@@ -196,7 +196,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
int donorcount = getClusterSize(donor);
int recipientcount = getClusterSize(recipient);
Lumberjack.info("merge 1");
Lumberjack.info(donorcount +", "+ recipientcount);
if (donorcount == 0 || donorcount == capacity || recipientcount == capacity) {
return;
@@ -207,7 +206,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
List<Entry<ItemStackWrapper, Integer>> datalist = new ArrayList<Entry<ItemStackWrapper, Integer>>();
datalist.addAll(donordata.entrySet());
Lumberjack.info("merge 2");
while (recipientcount < capacity && donorcount > 0) {
Entry<ItemStackWrapper, Integer> e = datalist.get(0);
ItemStackWrapper wrap = e.getKey();
@@ -231,8 +229,6 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
datalist.remove(0);
}
}
Lumberjack.info("merge 4");
setClusterData(recipient, recipientdata, recipientcount);
if (donorcount > 0) {
@@ -246,10 +242,12 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{
List<ItemStack> drops = ToolHelper.collateMatterClusterContents(ItemMatterCluster.getClusterData(stack));
for (ItemStack drop : drops) {
ToolHelper.dropItem(drop, world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ));
if(!world.isRemote) {
List<ItemStack> drops = ToolHelper.collateMatterClusterContents(ItemMatterCluster.getClusterData(stack));
for (ItemStack drop : drops) {
ToolHelper.dropItem(drop, world, MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ));
}
}
stack.stackSize = 0;
@@ -288,4 +286,14 @@ public class ItemMatterCluster extends Item implements ICosmicRenderItem {
{
return this.getIcon(stack, 0);
}
@Override
public String getUnlocalizedName(ItemStack stack)
{
int count = getClusterSize(stack);
if (count == capacity) {
return super.getUnlocalizedName(stack) + ".full";
}
return super.getUnlocalizedName(stack);
}
}