mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-18 03:25:07 +00:00
Clean up some parameter names
This commit is contained in:
1 parent
f5e52163b4
commit
cc20e2d339
25 files changed
+50
-50
No files matched your search
@@ -138,13 +138,13 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDisplayName(final ItemStack par1ItemStack) {
|
||||
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
|
||||
public String getDisplayName(final ItemStack itemStack) {
|
||||
final int meta = TileEntityMetadata.getItemDamage(itemStack);
|
||||
return EnumFlowerColor.get(meta).getColourName() + " " + Binnie.LANGUAGE.localise("tile.botany.pigmented.glass.name");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
for (final EnumFlowerColor c : EnumFlowerColor.values()) {
|
||||
itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal()));
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock<CeramicB
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(Item item, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(Item item, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
for (final EnumFlowerColor color : EnumFlowerColor.values()) {
|
||||
itemList.add(new CeramicBrickPair(color, color, CeramicBrickType.Tile).getStack(1));
|
||||
}
|
||||
|
||||
@@ -148,7 +148,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(final Item item, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubItems(final Item item, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
this.addCreativeItems(itemList, true);
|
||||
}
|
||||
|
||||
|
||||
@@ -109,9 +109,9 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> list) {
|
||||
for (int i = 0; i < 9; ++i) {
|
||||
par3List.add(new ItemStack(this, 1, i));
|
||||
list.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -27,9 +27,9 @@ public class ItemDictionary extends Item implements IItemModelRegister {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
|
||||
super.getSubItems(par1, par2CreativeTabs, par3List);
|
||||
par3List.add(new ItemStack(par1, 1, 1));
|
||||
public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> subItems) {
|
||||
super.getSubItems(itemIn, tab, subItems);
|
||||
subItems.add(new ItemStack(itemIn, 1, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -53,7 +53,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
|
||||
/* IBLOCKMETADATA */
|
||||
@Override
|
||||
public String getDisplayName(final ItemStack par1ItemStack) {
|
||||
public String getDisplayName(final ItemStack itemStack) {
|
||||
return this.getLocalizedName();
|
||||
}
|
||||
|
||||
|
||||
@@ -17,7 +17,7 @@ public class ItemMetadata extends ItemBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(final int par1) {
|
||||
public int getMetadata(final int damage) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -24,9 +24,9 @@ public class TileEntityMetadata extends TileEntity {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean receiveClientEvent(final int par1, final int par2) {
|
||||
if (par1 == 42) {
|
||||
this.meta = par2;
|
||||
public boolean receiveClientEvent(final int id, final int type) {
|
||||
if (id == 42) {
|
||||
this.meta = type;
|
||||
markDirty();
|
||||
}
|
||||
return true;
|
||||
|
||||
@@ -82,18 +82,18 @@ public class ContainerCraftGUI extends Container {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onContainerClosed(final EntityPlayer par1EntityPlayer) {
|
||||
this.crafters.remove(par1EntityPlayer);
|
||||
super.onContainerClosed(par1EntityPlayer);
|
||||
public void onContainerClosed(final EntityPlayer playerIn) {
|
||||
this.crafters.remove(playerIn);
|
||||
super.onContainerClosed(playerIn);
|
||||
WindowInventory inventory = this.window.getWindowInventory();
|
||||
for (int i = 0; i < inventory.getSizeInventory(); ++i) {
|
||||
if (inventory.dispenseOnClose(i)) {
|
||||
ItemStack stack = inventory.getStackInSlot(i);
|
||||
if (!stack.isEmpty()) {
|
||||
TransferRequest transferRequest = new TransferRequest(stack, par1EntityPlayer.inventory);
|
||||
TransferRequest transferRequest = new TransferRequest(stack, playerIn.inventory);
|
||||
stack = transferRequest.transfer(true);
|
||||
if (!stack.isEmpty()) {
|
||||
par1EntityPlayer.dropItem(stack, false);
|
||||
playerIn.dropItem(stack, false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -70,7 +70,7 @@ public class GuiCraftGUI extends GuiContainer {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void drawScreen(final int mouseX, final int mouseY, final float par3) {
|
||||
public void drawScreen(final int mouseX, final int mouseY, final float partialTicks) {
|
||||
this.window.setMousePosition(mouseX - this.window.getPosition().x(), mouseY - this.window.getPosition().y());
|
||||
this.drawDefaultBackground();
|
||||
GlStateManager.disableRescaleNormal();
|
||||
|
||||
@@ -22,7 +22,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt
|
||||
private final EnumHiveFrame frame;
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(final ItemStack par1ItemStack) {
|
||||
public String getItemStackDisplayName(final ItemStack itemStack) {
|
||||
return this.frame.getName();
|
||||
}
|
||||
|
||||
|
||||
@@ -21,13 +21,13 @@ public class ItemIndustrialFrame extends Item {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
|
||||
public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> subItems) {
|
||||
for (final IndustrialFrame frame : IndustrialFrame.values()) {
|
||||
final ItemStack stack = new ItemStack(this);
|
||||
final NBTTagCompound nbt = new NBTTagCompound();
|
||||
nbt.setInteger("frame", frame.ordinal());
|
||||
stack.setTagCompound(nbt);
|
||||
par3List.add(stack);
|
||||
subItems.add(stack);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,7 +44,7 @@ public class ItemIndustrialFrame extends Item {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(final ItemStack par1ItemStack) {
|
||||
public String getItemStackDisplayName(final ItemStack itemStack) {
|
||||
return "Industrial Frame";
|
||||
}
|
||||
|
||||
|
||||
@@ -145,7 +145,7 @@ public enum ExtraBeeItems implements IItemMiscProvider {
|
||||
// }
|
||||
|
||||
@Override
|
||||
public void addInformation(final List<String> par3List) {
|
||||
public void addInformation(final List<String> tooltip) {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -19,8 +19,8 @@ public class EntityBeeLightning extends EntityLightningBolt {
|
||||
super(world, 0, 0, 0, true);
|
||||
}
|
||||
|
||||
public EntityBeeLightning(final World par1World, final double par2, final double par4, final double par6) {
|
||||
super(par1World, par2, par4, par6, false);
|
||||
public EntityBeeLightning(final World world, final double x, final double y, final double z) {
|
||||
super(world, x, y, z, false);
|
||||
this.lightningState = 2;
|
||||
this.boltLivingTime = this.rand.nextInt(3) + 1;
|
||||
}
|
||||
|
||||
@@ -38,9 +38,9 @@ public class ItemDictionary extends Item implements IItemModelRegister {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> par3List) {
|
||||
super.getSubItems(par1, par2CreativeTabs, par3List);
|
||||
par3List.add(new ItemStack(par1, 1, 1));
|
||||
public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> subItems) {
|
||||
super.getSubItems(itemIn, tab, subItems);
|
||||
subItems.add(new ItemStack(itemIn, 1, 1));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -34,10 +34,10 @@ public class ItemProduct extends Item implements IItemModelRegister {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> subItems) {
|
||||
for (final IItemEnum type : this.types) {
|
||||
if (type.isActive()) {
|
||||
itemList.add(new ItemStack(this, 1, type.ordinal()));
|
||||
subItems.add(new ItemStack(this, 1, type.ordinal()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -30,12 +30,12 @@ public class BlockExtraBeeHive extends Block {
|
||||
this.setCreativeTab(Tabs.tabApiculture);
|
||||
}
|
||||
|
||||
public String getUnlocalizedName(final ItemStack par1ItemStack) {
|
||||
return "extrabees.block.hive." + par1ItemStack.getItemDamage();
|
||||
public String getUnlocalizedName(final ItemStack itemStack) {
|
||||
return "extrabees.block.hive." + itemStack.getItemDamage();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
for (int i = 0; i < EnumHiveType.values().length; ++i) {
|
||||
itemList.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
|
||||
@@ -21,9 +21,9 @@ public class ItemBeehive extends ItemBlock {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> subItems) {
|
||||
for (int i = 0; i < EnumHiveType.values().length; ++i) {
|
||||
itemList.add(new ItemStack(this, 1, i));
|
||||
subItems.add(new ItemStack(this, 1, i));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -228,8 +228,8 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDisplayName(ItemStack par1ItemStack) {
|
||||
final int meta = TileEntityMetadata.getItemDamage(par1ItemStack);
|
||||
public String getDisplayName(ItemStack itemStack) {
|
||||
final int meta = TileEntityMetadata.getItemDamage(itemStack);
|
||||
final String typeName = getDoorType(meta).getName();
|
||||
final String woodName = WoodManager.getPlankType(meta & 0xFF).getName();
|
||||
if (typeName.equals("")) {
|
||||
@@ -239,7 +239,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
for (final IPlankType type : PlankType.ExtraTreePlanks.values()) {
|
||||
itemList.add(WoodManager.getDoor(type, DoorType.Standard));
|
||||
}
|
||||
|
||||
@@ -172,7 +172,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
for (FenceType type : FenceType.values()) {
|
||||
itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1));
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ public class BlockCarpentryPanel extends BlockCarpentry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList<ItemStack> itemList) {
|
||||
public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList<ItemStack> itemList) {
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -60,8 +60,8 @@ public class BlockCarpentryPanel extends BlockCarpentry {
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDisplayName(final ItemStack stack) {
|
||||
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
|
||||
public String getDisplayName(final ItemStack itemStack) {
|
||||
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
|
||||
return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName());
|
||||
}
|
||||
|
||||
|
||||
@@ -102,8 +102,8 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDisplayName(final ItemStack stack) {
|
||||
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack));
|
||||
public String getDisplayName(final ItemStack itemStack) {
|
||||
final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack));
|
||||
return this.getBlockName(block);
|
||||
}
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ public enum ExtraTreeItems implements IItemMiscProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(final List<String> par3List) {
|
||||
public void addInformation(final List<String> tooltip) {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -119,7 +119,7 @@ public enum Food implements IItemMiscProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(final List<String> par3List) {
|
||||
public void addInformation(final List<String> tooltip) {
|
||||
}
|
||||
|
||||
public void addJuice(final Juice juice, final int time, final int amount, final int mulch) {
|
||||
|
||||
@@ -34,7 +34,7 @@ public enum GeneticsItems implements IItemMiscProvider {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addInformation(final List<String> par3List) {
|
||||
public void addInformation(final List<String> tooltip) {
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user