From e7eaa051f2725501436ac31f880746a9dc2f1465 Mon Sep 17 00:00:00 2001
From: YannickMG <yannickmg@gmail.com>
Date: Fri, 1 Jul 2022 19:13:43 -0400
Subject: 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
---
 src/main/java/gregtech/api/util/GT_ModHandler.java | 10 +++++-----
 src/main/java/gregtech/api/util/GT_Utility.java    | 18 ++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'src/main/java/gregtech/api/util')

diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index e1e5184b60..febcb4ba32 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -1215,7 +1215,7 @@ public class GT_ModHandler {
         ItemStack rReturn = null;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1246,7 +1246,7 @@ public class GT_ModHandler {
 
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1356,7 +1356,7 @@ public class GT_ModHandler {
         if (!temp) return null;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1427,7 +1427,7 @@ public class GT_ModHandler {
 
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
@@ -1555,7 +1555,7 @@ public class GT_ModHandler {
             return rList;
         InventoryCrafting aCrafting = new InventoryCrafting(new Container() {
             @Override
-            public boolean canInteractWith(EntityPlayer var1) {
+            public boolean canInteractWith(EntityPlayer player) {
                 return false;
             }
         }, 3, 3);
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 76f45295f5..ef0b194ace 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -344,12 +344,11 @@ public class GT_Utility {
         try {
             Field tPotionHashmap = null;
 
-            Field[] var3 = EntityLiving.class.getDeclaredFields();
-            int var4 = var3.length;
+            Field[] fields = EntityLiving.class.getDeclaredFields();
 
-            for (Field var6 : var3) {
-                if (var6.getType() == HashMap.class) {
-                    tPotionHashmap = var6;
+            for (Field field : fields) {
+                if (field.getType() == HashMap.class) {
+                    tPotionHashmap = field;
                     tPotionHashmap.setAccessible(true);
                     break;
                 }
@@ -372,12 +371,11 @@ public class GT_Utility {
         try {
             Field tPotionHashmap = null;
 
-            Field[] var3 = EntityLiving.class.getDeclaredFields();
-            int var4 = var3.length;
+            Field[] fields = EntityLiving.class.getDeclaredFields();
 
-            for (Field var6 : var3) {
-                if (var6.getType() == HashMap.class) {
-                    tPotionHashmap = var6;
+            for (Field field : fields) {
+                if (field.getType() == HashMap.class) {
+                    tPotionHashmap = field;
                     tPotionHashmap.setAccessible(true);
                     break;
                 }
-- 
cgit