From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- .../common/helpers/tesseract/TesseractHelper.java | 76 ++++++++++------------ 1 file changed, 34 insertions(+), 42 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common/helpers/tesseract') 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 3717f17554..03a4ace32f 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 @@ -1,7 +1,7 @@ package gtPlusPlus.xmod.gregtech.common.helpers.tesseract; -import static gtPlusPlus.core.lib.CORE.sTesseractGeneratorOwnershipMap; -import static gtPlusPlus.core.lib.CORE.sTesseractTerminalOwnershipMap; +import static gtPlusPlus.core.lib.GTPPCore.sTesseractGeneratorOwnershipMap; +import static gtPlusPlus.core.lib.GTPPCore.sTesseractTerminalOwnershipMap; import java.util.HashMap; import java.util.Map; @@ -12,8 +12,8 @@ import java.util.UUID; import net.minecraft.entity.player.EntityPlayer; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_TesseractTerminal; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractGenerator; +import gtPlusPlus.xmod.gregtech.common.tileentities.automation.MTETesseractTerminal; public class TesseractHelper { @@ -25,8 +25,7 @@ public class TesseractHelper { */ // Checks if a Generator is owned by a player. - public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, - GT_MetaTileEntity_TesseractGenerator generator) { + public static final boolean isGeneratorOwnedByPlayer(EntityPlayer player, MTETesseractGenerator generator) { if (player == null) { Logger.WARNING("Failed. [isGeneratorOwnedByPlayer]"); return false; @@ -35,9 +34,9 @@ public class TesseractHelper { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 2"); - Map generators = getGeneratorOwnershipByPlayer(player); - Set> players = generators.entrySet(); - for (Entry current : players) { + Map generators = getGeneratorOwnershipByPlayer(player); + Set> players = generators.entrySet(); + for (Entry current : players) { // Utils.LOG_WARNING("Success. [isGeneratorOwnedByPlayer] 3"); if (current.getValue() .equals(generator)) { @@ -52,23 +51,22 @@ public class TesseractHelper { // Saves A Generator to the Players UUID map along with the Freq. public static final boolean setGeneratorOwnershipByPlayer(EntityPlayer player, int freq, - GT_MetaTileEntity_TesseractGenerator generator) { + MTETesseractGenerator generator) { if (player == null) { return false; } UUID playerIdentifier = player.getUniqueID(); Logger.WARNING("Setting Generator on " + freq + " for " + player.getDisplayName() + "."); if (playerIdentifier != null) { - Map playerOwned = sTesseractGeneratorOwnershipMap - .get(playerIdentifier); + Map playerOwned = sTesseractGeneratorOwnershipMap.get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { - Map newOwnershipMap = new HashMap<>(); + Map newOwnershipMap = new HashMap<>(); newOwnershipMap.put(freq, generator); sTesseractGeneratorOwnershipMap.put(playerIdentifier, newOwnershipMap); Logger.WARNING("Success! [Empty Map]"); return true; } else if (sTesseractGeneratorOwnershipMap.containsKey(playerIdentifier)) { - Map ownershipMap = sTesseractGeneratorOwnershipMap + Map ownershipMap = sTesseractGeneratorOwnershipMap .get(playerIdentifier); if (!ownershipMap.containsKey(freq)) { ownershipMap.put(freq, generator); @@ -84,7 +82,7 @@ public class TesseractHelper { } // Gets Generator based on Frequency. - public static final GT_MetaTileEntity_TesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) { + public static final MTETesseractGenerator getGeneratorByFrequency(EntityPlayer player, int freq) { if (player == null) { return null; } @@ -92,9 +90,9 @@ public class TesseractHelper { Logger.WARNING("Getting Generator on " + freq + " for " + player.getDisplayName() + "."); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 1"); - Map generators = getGeneratorOwnershipByPlayer(player); - Set> players = generators.entrySet(); - for (Entry current : players) { + Map generators = getGeneratorOwnershipByPlayer(player); + Set> players = generators.entrySet(); + for (Entry current : players) { // Utils.LOG_WARNING("Success. [getGeneratorByFrequency] 2"); if (current.getKey() .equals(freq)) { @@ -131,16 +129,15 @@ public class TesseractHelper { */ // Checks if a Terminal is owned by a player. - public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, - GT_MetaTileEntity_TesseractTerminal generator) { + public static final boolean isTerminalOwnedByPlayer(EntityPlayer player, MTETesseractTerminal generator) { if (player == null) { return false; } UUID playerIdentifier = player.getUniqueID(); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { - Map generators = getTerminalOwnershipByPlayer(player); - Set> players = generators.entrySet(); - for (Entry current : players) { + Map generators = getTerminalOwnershipByPlayer(player); + Set> players = generators.entrySet(); + for (Entry current : players) { if (current.getValue() .equals(generator)) { return true; @@ -152,24 +149,22 @@ public class TesseractHelper { // Saves A Terminal to the Players UUID map along with the Freq. public static final boolean setTerminalOwnershipByPlayer(EntityPlayer player, int freq, - GT_MetaTileEntity_TesseractTerminal generator) { + MTETesseractTerminal generator) { if (player == null) { return false; } UUID playerIdentifier = player.getUniqueID(); if (playerIdentifier != null) { Logger.WARNING("Setting Terminal on " + freq + " for " + player.getDisplayName() + "."); - Map playerOwned = sTesseractTerminalOwnershipMap - .get(playerIdentifier); + Map playerOwned = sTesseractTerminalOwnershipMap.get(playerIdentifier); if (playerOwned == null || playerOwned.isEmpty()) { - Map newOwnershipMap = new HashMap<>(); + Map newOwnershipMap = new HashMap<>(); newOwnershipMap.put(freq, generator); sTesseractTerminalOwnershipMap.put(playerIdentifier, newOwnershipMap); Logger.WARNING("Success! [Empty Map]"); return true; } else if (sTesseractTerminalOwnershipMap.containsKey(playerIdentifier)) { - Map ownershipMap = sTesseractTerminalOwnershipMap - .get(playerIdentifier); + Map ownershipMap = sTesseractTerminalOwnershipMap.get(playerIdentifier); if (!ownershipMap.containsKey(freq)) { ownershipMap.put(freq, generator); } @@ -183,16 +178,16 @@ public class TesseractHelper { } // Gets Terminal based on Frequency. - public static final GT_MetaTileEntity_TesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) { + public static final MTETesseractTerminal getTerminalByFrequency(EntityPlayer player, int freq) { if (player == null) { return null; } UUID playerIdentifier = player.getUniqueID(); Logger.WARNING("Getting Terminal on " + freq + " for " + player.getDisplayName() + "."); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { - Map generators = getTerminalOwnershipByPlayer(player); - Set> players = generators.entrySet(); - for (Entry current : players) { + Map generators = getTerminalOwnershipByPlayer(player); + Set> players = generators.entrySet(); + for (Entry current : players) { if (current.getKey() .equals(freq)) { Logger.WARNING("Success!"); @@ -223,13 +218,11 @@ public class TesseractHelper { * Internal Methods * */ - private static Map getGeneratorOwnershipByPlayer( - EntityPlayer player) { + private static Map getGeneratorOwnershipByPlayer(EntityPlayer player) { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractGeneratorOwnershipMap.isEmpty() && playerIdentifier != null) { - Set>> players = sTesseractGeneratorOwnershipMap - .entrySet(); - for (Entry> current : players) { + Set>> players = sTesseractGeneratorOwnershipMap.entrySet(); + for (Entry> current : players) { if (current.getKey() .compareTo(playerIdentifier) == 0) { return current.getValue(); @@ -239,12 +232,11 @@ public class TesseractHelper { return null; } - private static Map getTerminalOwnershipByPlayer(EntityPlayer player) { + private static Map getTerminalOwnershipByPlayer(EntityPlayer player) { UUID playerIdentifier = player.getUniqueID(); if (!sTesseractTerminalOwnershipMap.isEmpty() && playerIdentifier != null) { - Set>> players = sTesseractTerminalOwnershipMap - .entrySet(); - for (Entry> current : players) { + Set>> players = sTesseractTerminalOwnershipMap.entrySet(); + for (Entry> current : players) { if (current.getKey() .compareTo(playerIdentifier) == 0) { return current.getValue(); -- cgit