mirror of
https://github.com/GTNewHorizons/Botania.git
synced 2026-11-21 12:42:50 +00:00
Get rid of some of the many stupid parXX parameter names
This commit is contained in:
91 files changed
+584
-584
No files matched your search
@@ -126,9 +126,9 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onEntityCollidedWithBlock(World par1World, BlockPos pos, IBlockState state, Entity par5Entity) {
|
||||
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity par5Entity) {
|
||||
if(par5Entity instanceof EntityItem) {
|
||||
TileAltar tile = (TileAltar) par1World.getTileEntity(pos);
|
||||
TileAltar tile = (TileAltar) world.getTileEntity(pos);
|
||||
if(tile.collideEntityItem((EntityItem) par5Entity))
|
||||
VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile);
|
||||
}
|
||||
@@ -143,51 +143,51 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(World par1World, BlockPos pos, IBlockState state, EntityPlayer par5EntityPlayer, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) {
|
||||
TileAltar tile = (TileAltar) par1World.getTileEntity(pos);
|
||||
if(par5EntityPlayer.isSneaking()) {
|
||||
InventoryHelper.withdrawFromInventory(tile, par5EntityPlayer);
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, ItemStack stack, EnumFacing par6, float par7, float par8, float par9) {
|
||||
TileAltar tile = (TileAltar) world.getTileEntity(pos);
|
||||
if(player.isSneaking()) {
|
||||
InventoryHelper.withdrawFromInventory(tile, player);
|
||||
} else if(tile.isEmpty() && tile.hasWater && stack == null)
|
||||
tile.trySetLastRecipe(par5EntityPlayer);
|
||||
tile.trySetLastRecipe(player);
|
||||
else {
|
||||
if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, false))) {
|
||||
if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) {
|
||||
if(!tile.hasWater) {
|
||||
if(stack.getItem() == ModItems.waterRod)
|
||||
ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, true);
|
||||
else if(!par5EntityPlayer.capabilities.isCreativeMode)
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));
|
||||
ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true);
|
||||
else if(!player.capabilities.isCreativeMode)
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack));
|
||||
|
||||
tile.setWater(true);
|
||||
par1World.updateComparatorOutputLevel(pos, this);
|
||||
par1World.checkLight(pos);
|
||||
world.updateComparatorOutputLevel(pos, this);
|
||||
world.checkLight(pos);
|
||||
}
|
||||
|
||||
return true;
|
||||
} else if(stack != null && stack.getItem() == Items.LAVA_BUCKET) {
|
||||
if(!par5EntityPlayer.capabilities.isCreativeMode)
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));
|
||||
if(!player.capabilities.isCreativeMode)
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack));
|
||||
|
||||
tile.setLava(true);
|
||||
tile.setWater(false);
|
||||
par1World.updateComparatorOutputLevel(pos, this);
|
||||
par1World.checkLight(pos);
|
||||
world.updateComparatorOutputLevel(pos, this);
|
||||
world.checkLight(pos);
|
||||
|
||||
return true;
|
||||
} else if(stack != null && stack.getItem() == Items.BUCKET && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) {
|
||||
ItemStack bucket = tile.hasLava ? new ItemStack(Items.LAVA_BUCKET) : new ItemStack(Items.WATER_BUCKET);
|
||||
if(stack.stackSize == 1)
|
||||
par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket);
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, bucket);
|
||||
else {
|
||||
if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket))
|
||||
par5EntityPlayer.dropItem(bucket, false);
|
||||
if(!player.inventory.addItemStackToInventory(bucket))
|
||||
player.dropItem(bucket, false);
|
||||
stack.stackSize--;
|
||||
}
|
||||
|
||||
if(tile.hasLava)
|
||||
tile.setLava(false);
|
||||
else tile.setWater(false);
|
||||
par1World.updateComparatorOutputLevel(pos, this);
|
||||
par1World.checkLight(pos);
|
||||
world.updateComparatorOutputLevel(pos, this);
|
||||
world.checkLight(pos);
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -262,12 +262,12 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void breakBlock(@Nonnull World par1World, @Nonnull BlockPos pos, @Nonnull IBlockState state) {
|
||||
TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(pos);
|
||||
public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) {
|
||||
TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos);
|
||||
|
||||
InventoryHelper.dropInventory(inv, par1World, state, pos);
|
||||
InventoryHelper.dropInventory(inv, world, state, pos);
|
||||
|
||||
super.breakBlock(par1World, pos, state);
|
||||
super.breakBlock(world, pos, state);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -276,8 +276,8 @@ public class BlockAltar extends BlockMod implements ILexiconable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getComparatorInputOverride(IBlockState state, World par1World, BlockPos pos) {
|
||||
TileAltar altar = (TileAltar) par1World.getTileEntity(pos);
|
||||
public int getComparatorInputOverride(IBlockState state, World world, BlockPos pos) {
|
||||
TileAltar altar = (TileAltar) world.getTileEntity(pos);
|
||||
return altar.hasWater ? 15 : 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user