moar fixy thingies

This commit is contained in:
Progwml6 committed 2014-01-30 20:34:22 -05:00
1 parent 4326ff3c64
commit bb98f77de4
26 files changed
+173 -139

No files matched your search

@@ -36,7 +36,8 @@ public class Knapsack extends CraftingItem
}
}
@Override
//TODO feel fix this so that stuff ticks in backpacks
/*@Override
public void onArmorTickUpdate (World world, EntityPlayer player, ItemStack itemStack)
{
TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(player.getDisplayName());
@@ -52,6 +53,6 @@ public class Knapsack extends CraftingItem
}
}
}
}
}*/
}
@@ -64,9 +64,9 @@ public class ItemBlockLandmine extends ItemBlock
return false;
}
if (world.getBlock(x, y, z) == TRepo.landmine)
if (world.func_147439_a(x, y, z) == TRepo.landmine)
{
TRepo.landmine.onBlockPlacedBy(world, x, y, z, player, stack);
TRepo.landmine.func_149689_a(world, x, y, z, player, stack);
TileEntityLandmine te = (TileEntityLandmine) world.getBlockTileEntity(x, y, z);
if (te == null)
@@ -77,7 +77,7 @@ public class ItemBlockLandmine extends ItemBlock
te.triggerType = stack.getItemDamage();
world.setBlockTileEntity(x, y, z, te);
TRepo.landmine.onPostBlockPlaced(world, x, y, z, metadata);
TRepo.landmine.func_149714_e(world, x, y, z, metadata);
}
return true;
@@ -293,7 +293,7 @@ public class Hammer extends HarvestTool
Block localBlock = world.func_147439_a(xPos, yPos, zPos);
int localMeta = world.getBlockMetadata(xPos, yPos, zPos);
int hlvl = MinecraftForge.getBlockHarvestLevel(localBlock, meta, getHarvestType());
float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.getBlockHardness(world, xPos, yPos, zPos);
float localHardness = localBlock == null ? Float.MAX_VALUE : localBlock.func_149712_f(world, xPos, yPos, zPos);
if (hlvl <= toolLevel && localHardness - 1.5 <= blockHardness)
{
@@ -42,7 +42,7 @@ public class Hatchet extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.field_151584_j, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.field_151584_j, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A};//TODO find this//, Material.pumpkin };
@Override
public Item getHeadItem ()
@@ -63,7 +63,7 @@ public class LumberAxe extends HarvestTool
return AbilityHelper.onBlockChanged(itemstack, world, block, x, y, z, player, random);
}
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A, Material.pumpkin };
static Material[] materials = { Material.field_151575_d, Material.field_151582_l, Material.field_151594_q, Material.field_151570_A};//TODO find this//, Material.pumpkin };
/* Lumber axe specific */
@@ -47,7 +47,7 @@ public class Mattock extends DualHarvestTool
return "shovel";
}
static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A, Material.pumpkin, Material.field_151585_k, Material.field_151582_l };
static Material[] axeMaterials = { Material.field_151575_d, Material.field_151570_A};//TODO find this//, Material.pumpkin, Material.field_151585_k, Material.field_151582_l };
static Material[] shovelMaterials = { Material.field_151577_b, Material.field_151578_c, Material.field_151571_B };
@Override
@@ -40,7 +40,7 @@ public class Scythe extends Weapon
return materials;
}
static Material[] materials = new Material[] { Material.field_151569_G, Material.field_151570_A, Material.pumpkin, Material.field_151585_k, Material.field_151582_l, Material.field_151584_j };
static Material[] materials = new Material[] { Material.field_151569_G, Material.field_151570_A};//TODO find this//, Material.pumpkin, Material.field_151585_k, Material.field_151582_l, Material.field_151584_j };
@Override
public Item getHeadItem ()