aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/items
diff options
context:
space:
mode:
authorYannickMG <yannickmg@gmail.com>2022-07-01 19:13:43 -0400
committerGitHub <noreply@github.com>2022-07-02 00:13:43 +0100
commite7eaa051f2725501436ac31f880746a9dc2f1465 (patch)
tree7fc74410cc795d855913cf590c75574b2834b222 /src/main/java/gregtech/common/items
parentf7bdbd14a6f5e8fb4e5af0010b4cfcae3282feee (diff)
downloadGT5-Unofficial-e7eaa051f2725501436ac31f880746a9dc2f1465.tar.gz
GT5-Unofficial-e7eaa051f2725501436ac31f880746a9dc2f1465.tar.bz2
GT5-Unofficial-e7eaa051f2725501436ac31f880746a9dc2f1465.zip
Par, var, begone! (#1104)
* Renamed parameters of ItemBlock subclasses * Renamed damageDropped and getDamageValue method parameters of Block subclasses * Removed trivially superfluous overrides of Block::quantityDropped, Block::isOpaqueCube and Block::renderAsNormalBlock * Removed trivially superfluous overrides of Block::getItemDropped * Cleaned up a few more block subclass method parameters * Cleaned up obsolete Javadoc * par1 -> block in ItemBlock Constructors * Renamed arguments to drawGuiContainerForegroundLayer * Cleaned up redundant casts * Renamed arguments to drawGuiContainerBackgroundLayer * Renamed arguments to Slot subclass constructors * Renamed arguments to World subclass GT_DummyWorld * Renamed parameters of updateProgressBar * Renamed the rest of the par* parameters outside of GT_MinableOreGenerator which should be deleted * Renamed most var1-var10 and a few more in generally non-dead code * Renamed last varSomething variables * Removed 3 fully dead classes used nowhere in the codebase, with obsolete unused code
Diffstat (limited to 'src/main/java/gregtech/common/items')
-rw-r--r--src/main/java/gregtech/common/items/GT_FluidDisplayItem.java4
-rw-r--r--src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java6
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java2
-rw-r--r--src/main/java/gregtech/common/items/GT_SensorCard_Item.java2
-rw-r--r--src/main/java/gregtech/common/items/ItemComb.java6
-rw-r--r--src/main/java/gregtech/common/items/ItemDrop.java6
-rw-r--r--src/main/java/gregtech/common/items/ItemPollen.java6
-rw-r--r--src/main/java/gregtech/common/items/ItemPropolis.java4
9 files changed, 19 insertions, 19 deletions
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index 55e10bd62e..a2879844aa 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -65,8 +65,8 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
}
@Override
- public IIcon getIconFromDamage(int aMeta) {
- return Stream.of(FluidRegistry.getFluid(aMeta), FluidRegistry.WATER)
+ public IIcon getIconFromDamage(int aMetaData) {
+ return Stream.of(FluidRegistry.getFluid(aMetaData), FluidRegistry.WATER)
.filter(Objects::nonNull)
.map(Fluid::getStillIcon)
.filter(Objects::nonNull)
diff --git a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
index b68a6974e4..052e5ed1b6 100644
--- a/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
+++ b/src/main/java/gregtech/common/items/GT_IntegratedCircuit_Item.java
@@ -125,7 +125,7 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
@Override
@SideOnly(Side.CLIENT)
- public final void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+ public final void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
aList.add(new ItemStack(this, 1, 0));
}
@@ -151,8 +151,8 @@ public class GT_IntegratedCircuit_Item extends GT_Generic_Item implements INetwo
}
@Override
- public IIcon getIconFromDamage(int damage) {
- byte circuitMode = ((byte) (damage & 0xFF)); // Mask out the MSB Comparison Mode Bits. See: getModeString
+ public IIcon getIconFromDamage(int aMetaData) {
+ byte circuitMode = ((byte) (aMetaData & 0xFF)); // Mask out the MSB Comparison Mode Bits. See: getModeString
return mIconDamage[circuitMode < mIconDamage.length ? circuitMode : 0];
}
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
index b78d4e567b..34f01c7165 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_98.java
@@ -300,7 +300,7 @@ public class GT_MetaGenerated_Item_98 extends GT_MetaGenerated_Item {
@Override
@SideOnly(Side.CLIENT)
- public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+ public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
Arrays.stream(FluidCell.values())
.map(FluidCell::get)
.filter(Objects::nonNull)
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
index 1c27310d99..820c28fea3 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_99.java
@@ -161,7 +161,7 @@ public class GT_MetaGenerated_Item_99 extends GT_MetaGenerated_Item {
@Override
@SideOnly(Side.CLIENT)
- public void getSubItems(Item var1, CreativeTabs aCreativeTab, List aList) {
+ public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aList) {
enabled.stream()
.mapToObj(i -> new ItemStack(this, 1, i))
.forEach(aList::add);
diff --git a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
index ddc523239a..b2f73d304f 100644
--- a/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
+++ b/src/main/java/gregtech/common/items/GT_SensorCard_Item.java
@@ -94,6 +94,6 @@ public class GT_SensorCard_Item extends GT_Generic_Item implements IRemoteSensor
@Override
@SideOnly(Side.CLIENT)
- public void getSubItems(Item var1, CreativeTabs aTab, List aList) {
+ public void getSubItems(Item aItem, CreativeTabs aCreativeTab, List aOutputSubItems) {
}
}
diff --git a/src/main/java/gregtech/common/items/ItemComb.java b/src/main/java/gregtech/common/items/ItemComb.java
index 4599382063..a6030b0cd8 100644
--- a/src/main/java/gregtech/common/items/ItemComb.java
+++ b/src/main/java/gregtech/common/items/ItemComb.java
@@ -73,9 +73,9 @@ public class ItemComb extends Item {
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister par1IconRegister) {
- this.itemIcon = par1IconRegister.registerIcon("forestry:beeCombs.0");
- this.secondIcon = par1IconRegister.registerIcon("forestry:beeCombs.1");
+ public void registerIcons(IIconRegister iconRegister) {
+ this.itemIcon = iconRegister.registerIcon("forestry:beeCombs.0");
+ this.secondIcon = iconRegister.registerIcon("forestry:beeCombs.1");
}
@Override
diff --git a/src/main/java/gregtech/common/items/ItemDrop.java b/src/main/java/gregtech/common/items/ItemDrop.java
index d9b5db5bc7..b48072dbd1 100644
--- a/src/main/java/gregtech/common/items/ItemDrop.java
+++ b/src/main/java/gregtech/common/items/ItemDrop.java
@@ -65,9 +65,9 @@ public class ItemDrop extends Item {
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister par1IconRegister) {
- this.itemIcon = par1IconRegister.registerIcon("forestry:honeyDrop.0");
- this.secondIcon = par1IconRegister.registerIcon("forestry:honeyDrop.1");
+ public void registerIcons(IIconRegister iconRegister) {
+ this.itemIcon = iconRegister.registerIcon("forestry:honeyDrop.0");
+ this.secondIcon = iconRegister.registerIcon("forestry:honeyDrop.1");
}
@Override
diff --git a/src/main/java/gregtech/common/items/ItemPollen.java b/src/main/java/gregtech/common/items/ItemPollen.java
index eaef49e02a..bc41b1c83d 100644
--- a/src/main/java/gregtech/common/items/ItemPollen.java
+++ b/src/main/java/gregtech/common/items/ItemPollen.java
@@ -57,9 +57,9 @@ public class ItemPollen extends Item {
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister par1IconRegister) {
- this.itemIcon = par1IconRegister.registerIcon("forestry:pollen.0");
- this.secondIcon = par1IconRegister.registerIcon("forestry:pollen.1");
+ public void registerIcons(IIconRegister iconRegister) {
+ this.itemIcon = iconRegister.registerIcon("forestry:pollen.0");
+ this.secondIcon = iconRegister.registerIcon("forestry:pollen.1");
}
@Override
diff --git a/src/main/java/gregtech/common/items/ItemPropolis.java b/src/main/java/gregtech/common/items/ItemPropolis.java
index b6fe8b242e..729958a72e 100644
--- a/src/main/java/gregtech/common/items/ItemPropolis.java
+++ b/src/main/java/gregtech/common/items/ItemPropolis.java
@@ -54,8 +54,8 @@ public class ItemPropolis extends Item {
@Override
@SideOnly(Side.CLIENT)
- public void registerIcons(IIconRegister par1IconRegister) {
- this.itemIcon = par1IconRegister.registerIcon("forestry:propolis.0");
+ public void registerIcons(IIconRegister iconRegister) {
+ this.itemIcon = iconRegister.registerIcon("forestry:propolis.0");
}
@Override