aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/helpers')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java3
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java4
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java13
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java34
4 files changed, 20 insertions, 34 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
index ce9ea45841..a2114ab375 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/ChargingHelper.java
@@ -1,7 +1,8 @@
package gtPlusPlus.xmod.gregtech.common.helpers;
import static gregtech.api.GregTech_API.mEUtoRF;
-import static gregtech.api.enums.Mods.*;
+import static gregtech.api.enums.Mods.Baubles;
+import static gregtech.api.enums.Mods.COFHCore;
import java.util.HashMap;
import java.util.Map;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
index b866be1d87..8cbb473a42 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/FlotationRecipeHandler.java
@@ -13,8 +13,8 @@ import gtPlusPlus.core.material.Material;
public class FlotationRecipeHandler {
- private static final HashMap<String, Material> sMaterialMap = new HashMap<String, Material>();
- private static final HashMap<String, ItemStack> sMilledMap = new HashMap<String, ItemStack>();
+ private static final HashMap<String, Material> sMaterialMap = new HashMap<>();
+ private static final HashMap<String, ItemStack> sMilledMap = new HashMap<>();
public static boolean registerOreType(Material aMaterial) {
String aMaterialKey = aMaterial.getUnlocalizedName();
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
index a8b3ea15ea..7774a34dc1 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/TreeFarmHelper.java
@@ -13,16 +13,15 @@ public class TreeFarmHelper {
public static SAWTOOL isCorrectMachinePart(final ItemStack aStack) {
if (aStack != null && aStack.getItem() instanceof GT_MetaGenerated_Tool_01) {
switch (aStack.getItemDamage()) {
- case GT_MetaGenerated_Tool_01.SAW:
+ case GT_MetaGenerated_Tool_01.SAW -> {
return SAWTOOL.SAW;
- case GT_MetaGenerated_Tool_01.BUZZSAW_LV:
- case GT_MetaGenerated_Tool_01.BUZZSAW_MV:
- case GT_MetaGenerated_Tool_01.BUZZSAW_HV:
+ }
+ case GT_MetaGenerated_Tool_01.BUZZSAW_LV, GT_MetaGenerated_Tool_01.BUZZSAW_MV, GT_MetaGenerated_Tool_01.BUZZSAW_HV -> {
return SAWTOOL.BUZZSAW;
- case GT_MetaGenerated_Tool_01.CHAINSAW_LV:
- case GT_MetaGenerated_Tool_01.CHAINSAW_MV:
- case GT_MetaGenerated_Tool_01.CHAINSAW_HV:
+ }
+ case GT_MetaGenerated_Tool_01.CHAINSAW_LV, GT_MetaGenerated_Tool_01.CHAINSAW_MV, GT_MetaGenerated_Tool_01.CHAINSAW_HV -> {
return SAWTOOL.CHAINSAW;
+ }
}
}
return SAWTOOL.NONE;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
index 93442675ca..a526e61107 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract/TesseractHelper.java
@@ -4,7 +4,6 @@ import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap;
import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -38,10 +37,8 @@ public class TesseractHelper {
// Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 2");
Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet();
- Iterator<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> i = players.iterator();
- while (i.hasNext()) {
+ for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) {
// Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 3");
- Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current = i.next();
if (current.getValue().equals(generator)) {
// Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 4");
return true;
@@ -64,7 +61,7 @@ public class TesseractHelper {
Map<Integer, GT_MetaTileEntity_TesseractGenerator> playerOwned = sTesseractGeneratorOwnershipMap
.get(playerIdentifier);
if (playerOwned == null || playerOwned.isEmpty()) {
- Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractGenerator>();
+ Map<Integer, GT_MetaTileEntity_TesseractGenerator> newOwnershipMap = new HashMap<>();
newOwnershipMap.put(freq, generator);
sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap);
Logger.WARNING("Success! [Empty Map]");
@@ -96,10 +93,8 @@ public class TesseractHelper {
// Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1");
Map<Integer, GT_MetaTileEntity_TesseractGenerator> generators = getGeneratorOwnershipByPlayer(player);
Set<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> players = generators.entrySet();
- Iterator<Entry<Integer, GT_MetaTileEntity_TesseractGenerator>> i = players.iterator();
- while (i.hasNext()) {
+ for (Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current : players) {
// Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 2");
- Entry<Integer, GT_MetaTileEntity_TesseractGenerator> current = i.next();
if (current.getKey().equals(freq)) {
// Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 3");
Logger.WARNING("Success!");
@@ -142,9 +137,7 @@ public class TesseractHelper {
if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet();
- Iterator<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> i = players.iterator();
- while (i.hasNext()) {
- Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current = i.next();
+ for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) {
if (current.getValue().equals(generator)) {
return true;
}
@@ -165,7 +158,7 @@ public class TesseractHelper {
Map<Integer, GT_MetaTileEntity_TesseractTerminal> playerOwned = sTesseractTerminalOwnershipMap
.get(playerIdentifier);
if (playerOwned == null || playerOwned.isEmpty()) {
- Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<Integer, GT_MetaTileEntity_TesseractTerminal>();
+ Map<Integer, GT_MetaTileEntity_TesseractTerminal> newOwnershipMap = new HashMap<>();
newOwnershipMap.put(freq, generator);
sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap);
Logger.WARNING("Success! [Empty Map]");
@@ -195,9 +188,7 @@ public class TesseractHelper {
if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
Map<Integer, GT_MetaTileEntity_TesseractTerminal> generators = getTerminalOwnershipByPlayer(player);
Set<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> players = generators.entrySet();
- Iterator<Entry<Integer, GT_MetaTileEntity_TesseractTerminal>> i = players.iterator();
- while (i.hasNext()) {
- Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current = i.next();
+ for (Entry<Integer, GT_MetaTileEntity_TesseractTerminal> current : players) {
if (current.getKey().equals(freq)) {
Logger.WARNING("Success!");
return current.getValue();
@@ -226,15 +217,13 @@ public class TesseractHelper {
* Internal Methods
*
*/
- private static final Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer(
+ private static Map<Integer, GT_MetaTileEntity_TesseractGenerator> getGeneratorOwnershipByPlayer(
EntityPlayer player) {
UUID playerIdentifier = player.getUniqueID();
if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) {
Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> players = sTesseractGeneratorOwnershipMap
.entrySet();
- Iterator<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>>> i = players.iterator();
- while (i.hasNext()) {
- Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current = i.next();
+ for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> current : players) {
if (current.getKey().compareTo(playerIdentifier) == 0) {
return current.getValue();
}
@@ -243,15 +232,12 @@ public class TesseractHelper {
return null;
}
- private static final Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer(
- EntityPlayer player) {
+ private static Map<Integer, GT_MetaTileEntity_TesseractTerminal> getTerminalOwnershipByPlayer(EntityPlayer player) {
UUID playerIdentifier = player.getUniqueID();
if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) {
Set<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> players = sTesseractTerminalOwnershipMap
.entrySet();
- Iterator<Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>>> i = players.iterator();
- while (i.hasNext()) {
- Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current = i.next();
+ for (Entry<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> current : players) {
if (current.getKey().compareTo(playerIdentifier) == 0) {
return current.getValue();
}
generated by cgit (git 2.46.0) at 2025-03-09 14:16:16 +0000