diff options
Diffstat (limited to 'src/main')
366 files changed, 3459 insertions, 23222 deletions
diff --git a/src/main/java/gregtech/api/enums/TAE.java b/src/main/java/gregtech/api/enums/TAE.java index de4f9d6d77..73a18dc771 100644 --- a/src/main/java/gregtech/api/enums/TAE.java +++ b/src/main/java/gregtech/api/enums/TAE.java @@ -19,8 +19,8 @@ public class TAE { public static int gtPPLastUsedIndex = 64; public static int secondaryIndex = 0; - public static HashMap<Integer, GTPP_CopiedBlockTexture> mTAE = new HashMap<Integer, GTPP_CopiedBlockTexture>(); - private static final HashSet<Integer> mFreeSlots = new HashSet<Integer>(64); + public static HashMap<Integer, GTPP_CopiedBlockTexture> mTAE = new HashMap<>(); + private static final HashSet<Integer> mFreeSlots = new HashSet<>(64); static { for (int i = 64; i < 128; i++) { @@ -55,7 +55,7 @@ public class TAE { public static void finalizeTAE() { String aFreeSpaces = ""; String aPageAndSlotFree = ""; - AutoMap<Integer> aTemp = new AutoMap<Integer>(mFreeSlots); + AutoMap<Integer> aTemp = new AutoMap<>(mFreeSlots); for (int i = 0; i < mFreeSlots.size(); i++) { int j = aTemp.get(i); aFreeSpaces += j; diff --git a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java index 57e210a8f2..e6b754deb7 100644 --- a/src/main/java/gregtech/api/util/FishPondFakeRecipe.java +++ b/src/main/java/gregtech/api/util/FishPondFakeRecipe.java @@ -15,9 +15,9 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class FishPondFakeRecipe { - public static ArrayList<WeightedRandomFishable> fish = new ArrayList<WeightedRandomFishable>(); - public static ArrayList<WeightedRandomFishable> junk = new ArrayList<WeightedRandomFishable>(); - public static ArrayList<WeightedRandomFishable> treasure = new ArrayList<WeightedRandomFishable>(); + public static ArrayList<WeightedRandomFishable> fish = new ArrayList<>(); + public static ArrayList<WeightedRandomFishable> junk = new ArrayList<>(); + public static ArrayList<WeightedRandomFishable> treasure = new ArrayList<>(); @SuppressWarnings("unchecked") public static boolean generateFishPondRecipes() { @@ -32,16 +32,16 @@ public class FishPondFakeRecipe { e.printStackTrace(); } - AutoMap<ArrayList<WeightedRandomFishable>> mega = new AutoMap<ArrayList<WeightedRandomFishable>>(); + AutoMap<ArrayList<WeightedRandomFishable>> mega = new AutoMap<>(); mega.put(fish); mega.put(junk); mega.put(treasure); int mType = 14; for (ArrayList<WeightedRandomFishable> f : mega.values()) { - for (int e = 0; e < f.size(); e++) { - if (f.get(e) != null) { - WeightedRandomFishable u = f.get(e); + for (WeightedRandomFishable weightedRandomFishable : f) { + if (weightedRandomFishable != null) { + WeightedRandomFishable u = weightedRandomFishable; try { ItemStack t = (ItemStack) ReflectionUtils .getField(WeightedRandomFishable.class, "field_150711_b").get(u); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipe.java b/src/main/java/gregtech/api/util/GasSpargingRecipe.java index 55eb828e3e..9853b392be 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipe.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipe.java @@ -34,8 +34,7 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> { @Override public boolean equals(Object o) { - if (o instanceof GasSpargingRecipe) { - GasSpargingRecipe i = (GasSpargingRecipe) o; + if (o instanceof GasSpargingRecipe i) { if (this.mInputGas.equals(i.mInputGas) && this.mInputSpentFuel.equals(i.mInputSpentFuel)) { return true; } @@ -91,7 +90,7 @@ public class GasSpargingRecipe implements Comparable<GasSpargingRecipe> { } public String[] getRecipeInfo() { - AutoMap<String> result = new AutoMap<String>(); + AutoMap<String> result = new AutoMap<>(); result.put("Input " + ItemUtils.getArrayStackNames(mFluidInputs)); result.put("Output " + ItemUtils.getArrayStackNames(mFluidOutputs)); result.put("Duration: " + mDuration); diff --git a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java index 094ef5a08c..b078394f92 100644 --- a/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java +++ b/src/main/java/gregtech/api/util/GasSpargingRecipeMap.java @@ -8,7 +8,7 @@ import gtPlusPlus.api.objects.data.AutoMap; public class GasSpargingRecipeMap extends AutoMap<GasSpargingRecipe> { - public static final AutoMap<GasSpargingRecipe> mRecipes = new AutoMap<GasSpargingRecipe>(); + public static final AutoMap<GasSpargingRecipe> mRecipes = new AutoMap<>(); public static final String mUnlocalizedName = "gtpp.recipe.lftr.sparging"; public static final String mNEIName = mUnlocalizedName; public static final String mNEIDisplayName = "LFTR Gas Sparging"; diff --git a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java index 2a40cad100..c808a892dc 100644 --- a/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java +++ b/src/main/java/gregtech/api/util/SemiFluidFuelHandler.java @@ -57,7 +57,7 @@ public class SemiFluidFuelHandler { final FluidStack aCreosote = FluidUtils.getFluidStack("creosote", 1000); final FluidStack aHeavyFuel = FluidUtils.getFluidStack("liquid_heavy_fuel", 1000); final FluidStack aHeavyOil = FluidUtils.getFluidStack("liquid_heavy_oil", 1000); - final HashMap<Integer, Pair<FluidStack, Integer>> aFoundFluidsFromItems = new HashMap<Integer, Pair<FluidStack, Integer>>(); + final HashMap<Integer, Pair<FluidStack, Integer>> aFoundFluidsFromItems = new HashMap<>(); // Find Fluids From items for (final GT_Recipe r : gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDenseLiquidFuels.mRecipeList) { @@ -67,7 +67,7 @@ public class SemiFluidFuelHandler { for (ItemStack i : g.mInputs) { FluidStack f = FluidContainerRegistry.getFluidForFilledItem(i); if (f != null) { - Pair<FluidStack, Integer> aData = new Pair<FluidStack, Integer>(f, g.mSpecialValue); + Pair<FluidStack, Integer> aData = new Pair<>(f, g.mSpecialValue); aFoundFluidsFromItems.put(aData.hashCode(), aData); } } diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java index d5d8f9b6ab..b9a1ce86b8 100644 --- a/src/main/java/gtPlusPlus/GTplusplus.java +++ b/src/main/java/gtPlusPlus/GTplusplus.java @@ -7,7 +7,6 @@ import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.Collection; import java.util.HashMap; import net.minecraft.block.Block; @@ -26,32 +25,25 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppingEvent; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.Materials; import gregtech.api.util.FishPondFakeRecipe; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.SemiFluidFuelHandler; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; -import gtPlusPlus.core.commands.CommandDebugChunks; import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning; import gtPlusPlus.core.commands.CommandMath; import gtPlusPlus.core.common.CommonProxy; import gtPlusPlus.core.config.ConfigHandler; import gtPlusPlus.core.handler.BookHandler; -import gtPlusPlus.core.handler.MobMentality; import gtPlusPlus.core.handler.PacketHandler; import gtPlusPlus.core.handler.Recipes.RegistrationHandler; -import gtPlusPlus.core.handler.events.LoginEventHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.LocaleUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.nei.NEI_IMC_Sender; import gtPlusPlus.plugin.manager.Core_Manager; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; @@ -61,13 +53,11 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_BlastSmelterGT_GTNH; import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_MultisUsingFluidInsteadOfCells; import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; -@MCVersion(value = "1.7.10") @Mod( modid = Names.G_T_PLUS_PLUS, name = CORE.name, version = CORE.VERSION, dependencies = "required-after:Forge;" + " after:TConstruct;" - + " after:PlayerAPI;" + " after:dreamcraft;" + " after:IC2;" + " required-after:gregtech;" @@ -88,7 +78,7 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; + " required-after:gtnhlib@[0.0.10,);") public class GTplusplus implements ActionListener { - public static enum INIT_PHASE { + public enum INIT_PHASE { SUPER(null), PRE_INIT(SUPER), @@ -97,10 +87,10 @@ public class GTplusplus implements ActionListener { SERVER_START(POST_INIT), STARTED(SERVER_START); - protected boolean mIsPhaseActive = false; + private boolean mIsPhaseActive = false; private final INIT_PHASE mPrev; - private INIT_PHASE(INIT_PHASE aPreviousPhase) { + INIT_PHASE(INIT_PHASE aPreviousPhase) { mPrev = aPreviousPhase; } @@ -163,7 +153,6 @@ public class GTplusplus implements ActionListener { } // Give this a go mate. - // initAnalytics(); setupMaterialBlacklist(); // Handle GT++ Config @@ -171,17 +160,11 @@ public class GTplusplus implements ActionListener { // Check for Dev CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); - // Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY); - - Utils.registerEvent(new LoginEventHandler()); - Utils.registerEvent(new MobMentality()); - Logger.INFO("Login Handler Initialized"); proxy.preInit(event); Logger.INFO("Setting up our own GT_Proxy."); Meta_GT_Proxy.preInit(); Core_Manager.preInit(); - GTPP_ChunkManager.init(); } // Init @@ -239,7 +222,6 @@ public class GTplusplus implements ActionListener { INIT_PHASE.SERVER_START.setPhaseActive(true); event.registerServerCommand(new CommandMath()); event.registerServerCommand(new CommandEnableDebugWhileRunning()); - event.registerServerCommand(new CommandDebugChunks()); if (Thaumcraft.isModLoaded()) { event.registerServerCommand(new CommandDumpAspects()); } @@ -271,13 +253,10 @@ public class GTplusplus implements ActionListener { protected void generateGregtechRecipeMaps() { - int[] mValidCount = new int[] { 0, 0, 0 }; int[] mInvalidCount = new int[] { 0, 0, 0, 0, 0, 0, 0 }; - int[] mOriginalCount = new int[] { 0, 0, 0 }; RecipeGen_BlastSmelterGT_GTNH.generateGTNHBlastSmelterRecipesFromEBFList(); FishPondFakeRecipe.generateFishPondRecipes(); - // GregtechMiniRaFusion.generateSlowFusionrecipes(); SemiFluidFuelHandler.generateFuels(); mInvalidCount[0] = RecipeGen_MultisUsingFluidInsteadOfCells.generateRecipesNotUsingCells( @@ -303,22 +282,7 @@ public class GTplusplus implements ActionListener { GTPP_Recipe.GTPP_Recipe_Map.sNuclearSaltProcessingPlantRecipes); } - protected void dumpGtRecipeMap(final GT_Recipe_Map r) { - final Collection<GT_Recipe> x = r.mRecipeList; - Logger.INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug."); - for (final GT_Recipe newBo : x) { - Logger.INFO("========================"); - Logger.INFO("Dumping Input: " + ItemUtils.getArrayStackNames(newBo.mInputs)); - Logger.INFO("Dumping Inputs " + ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs)); - Logger.INFO("Dumping Duration: " + newBo.mDuration); - Logger.INFO("Dumping EU/t: " + newBo.mEUt); - Logger.INFO("Dumping Output: " + ItemUtils.getArrayStackNames(newBo.mOutputs)); - Logger.INFO("Dumping Output: " + ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs)); - Logger.INFO("========================"); - } - } - - private static final boolean setupMaterialBlacklist() { + private static void setupMaterialBlacklist() { Material.invalidMaterials.put(Materials._NULL); Material.invalidMaterials.put(Materials.Clay); Material.invalidMaterials.put(Materials.Phosphorus); @@ -339,14 +303,10 @@ public class GTplusplus implements ActionListener { Material.invalidMaterials.put(Materials.Soularium); Material.invalidMaterials.put(Materials.PhasedIron); - if (Material.invalidMaterials.size() > 0) { - return true; - } - return false; } - private static final HashMap<String, Item> sMissingItemMappings = new HashMap<String, Item>(); - private static final HashMap<String, Block> sMissingBlockMappings = new HashMap<String, Block>(); + private static final HashMap<String, Item> sMissingItemMappings = new HashMap<>(); + private static final HashMap<String, Block> sMissingBlockMappings = new HashMap<>(); private static void processMissingMappings() { sMissingItemMappings.put("miscutils:Ammonium", GameRegistry.findItem(GTPlusPlus.ID, "itemCellAmmonium")); @@ -417,16 +377,14 @@ public class GTplusplus implements ActionListener { Item aReplacement = sMissingItemMappings.get(mapping.name); if (aReplacement != null) { remap(aReplacement, mapping); - } else { - // Logger.INFO("Unable to remap: "+mapping.name+", item has no replacement mapping."); } + } else if (mapping.type == GameRegistry.Type.BLOCK) { Block aReplacement = sMissingBlockMappings.get(mapping.name); if (aReplacement != null) { remap(aReplacement, mapping); - } else { - // Logger.INFO("Unable to remap: "+mapping.name+", block has no replacement mapping."); } + } } } diff --git a/src/main/java/gtPlusPlus/GenerateDictionaries.java b/src/main/java/gtPlusPlus/GenerateDictionaries.java deleted file mode 100644 index 6313a07c87..0000000000 --- a/src/main/java/gtPlusPlus/GenerateDictionaries.java +++ /dev/null @@ -1,167 +0,0 @@ -package gtPlusPlus; - -import java.io.File; -import java.io.IOException; -import java.nio.charset.Charset; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import gregtech.api.objects.XSTR; - -public class GenerateDictionaries { - - public static void main(String[] args) { - - File aMainDictionary = new File("proguard/DictionaryMain.txt"); - File aMethodDict = new File("proguard/method-dict.txt"); - File aClassDict = new File("proguard/class-dict.txt"); - - if (Utils.doesFileExist(aMainDictionary)) { - Utils.log("Found Main Dictionary"); - List<String> aLines = Utils.readLines(aMainDictionary); - - ArrayList<String> aLinesToWriteMethods = new ArrayList<String>(); - ArrayList<String> aLinesToWriteClasses = new ArrayList<String>(); - - if (aLines != null && aLines.size() > 0) { - Utils.log("Main Dictionary has > 0 keywords (" + aLines.size() + ")"); - HashSet<Integer> aUsedIndicies = new HashSet<Integer>(); - int aCount = aLines.size() / 5; - - Utils.log("Mapping " + aCount + " to each dict."); - // Map New Method Names - for (int i = 0; aLinesToWriteMethods.size() < aCount; i++) { - Integer aIndex = Utils.randInt(0, aLines.size() - 1); - if (!aUsedIndicies.contains(aIndex)) { - String aLineAtIndex = aLines.get(aIndex); - if (aLineAtIndex != null && aLineAtIndex.length() > 0) { - aLinesToWriteMethods.add(aLineAtIndex); - aUsedIndicies.add(aIndex); - } - } - if (i >= aCount * 5) { - break; - } - } - - // Map New Class Names - for (int i = 0; aLinesToWriteClasses.size() < aCount; i++) { - Integer aIndex = Utils.randInt(0, aLines.size() - 1); - if (!aUsedIndicies.contains(aIndex)) { - String aLineAtIndex = aLines.get(aIndex); - if (aLineAtIndex != null && aLineAtIndex.length() > 0) { - aLinesToWriteClasses.add(aLineAtIndex); - aUsedIndicies.add(aIndex); - } - } - if (i >= aCount * 5) { - break; - } - } - } - - // Remove old generated Dicts - if (Utils.doesFileExist(aMethodDict)) { - aMethodDict.delete(); - Utils.log("Removed old Method-Dict"); - } - if (Utils.doesFileExist(aClassDict)) { - aClassDict.delete(); - Utils.log("Removed old Class-Dict"); - } - - // Create new empty dict files - if (!Utils.doesFileExist(aMethodDict)) { - Utils.createFile(aMethodDict); - } - if (!Utils.doesFileExist(aClassDict)) { - Utils.createFile(aClassDict); - } - - Utils.log("Writing new Dictionaries."); - // Write - Utils.appendListToFile(aMethodDict, aLinesToWriteMethods); - Utils.appendListToFile(aClassDict, aLinesToWriteClasses); - - Utils.log("Finished all generation of new Dictionaries."); - } - } - - private static final class Utils { - - private static final Charset utf8 = StandardCharsets.UTF_8; - - private static final void log(String s) { - System.out.println("[GTPP-Proguard] " + s); - } - - public static int randInt(final int min, final int max) { - return XSTR.XSTR_INSTANCE.nextInt((max - min) + 1) + min; - } - - public static boolean doesFileExist(File f) { - if (f != null && f.exists() && !f.isDirectory()) { - return true; - } - return false; - } - - public static File createFile(File aFile) { - boolean blnCreated = false; - log("Trying to use relative path " + aFile.getPath()); - try { - // log("Trying to use path "+aFile.getCanonicalPath()); - // log("Trying to use absolute path "+aFile.getAbsolutePath()); - blnCreated = aFile.createNewFile(); - } catch (IOException ioe) { - log("Error while creating a new empty file :" + ioe); - return null; - } - return blnCreated ? aFile : null; - } - - public static boolean appendListToFile(File file, List<String> content) { - try { - long oldSize; - long newSize; - if (doesFileExist(file)) { - Path p = Paths.get(file.getPath()); - if (p != null && Files.isWritable(p)) { - oldSize = Files.size(p); - try { - Files.write(p, content, utf8, StandardOpenOption.APPEND); - } catch (IOException e) { - e.printStackTrace(); - } - newSize = Files.size(p); - return newSize > oldSize; - } - } - } catch (IOException e) {} - return false; - } - - /** - * Reads the contents of a file line by line to a List of Strings using the default encoding for the VM. The - * file is always closed. - * - * @param file the file to read, must not be {@code null} - * @return the list of Strings representing each line in the file, never {@code null} - * @throws IOException in case of an I/O error - * @since 1.3 - */ - public static List<String> readLines(File file) { - try { - return org.apache.commons.io.FileUtils.readLines(file, utf8); - } catch (IOException e) { - return new ArrayList<String>(); - } - } - } -} diff --git a/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java index 97c734659d..f059ef8a5f 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java +++ b/src/main/java/gtPlusPlus/api/interfaces/ITileTooltip.java @@ -2,5 +2,5 @@ package gtPlusPlus.api.interfaces; public interface ITileTooltip { - public abstract int getTooltipID(); + int getTooltipID(); } diff --git a/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java index c9415f6155..f00287404b 100644 --- a/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java +++ b/src/main/java/gtPlusPlus/api/interfaces/RunnableWithInfo.java @@ -2,9 +2,6 @@ package gtPlusPlus.api.interfaces; public interface RunnableWithInfo<V> extends Runnable { - public V getInfoData(); + V getInfoData(); - public default Class<?> getInfoDataType() { - return getInfoData().getClass(); - } } diff --git a/src/main/java/gtPlusPlus/api/objects/Logger.java b/src/main/java/gtPlusPlus/api/objects/Logger.java index 9b6591abd2..0178bb141a 100644 --- a/src/main/java/gtPlusPlus/api/objects/Logger.java +++ b/src/main/java/gtPlusPlus/api/objects/Logger.java @@ -10,7 +10,7 @@ import gtPlusPlus.preloader.asm.AsmConfig; public class Logger { - public Logger(String string) {} + public Logger() {} // Logging Functions public static final org.apache.logging.log4j.Logger modLogger = Logger.makeLogger(); diff --git a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java index f4b2550b5a..aedd6c6073 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/AutoMap.java @@ -27,7 +27,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect private static final long serialVersionUID = 3771412318075131790L; public AutoMap() { - this(new LinkedHashMap<Integer, V>()); + this(new LinkedHashMap<>()); } public Map<Integer, V> getMap() { @@ -36,7 +36,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect public AutoMap(Map<Integer, V> defaultMapType) { mInternalMap = defaultMapType; - mInternalNameMap = new LinkedHashMap<String, Integer>(); + mInternalNameMap = new LinkedHashMap<>(); } /** @@ -45,8 +45,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(List<V> aList) { - mInternalMap = new LinkedHashMap<Integer, V>(); - mInternalNameMap = new LinkedHashMap<String, Integer>(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -60,8 +60,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(Set<V> aList) { - mInternalMap = new LinkedHashMap<Integer, V>(); - mInternalNameMap = new LinkedHashMap<String, Integer>(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -75,8 +75,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect * @param aList - Data to be inserted into the AutoMap. */ public AutoMap(Collection<V> aList) { - mInternalMap = new LinkedHashMap<Integer, V>(); - mInternalNameMap = new LinkedHashMap<String, Integer>(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aList != null && aList.size() > 0) { for (V obj : aList) { add(obj); @@ -90,8 +90,8 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect * @param aArray - Data to be inserted into the AutoMap. */ public AutoMap(V[] aArray) { - mInternalMap = new LinkedHashMap<Integer, V>(); - mInternalNameMap = new LinkedHashMap<String, Integer>(); + mInternalMap = new LinkedHashMap<>(); + mInternalNameMap = new LinkedHashMap<>(); if (aArray != null && aArray.length > 0) { for (V obj : aArray) { add(obj); @@ -244,7 +244,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect @Override public boolean retainAll(Collection<?> c) { - AutoMap<?> aTempAllocation = new AutoMap<Object>(); + AutoMap<?> aTempAllocation = new AutoMap<>(); boolean aTrue = false; aTempAllocation = this; aTempAllocation.removeAll(c); @@ -346,7 +346,7 @@ public class AutoMap<V> implements Iterable<V>, Cloneable, Serializable, Collect @Override public List<V> subList(int fromIndex, int toIndex) { - AutoMap<V> aNewSubList = new AutoMap<V>(); + AutoMap<V> aNewSubList = new AutoMap<>(); for (int slot = fromIndex; slot <= toIndex; slot++) { V obj = mInternalMap.get(slot); if (obj == null) { diff --git a/src/main/java/gtPlusPlus/api/objects/data/Quad.java b/src/main/java/gtPlusPlus/api/objects/data/Quad.java index 54839ac930..a2597061e0 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/Quad.java +++ b/src/main/java/gtPlusPlus/api/objects/data/Quad.java @@ -34,7 +34,7 @@ public class Quad<K, V, C, R> { } public final List values() { - List<Object> aVals = new ArrayList<Object>(); + List<Object> aVals = new ArrayList<>(); aVals.add(key); aVals.add(value); aVals.add(value2); diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index e4b4e0db88..ea12972af4 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java @@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger; public class TypeCounter<V> implements Set<V> { - private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<String, InternalTypeCounterObject<V>>(); + private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>(); private String mHighestValueKey; private int mHighestValue = 0; private final Class mClass; @@ -55,7 +55,7 @@ public class TypeCounter<V> implements Set<V> { String aKey = aKeyName != null ? aKeyName : arg0.toString(); InternalTypeCounterObject<V> aValue = mInternalMap.get(aKey); if (aValue == null) { - aValue = new InternalTypeCounterObject<V>((V) arg0); + aValue = new InternalTypeCounterObject<>((V) arg0); Logger.WARNING("Adding new key to map: " + aKey); } aValue.add(); @@ -152,7 +152,7 @@ public class TypeCounter<V> implements Set<V> { for (String k : this.mInternalMap.keySet()) { if (k != null) { InternalTypeCounterObject<V> aVal = this.mInternalMap.get(k); - aArray[aPos++] = new Pair<String, InternalTypeCounterObject<V>>(k, aVal); + aArray[aPos++] = new Pair<>(k, aVal); } } return aArray; diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index 9d9201066b..ae1f28f0c9 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -11,7 +11,7 @@ import gregtech.api.objects.XSTR; public class WeightedCollection<E> implements Map<Integer, E> { - private NavigableMap<Integer, E> map = new TreeMap<Integer, E>(); + private NavigableMap<Integer, E> map = new TreeMap<>(); private Random random; private int total = 0; diff --git a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java index c9176c00c5..199d20e06a 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java +++ b/src/main/java/gtPlusPlus/api/objects/data/weakref/WeakAutoMap.java @@ -9,6 +9,6 @@ public class WeakAutoMap<T> extends AutoMap<T> { private static final long serialVersionUID = 8328345351801363386L; public WeakAutoMap() { - super(new WeakHashMap<Integer, T>()); + super(new WeakHashMap<>()); } } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index cd6edf5411..686c0e7667 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -87,10 +87,9 @@ public class BlockPos implements Serializable { if (other == this) { return true; } - if (!(other instanceof BlockPos)) { + if (!(other instanceof BlockPos otherPoint)) { return false; } - BlockPos otherPoint = (BlockPos) other; return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos && this.zPos == otherPoint.zPos && this.dim == otherPoint.dim; @@ -153,7 +152,7 @@ public class BlockPos implements Serializable { } public AutoMap<BlockPos> getSurroundingBlocks() { - AutoMap<BlockPos> sides = new AutoMap<BlockPos>(); + AutoMap<BlockPos> sides = new AutoMap<>(); sides.put(getUp()); sides.put(getDown()); sides.put(getXPos()); @@ -219,7 +218,7 @@ public class BlockPos implements Serializable { * @return - Does this block have a neighbour that is the same? */ public AutoMap<BlockPos> getSimilarNeighbour(boolean strict) { - AutoMap<BlockPos> sides = new AutoMap<BlockPos>(); + AutoMap<BlockPos> sides = new AutoMap<>(); for (BlockPos g : getSurroundingBlocks().values()) { if (getBlockAtPos(g) == getBlockAtPos()) { if (!strict) { @@ -237,7 +236,7 @@ public class BlockPos implements Serializable { public Set<BlockPos> getValidNeighboursAndSelf() { AutoMap<BlockPos> h = getSimilarNeighbour(true); h.put(this); - Set<BlockPos> result = new HashSet<BlockPos>(); + Set<BlockPos> result = new HashSet<>(); for (BlockPos f : h.values()) { result.add(f); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index 6fe2f9ddb5..d68ef1a93f 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -33,7 +33,7 @@ public abstract class ItemPackage implements RunnableWithInfo<String> { public abstract boolean generateRecipes(); - private final void init() { + private void init() { items(); blocks(); fluids(); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java index 84f5fe5fba..58a7affa90 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java @@ -18,18 +18,18 @@ import gtPlusPlus.core.util.Utils; public class SafeTexture implements Runnable { @SideOnly(Side.CLIENT) - private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<Integer, IIcon>(); + private static final HashMap<Integer, IIcon> mHashToIconCache = new HashMap<>(); @SideOnly(Side.CLIENT) - private static final HashMap<String, Integer> mPathToHashCash = new HashMap<String, Integer>(); + private static final HashMap<String, Integer> mPathToHashCash = new HashMap<>(); - private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<String, SafeTexture>(); + private static final HashMap<String, SafeTexture> mTextureObjectCache = new HashMap<>(); private final int mHash; private final String mTextureName; - private static final String getKey(String aTexPath) { + private static String getKey(String aTexPath) { String aNameKey = Utils.sanitizeString(aTexPath); aNameKey = aNameKey.replace('/', ' '); aNameKey = aNameKey.toLowerCase(); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index 12916af64b..db9599e130 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -72,15 +72,10 @@ public class ShapedRecipe { + " has incorrect number of inputs. Size: " + aInputs.length + "."); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(1)); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(2)); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(3)); - // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(4)); - // Logger.RECIPE("Reciped exists at location: "+ReflectionUtils.getMethodName(1)); } // Build a Pair for each slot - AutoMap<Pair<Character, Object>> aRecipePairs = new AutoMap<Pair<Character, Object>>(); + AutoMap<Pair<Character, Object>> aRecipePairs = new AutoMap<>(); int aCharSlot = 0; int aMemSlot = 0; int aInfoSlot = 0; @@ -95,7 +90,7 @@ public class ShapedRecipe { } mInfo = ((ItemStack) stack).getDisplayName(); } - aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack)); + aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( "Storing '" + CHARS.charAt(aCharSlot) + "' with an object of type " @@ -106,7 +101,7 @@ public class ShapedRecipe { aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; } else { - aRecipePairs.put(new Pair<Character, Object>(' ', (ItemStack) null)); + aRecipePairs.put(new Pair<>(' ', (ItemStack) null)); Logger.RECIPE("Storing ' ' with an object of type null"); aChar[aMemSlot++] = ' '; aLoggingInfo[aInfoSlot++] = "Empty"; @@ -158,7 +153,7 @@ public class ShapedRecipe { } mInfo = ((ItemStack) stack).getDisplayName(); } - aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack)); + aRecipePairs.put(new Pair<>(CHARS.charAt(aCharSlot), stack)); Logger.RECIPE( "Registering Pair of '" + CHARS.charAt(aCharSlot) + "' and a " diff --git a/src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java b/src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java deleted file mode 100644 index 0822ec31a2..0000000000 --- a/src/main/java/gtPlusPlus/api/plugin/Sample_Plugin.java +++ /dev/null @@ -1,46 +0,0 @@ -package gtPlusPlus.api.plugin; - -import gtPlusPlus.api.interfaces.IPlugin; -import gtPlusPlus.plugin.manager.Core_Manager; - -public final class Sample_Plugin implements IPlugin { - - public Sample_Plugin() { - Core_Manager.registerPlugin(this); // This must be called, else it won't load. - } - - @Override - public boolean preInit() { - return true; - } - - @Override - public boolean init() { - return true; - } - - @Override - public boolean postInit() { - return true; - } - - @Override - public boolean serverStart() { - return true; - } - - @Override - public boolean serverStop() { - return true; - } - - @Override - public String getPluginName() { - return "Sample Plugin"; - } - - @Override - public String getPluginAbbreviation() { - return "Test"; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 5058ac51cd..634a073b02 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -16,14 +16,12 @@ import gtPlusPlus.core.block.machine.FishTrap; import gtPlusPlus.core.block.machine.Machine_PestKiller; import gtPlusPlus.core.block.machine.Machine_PooCollector; import gtPlusPlus.core.block.machine.Machine_ProjectTable; -import gtPlusPlus.core.block.machine.Machine_RoundRobinator; import gtPlusPlus.core.block.machine.Machine_SuperJukebox; import gtPlusPlus.core.block.machine.VolumetricFlaskSetter; import gtPlusPlus.core.fluids.FluidRegistryHandler; public final class ModBlocks { - public static Block blockRoundRobinator; public static Block blockCircuitProgrammer; public static Block blockVolumetricFlaskSetter; @@ -100,8 +98,6 @@ public final class ModBlocks { blockPestKiller = new Machine_PestKiller(); - blockRoundRobinator = new Machine_RoundRobinator(); - blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 72e3b24124..006314b2db 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -14,14 +14,6 @@ import gtPlusPlus.core.util.Utils; public class BasicBlock extends BlockContainer { - public BasicBlock(final String unlocalizedName, final Material material) { - this(BlockTypes.STANDARD, unlocalizedName, material, 2); - } - - public BasicBlock(final BlockTypes type, final String unlocalizedName, final Material material) { - this(type, unlocalizedName, material, 2); - } - public BasicBlock(BlockTypes type, final String unlocalizedName, final Material material, final int harvestLevel) { super(material); this.setBlockName(Utils.sanitizeString(unlocalizedName)); @@ -44,11 +36,11 @@ public class BasicBlock extends BlockContainer { FRAME("blockFrameGt", "wrench", soundTypeMetal), ORE("blockStone", "pickaxe", soundTypeStone); - private String TEXTURE_NAME; - private String HARVEST_TOOL; - private SoundType soundOfBlock; + private final String TEXTURE_NAME; + private final String HARVEST_TOOL; + private final SoundType soundOfBlock; - private BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { + BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { this.TEXTURE_NAME = textureName; this.HARVEST_TOOL = harvestTool; this.soundOfBlock = blockSound; @@ -62,9 +54,6 @@ public class BasicBlock extends BlockContainer { return this.HARVEST_TOOL; } - public SoundType getBlockSoundType() { - return this.soundOfBlock; - } } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index 7f0a504a79..c4e8b191d0 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -51,8 +51,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * Does this block have any meta at all? - * - * @return */ public final boolean hasMeta() { return getMetaCount() > 0; @@ -60,8 +58,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The amount of meta this block has. - * - * @return */ public abstract int getMetaCount(); @@ -82,15 +78,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement public abstract String getUnlocalBlockName(); /** - * Does this Block have {@link ITileTooltip} support? - * - * @return {@link boolean} that represents if this block supports {@link ITileTooltip} or not. - */ - public final boolean hasTooltip() { - return getTooltipID() >= -1; - } - - /** * Lazy Boilerplating. * * @return Block Hardness. @@ -114,8 +101,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in * {@link #getItemBlockClass}(). - * - * @return */ @Override public abstract int getTooltipID(); @@ -138,8 +123,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The name of the Tile Entity. - * - * @return */ protected abstract String getTileEntityName(); @@ -148,7 +131,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement * * @return Sanitized {@link String}, containing no spaces or illegal characters. */ - private final String getTileEntityNameForTexturePathing() { + private String getTileEntityNameForTexturePathing() { return Utils.sanitizeString(getTileEntityName().replace(" ", "")); } @@ -156,8 +139,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement * An array of CubicObjects, one for each meta, else just a single cell array. Expected to be null regularly, as the * default texture handling should suffice. Handy if re-using textures or using a non-standard structure for them. * FULL texture path must be used, inclusive of the MODID and a colon. - * - * @return */ public CubicObject<String>[] getCustomTextureDirectoryObject() { return null; @@ -175,7 +156,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement } @SideOnly(Side.CLIENT) - private final void handleTextures() { + private void handleTextures() { Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + "."); @@ -188,7 +169,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Default Path Name, this will make us look inside 'miscutils\textures\blocks' final String aPrefixTexPath = GTPlusPlus.ID + ":"; - // Default Path Name, this will make us look in the sub-directory for this Tile Entity. + // Default Path Name, this will make us look in the subdirectory for this Tile Entity. final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() + CORE.SEPERATOR; @@ -241,7 +222,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement aStringLeft = aTexPathBuilt + aStringLeft; aStringRight = aTexPathBuilt + aStringRight; // Convenience Blob - CubicObject<String> aMetaBlob = new CubicObject<String>( + CubicObject<String> aMetaBlob = new CubicObject<>( aStringBot, aStringTop, aStringBack, @@ -269,7 +250,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Store them in an Array SafeTexture[] aInjectBlob = new SafeTexture[] { aBottom, aTop, aBack, aFont, aWest, aEast }; // Convenience Blob - CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<SafeTexture>(aInjectBlob); + CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<>(aInjectBlob); // Store this Blob into mSidedTextureArray.put(aMetaBlob2); Logger.INFO("[TeTexture] Added SafeTexture data to map for meta " + (aIndex++)); @@ -323,8 +304,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement */ @Override public int getDamageValue(World aWorld, int aX, int aY, int aZ) { - int l = aWorld.getBlockMetadata(aX, aY, aZ); - return l; + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -334,7 +314,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList<ItemStack> drops = new ArrayList<ItemStack>(); + ArrayList<ItemStack> drops = new ArrayList<>(); drops.add(ItemUtils.simpleMetaStack(this, metadata, 1)); return drops; } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index e992d01d60..0f6f5947e8 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -28,7 +28,7 @@ import gtPlusPlus.core.util.Utils; public class BlockBaseFluid extends BlockFluidClassic { private final String name; - private final IIcon textureArray[] = new IIcon[6]; + private final IIcon[] textureArray = new IIcon[6]; protected float particleRed = 1.0F; protected float particleGreen = 1.0F; @@ -43,18 +43,6 @@ public class BlockBaseFluid extends BlockFluidClassic { GameRegistry.registerBlock(this, ItemBlockMeta.class, "fluid" + this.name); } - public BlockFluidClassic setParticleColor(int arg0) { - return this - .setParticleColor((arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F, (arg0 >> 0 & 255) / 255.0F); - } - - public BlockFluidClassic setParticleColor(float arg0, float arg1, float arg2) { - this.particleRed = arg0; - this.particleGreen = arg1; - this.particleBlue = arg2; - return this; - } - @Override public boolean canCreatureSpawn(EnumCreatureType arg0, IBlockAccess arg1, int arg2, int arg3, int arg4) { return false; @@ -72,11 +60,9 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); - this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); - // IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0); - // IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0); + public void registerBlockIcons(IIconRegister icon) { + this.textureArray[0] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); + this.textureArray[1] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index f0ecd6def9..81c14bb16c 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -36,7 +36,7 @@ public class BlockBaseModular extends BasicBlock { protected String thisBlockMaterialTranslatedName; protected final String thisBlockType; - private static HashMap<String, Block> sBlockCache = new HashMap<String, Block>(); + private static final HashMap<String, Block> sBlockCache = new HashMap<>(); public static Block getMaterialBlock(Material aMaterial, BlockTypes aType) { return sBlockCache.get(aMaterial.getUnlocalizedName() + "." + aType.name()); @@ -56,11 +56,9 @@ public class BlockBaseModular extends BasicBlock { Math.min(Math.max(material.vTier, 1), 6)); blockMaterial = material; registerComponent(); - if (material != null) { - sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); - thisBlockMaterialTranslatedName = material.getTranslatedName(); - GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); - } + sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); + thisBlockMaterialTranslatedName = material.getTranslatedName(); + GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); } protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString, @@ -75,8 +73,6 @@ public class BlockBaseModular extends BasicBlock { this.thisBlockType = blockType.name().toUpperCase(); this.setBlockName(this.getUnlocalizedProperName()); int fx = getBlockTypeMeta(); - // ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), - // GetProperName()); GameRegistry.registerBlock( this, ItemBlockGtBlock.class, @@ -97,17 +93,17 @@ public class BlockBaseModular extends BasicBlock { return rawMaterName.replace(" ", "").replace("-", "").replace("_", ""); } - public boolean registerComponent() { + public void registerComponent() { Logger.MATERIALS("Attempting to register " + this.getUnlocalizedName() + "."); if (this.blockMaterial == null) { Logger.MATERIALS("Tried to register " + this.getUnlocalizedName() + " but the material was null."); - return false; + return; } String aName = blockMaterial.getUnlocalizedName(); // Register Component Map<String, ItemStack> aMap = Material.mComponentMap.get(aName); if (aMap == null) { - aMap = new HashMap<String, ItemStack>(); + aMap = new HashMap<>(); } int fx = getBlockTypeMeta(); String aKey = (fx == 0 ? OrePrefixes.block.name() @@ -117,11 +113,9 @@ public class BlockBaseModular extends BasicBlock { aMap.put(aKey, ItemUtils.getSimpleStack(this)); Logger.MATERIALS("Registering a material component. Item: [" + aName + "] Map: [" + aKey + "]"); Material.mComponentMap.put(aName, aMap); - return true; } else { // Bad Logger.MATERIALS("Tried to double register a material component."); - return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 208838859b..91b49cb7a3 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -30,7 +30,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { private final Material blockMaterial; - public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) { + public BlockBaseOre(final Material material, final BlockTypes blockType) { super( blockType, Utils.sanitizeString(material.getUnlocalizedName()), diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index f62fc50a69..ceb9b5500b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -27,8 +27,6 @@ public class BlockSuperLight extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - // propecia (Inhibit DHD - recover hair get depression) - public BlockSuperLight() { super(Material.circuits); this.setBlockName("blockSuperLight"); @@ -65,8 +63,6 @@ public class BlockSuperLight extends BlockContainer { private long mLastUpdateTick = 0; - private int mLitBlockCount = 0; - private int[][][][] aLitBlocks = new int[50][10][50][1]; private boolean mPowered = false; @@ -128,7 +124,7 @@ public class BlockSuperLight extends BlockContainer { updateLighting(powered); } } - } catch (Throwable t) {} + } catch (Throwable ignored) {} } @Override @@ -145,13 +141,9 @@ public class BlockSuperLight extends BlockContainer { mLastUpdateTick = System.currentTimeMillis(); - if (false) { - return; - } - aLitBlocks = new int[50][10][50][1]; int aLitCounter = 0; - AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<BlockPos>(); + AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<>(); Logger.INFO("Trying to relight area."); BlockPos aStartIterationPoint = new BlockPos( @@ -167,7 +159,7 @@ public class BlockSuperLight extends BlockContainer { int zOff = aStartIterationPoint.zPos + z; Block aBlockGet = this.worldObj.getBlock(xOff, yOff, zOff); if (aBlockGet != null) { - if (aBlockGet instanceof BlockAir || aBlockGet instanceof LightGlass) { + if (aBlockGet instanceof BlockAir) { int aLight = aBlockGet.getLightValue(); @@ -178,15 +170,8 @@ public class BlockSuperLight extends BlockContainer { // Turning Lights on else if (enable && aLight == 0) { aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); - if (aBlockGet instanceof BlockAir) { - this.worldObj.setBlock( - xOff, - yOff, - zOff, - ModBlocks.MatterFabricatorEffectBlock, - 0, - 3); - } + this.worldObj + .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); aLitCounter++; } // Turning Lights off @@ -196,7 +181,6 @@ public class BlockSuperLight extends BlockContainer { Logger.INFO("Dimmed air."); this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3); } - // aBlockGet.setLightLevel(0); } aLitBlocks[x][y][z][0] = enable ? 15 : 0; } else { @@ -208,18 +192,6 @@ public class BlockSuperLight extends BlockContainer { } } } - mLitBlockCount = aLitCounter; - doLargeBlockUpdate(aBlocksToUpdate); - } - - public void doLargeBlockUpdate(AutoMap<BlockPos> aUpdateMap) { - if (aUpdateMap.isEmpty()) { - return; - } - for (BlockPos p : aUpdateMap) { - // this.worldObj.markBlockForUpdate(p.xPos, p.yPos, p.zPos); - // this.worldObj.markBlocksDirtyVertical(p_72975_1_, p_72975_2_, p_72975_3_, p_72975_4_); - } } } } diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index 6254201261..a2773e646c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -157,8 +157,7 @@ public class MiningExplosives extends BlockTNT { @Override public void onEntityCollidedWithBlock(final World world, final int x, final int y, final int z, final Entity entityTriggering) { - if ((entityTriggering instanceof EntityArrow) && !world.isRemote) { - final EntityArrow entityarrow = (EntityArrow) entityTriggering; + if ((entityTriggering instanceof final EntityArrow entityarrow) && !world.isRemote) { if (entityarrow.isBurning()) { this.func_150114_a( diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 1956d98a39..fa7372090c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -37,10 +37,6 @@ public class BlockWitherProof extends Block { GameRegistry.registerBlock(this, Utils.sanitizeString("blockBlackGate")); } - public String GetProperName() { - return "Wither Cage"; - } - @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 0fc3b5b666..95dca7163e 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -147,7 +147,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" }; - CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; + CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java deleted file mode 100644 index d7c383cc6e..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java +++ /dev/null @@ -1,128 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.CubicObject; -import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; - -public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { - - public Machine_RoundRobinator() { - super(Material.iron); - } - - /** - * Called upon block activation (right click on the block.) - */ - @Override - public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, - final int ordinalSide, final float lx, final float ly, final float lz) { - if (world.isRemote) { - return true; - } else { - final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - boolean mDidScrewDriver = false; - // Check For Screwdriver - try { - final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); - if (ItemUtils.isToolScrewdriver(mHandStack)) { - final TileEntityRoundRobinator tile = (TileEntityRoundRobinator) world.getTileEntity(x, y, z); - if (tile != null) { - mDidScrewDriver = tile.onScrewdriverRightClick(side, player, x, y, z); - } - } - } catch (final Throwable t) {} - - if (!mDidScrewDriver) { - final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntityRoundRobinator)) { - return ((TileEntityRoundRobinator) te).onRightClick(side, player, x, y, z); - } - return false; - } else { - return true; - } - } - } - - @Override - public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileEntityRoundRobinator(); - } - - @Override - public int getMetaCount() { - return 5; - } - - @Override - public String getUnlocalBlockName() { - return "blockRoundRobinator"; - } - - @Override - protected float initBlockHardness() { - return 1; - } - - @Override - protected float initBlockResistance() { - return 1; - } - - @Override - protected CreativeTabs initCreativeTab() { - return AddToCreativeTab.tabMachines; - } - - @Override - public int getTooltipID() { - return -1; - } - - @Override - protected String getTileEntityName() { - return "Round Robinator"; - } - - @Override - public Class<? extends ItemBlock> getItemBlockClass() { - return ItemBlockRoundRobinator.class; - } - - @Override - public CubicObject<String>[] getCustomTextureDirectoryObject() { - AutoMap<String[]> aTemp = new AutoMap<String[]>(); - for (int i = 0; i < 5; i++) { - String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, }; - aTemp.put(aTexData); - } - AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>(); - for (String[] y : aTemp) { - aTemp2.put(new CubicObject<String>(y)); - } - CubicObject<String>[] aTextureData = new CubicObject[] { aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), - aTemp2.get(3), aTemp2.get(4) }; - return aTextureData; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java index 52ddb7cc10..755636b4d3 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java @@ -109,9 +109,6 @@ public class Machine_SuperJukebox extends BlockJukebox { if (itemstack != null) { aWorld.playAuxSFX(1005, aX, aY, aZ, Item.getIdFromItem(itemstack.getItem())); - // aWorld.playRecord((String) null, aX, aY, aZ); - // tileentityjukebox.func_145857_a((ItemStack) null); - // aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 0, 2); /* * float f = 0.7F; double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; * double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D; double d2 @@ -295,7 +292,7 @@ public class Machine_SuperJukebox extends BlockJukebox { // Determine which record to play public boolean selectRecordToPlayFromInventoryAndSetViaVanillaHandler() { - AutoMap<ItemStack> mValidRecords = new AutoMap<ItemStack>(); + AutoMap<ItemStack> mValidRecords = new AutoMap<>(); for (ItemStack g : this.getInventory().getInventory()) { if (g != null) { if (g.getItem() instanceof ItemRecord) { diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index 982b29ed97..68c054fb59 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -72,9 +72,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { if (!mDidScrewDriver) { final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter)) { + if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter aTile)) { player.openGui(GTplusplus.instance, GuiHandler.GUI18, world, x, y, z); - TileEntityVolumetricFlaskSetter aTile = (TileEntityVolumetricFlaskSetter) te; // new Packet_VolumetricFlaskGui2(aTile, aTile.getCustomValue()); return true; } @@ -152,7 +151,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" }; - CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; + CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java b/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java deleted file mode 100644 index ae3917451a..0000000000 --- a/src/main/java/gtPlusPlus/core/chunkloading/GTPP_ChunkManager.java +++ /dev/null @@ -1,110 +0,0 @@ -package gtPlusPlus.core.chunkloading; - -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; - -import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.MinecraftForge; - -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.ListMultimap; - -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; - -/** - * - * This class handles re-initializing chunks after a server restart Credits to Repo-Alt for the original implementation. - * - * @author Repo-Alt, Alkalus - * - */ -public class GTPP_ChunkManager implements ForgeChunkManager.LoadingCallback, ForgeChunkManager.OrderedLoadingCallback, - ForgeChunkManager.PlayerOrderedLoadingCallback { - - private static GTPP_ChunkManager instance; - - public static boolean enableChunkloaders = true; - public static boolean alwaysReloadChunkloaders = false; - public static boolean debugChunkloaders = false; - - public static GTPP_ChunkManager getInstance() { - if (instance == null) { - instance = new GTPP_ChunkManager(); - } - return instance; - } - - public static void init() { - if (enableChunkloaders) { - ForgeChunkManager.setForcedChunkLoadingCallback(GTplusplus.instance, getInstance()); - MinecraftForge.EVENT_BUS.register(getInstance()); - } - } - - @Override - public void ticketsLoaded(List<Ticket> tickets, World world) { - for (Ticket ticket : tickets) { - if (ticket.isPlayerTicket()) continue; - Entity entity = ticket.getEntity(); - if (entity == null) { - int x = ticket.getModData().getInteger("xCoord"); - int y = ticket.getModData().getInteger("yCoord"); - int z = ticket.getModData().getInteger("zCoord"); - - if (y >= 0) { - TileEntity tile = world.getTileEntity(x, y, z); - if (((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GregtechMetaTileEntityChunkLoader) { - ((GregtechMetaTileEntityChunkLoader) ((IGregTechTileEntity) tile).getMetaTileEntity()) - .forceChunkLoading(ticket); - } - } - } - } - } - - @Override - public List<Ticket> ticketsLoaded(List<Ticket> tickets, World world, int maxTicketCount) { - Set<Ticket> validTickets = new HashSet<>(); - for (Ticket ticket : tickets) { - Entity entity = ticket.getEntity(); - if (entity == null) { - int x = ticket.getModData().getInteger("xCoord"); - int y = ticket.getModData().getInteger("yCoord"); - int z = ticket.getModData().getInteger("zCoord"); - - if (y >= 0) { - TileEntity tile = world.getTileEntity(x, y, z); - if (((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GregtechMetaTileEntityChunkLoader) { - validTickets.add(ticket); - } - } - } - } - - return new LinkedList<>(validTickets); - } - - @Override - public ListMultimap<String, Ticket> playerTicketsLoaded(ListMultimap<String, Ticket> tickets, World world) { - return LinkedListMultimap.create(); - } - - public static Set<ChunkCoordIntPair> getChunksAround(int xChunk, int zChunk, int radius) { - Set<ChunkCoordIntPair> chunkList = new HashSet<>(); - for (int xx = xChunk - radius; xx <= xChunk + radius; xx++) { - for (int zz = zChunk - radius; zz <= zChunk + radius; zz++) { - chunkList.add(new ChunkCoordIntPair(xx, zz)); - } - } - return chunkList; - } -} diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java index 961f365f69..f5c255e420 100644 --- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java +++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java @@ -40,8 +40,8 @@ public class ModelSickBlaze extends ModelBlaze { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_); this.blazeHead.render(p_78088_7_); - for (int i = 0; i < this.blazeSticks.length; ++i) { - this.blazeSticks[i].render(p_78088_7_); + for (ModelRenderer blazeStick : this.blazeSticks) { + blazeStick.render(p_78088_7_); } } diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java index 779713d130..03295d0cb1 100644 --- a/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java +++ b/src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java @@ -136,9 +136,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY - 1 : aY, aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderYNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -155,9 +155,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aFullBlock ? aY + 1 : aY, aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderYPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -175,9 +175,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderZNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -194,9 +194,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aX, aY, aFullBlock ? aZ + 1 : aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderZPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -213,9 +213,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { .setBrightness(aBlock.getMixedBrightnessForBlock(aWorld, aFullBlock ? aX - 1 : aX, aY, aZ)); } if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderXNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -233,9 +233,9 @@ public class CustomOreBlockRenderer implements ISimpleBlockRenderingHandler { } aRenderer.flipTexture = (!aFullBlock); if (aIcon != null) { - for (int i = 0; i < aIcon.length; i++) { - if (aIcon[i] != null) { - aIcon[i].renderXPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXPos(aRenderer, aBlock, aX, aY, aZ); } } } diff --git a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java b/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java deleted file mode 100644 index 8bd51e1459..0000000000 --- a/src/main/java/gtPlusPlus/core/commands/CommandDebugChunks.java +++ /dev/null @@ -1,141 +0,0 @@ -package gtPlusPlus.core.commands; - -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.preloader.ChunkDebugger; -import gtPlusPlus.preloader.asm.AsmConfig; - -public class CommandDebugChunks implements ICommand { - - private final List<String> aliases; - - protected String fullEntityName; - protected Entity conjuredEntity; - - public CommandDebugChunks() { - this.aliases = new ArrayList<>(); - aliases.add("debugchunks"); - aliases.add("DC"); - } - - @Override - public int compareTo(final Object o) { - return 0; - } - - @Override - public String getCommandName() { - return "DebugChunks"; - } - - @Override - public String getCommandUsage(final ICommandSender var1) { - return "/DebugChunks"; - } - - @Override - public List<String> getCommandAliases() { - return this.aliases; - } - - @Override - public void processCommand(final ICommandSender S, final String[] argString) { - Logger.INFO("Debug Command"); - - final World W = S.getEntityWorld(); - final EntityPlayer P = CommandUtils.getPlayer(S); - - if (!AsmConfig.enableChunkDebugging) { - PlayerUtils.messagePlayer(P, "Chunk Debugging is disabled."); - return; - } - - Map<String, Integer> aTicketCounter = new LinkedHashMap<String, Integer>(); - for (Pair<String, String> f : ChunkDebugger.mChunkTicketsMap.values()) { - String aMod = f.getKey(); - String aDim = f.getValue(); - if (aMod != null) { - if (aTicketCounter.containsKey(aMod)) { - int aModTicketCount = aTicketCounter.get(aMod); - aModTicketCount++; - aTicketCounter.put(aMod, aModTicketCount); - } else { - aTicketCounter.put(aMod, 1); - } - } - } - if (aTicketCounter.isEmpty()) { - PlayerUtils.messagePlayer(P, "No forced chunk tickets active."); - } - for (String x : aTicketCounter.keySet()) { - PlayerUtils.messagePlayer(P, x + " has " + aTicketCounter.get(x) + " tickets active."); - } - - Map<String, Integer> aChunkCounter = new LinkedHashMap<String, Integer>(); - for (Pair<String, String> f : ChunkDebugger.mChunksLoadedByModsMap.values()) { - String aMod = f.getKey(); - String aDim = f.getValue(); - if (aMod == null) { - aMod = "Bad ModId"; - } - - if (aMod != null) { - // PlayerUtils.messagePlayer(P, aMod+" has "+aDim+" active."); - if (aChunkCounter.containsKey(aMod)) { - int aModTicketCount = aChunkCounter.get(aMod); - aModTicketCount = aModTicketCount + 1; - aChunkCounter.put(aMod, aModTicketCount); - Logger.INFO("Counting +1 for " + aMod + ", total of " + aModTicketCount); - } else { - aChunkCounter.put(aMod, 1); - Logger.INFO("Counting +1 for " + aMod); - } - } - } - if (aChunkCounter.isEmpty()) { - PlayerUtils.messagePlayer(P, "No chunks force loaded."); - } - for (String x : aChunkCounter.keySet()) { - PlayerUtils.messagePlayer(P, x + " has " + aChunkCounter.get(x) + " chunks active."); - } - } - - @Override - public boolean canCommandSenderUseCommand(final ICommandSender var1) { - final EntityPlayer P = CommandUtils.getPlayer(var1); - if (P == null) { - return false; - } - if (PlayerUtils.isPlayerOP(P)) { - return true; - } - return false; - } - - @Override - public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - return new ArrayList<>(); - } - - @Override - public boolean isUsernameIndex(final String[] var1, final int var2) { - // TODO Auto-generated method stub - return false; - } - - public boolean playerUsesCommand(final World W, final EntityPlayer P, final int cost) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java index 76b27ce93e..ad57019bce 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandEnableDebugWhileRunning.java @@ -18,7 +18,6 @@ import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -75,7 +74,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { || argString[0].toLowerCase().equals("?")) { Logger.INFO("Listing commands and their uses."); final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; PlayerUtils.messagePlayer(P, "The following are valid args for the '/gtpp' command:"); PlayerUtils.messagePlayer(P, "? - This help command."); PlayerUtils.messagePlayer(P, "logging - Toggles ALL GT++ logging for current session."); @@ -88,13 +87,13 @@ public class CommandEnableDebugWhileRunning implements ICommand { Logger.INFO("Toggling Debug Mode."); final EntityPlayer P = CommandUtils.getPlayer(S); if (PlayerUtils.isPlayerOP(P)) { - CORE_Preloader.DEBUG_MODE = Utils.invertBoolean(CORE_Preloader.DEBUG_MODE); + CORE_Preloader.DEBUG_MODE = !CORE_Preloader.DEBUG_MODE; PlayerUtils.messagePlayer(P, "Toggled GT++ Debug Mode - Enabled: " + CORE_Preloader.DEBUG_MODE); } } else if (argString[0].toLowerCase().equals("logging")) { Logger.INFO("Toggling Logging."); final EntityPlayer P = CommandUtils.getPlayer(S); - AsmConfig.disableAllLogging = Utils.invertBoolean(AsmConfig.disableAllLogging); + AsmConfig.disableAllLogging = !AsmConfig.disableAllLogging; PlayerUtils.messagePlayer(P, "Toggled GT++ Logging - Enabled: " + (!AsmConfig.disableAllLogging)); } /* @@ -130,7 +129,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { String aItemDisplayName = ItemUtils.getItemName(aHeldItem); String aItemUnlocalName = ItemUtils.getUnlocalizedItemName(aHeldItem); String aNbtString = tryIterateNBTData(aHeldItem); - AutoMap<String> aOreDictNames = new AutoMap<String>(); + AutoMap<String> aOreDictNames = new AutoMap<>(); int[] aOreIDs = OreDictionary.getOreIDs(aHeldItem); for (int id : aOreIDs) { @@ -151,7 +150,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { } } - AutoMap<String> aFluidContainerData = new AutoMap<String>(); + AutoMap<String> aFluidContainerData = new AutoMap<>(); FluidStack aHeldItemFluid = FluidContainerRegistry.getFluidForFilledItem(aHeldItem); if (aHeldItemFluid != null) { aFluidContainerData.put("FluidStack Unlocal Name: " + aHeldItemFluid.getUnlocalizedName()); @@ -214,7 +213,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { @Override public List<?> addTabCompletionOptions(final ICommandSender var1, final String[] var2) { - ArrayList<String> aTabCompletes = new ArrayList<String>(); + ArrayList<String> aTabCompletes = new ArrayList<>(); aTabCompletes.add("?"); aTabCompletes.add("logging"); aTabCompletes.add("debug"); @@ -235,7 +234,7 @@ public class CommandEnableDebugWhileRunning implements ICommand { public static String tryIterateNBTData(ItemStack aStack) { try { - AutoMap<String> aItemDataTags = new AutoMap<String>(); + AutoMap<String> aItemDataTags = new AutoMap<>(); NBTTagCompound aNBT = NBTUtils.getNBT(aStack); if (aNBT != null) { if (!aNBT.hasNoTags()) { diff --git a/src/main/java/gtPlusPlus/core/commands/CommandMath.java b/src/main/java/gtPlusPlus/core/commands/CommandMath.java index 8659c00246..eb872160cc 100644 --- a/src/main/java/gtPlusPlus/core/commands/CommandMath.java +++ b/src/main/java/gtPlusPlus/core/commands/CommandMath.java @@ -22,8 +22,6 @@ public class CommandMath implements ICommand { public CommandMath() { this.aliases = new ArrayList<>(); - // this.aliases.add("hometele"); - // this.aliases.add("warphome"); } @Override diff --git a/src/main/java/gtPlusPlus/core/common/BasePlayer.java b/src/main/java/gtPlusPlus/core/common/BasePlayer.java deleted file mode 100644 index d119ca2015..0000000000 --- a/src/main/java/gtPlusPlus/core/common/BasePlayer.java +++ /dev/null @@ -1,211 +0,0 @@ -package gtPlusPlus.core.common; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.settings.GameSettings; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.potion.Potion; -import net.minecraft.util.MovementInputFromOptions; - -import api.player.client.ClientPlayerAPI; -import api.player.client.ClientPlayerBase; -import gtPlusPlus.core.handler.events.CustomMovementHandler; -import gtPlusPlus.core.handler.events.SneakManager; - -public class BasePlayer extends ClientPlayerBase { - - private final Minecraft mc = Minecraft.getMinecraft(); - private final CustomMovementHandler customMovementInput = new CustomMovementHandler(); - private final GameSettings settings = this.mc.gameSettings; - - public BasePlayer(final ClientPlayerAPI api) { - super(api); - } - - /* - * EntityPlayerSP.onLivingUpdate() - Adapted to PlayerAPI - */ - @Override - public void onLivingUpdate() { - - super.onLivingUpdate(); - EntityPlayer aPlayer = this.player; - if (aPlayer != null) { - SneakManager aSneak = SneakManager.get(aPlayer); - if (!aSneak.isWearingRing()) { - return; - } - } - - if (this.player.sprintingTicksLeft > 0) { - --this.player.sprintingTicksLeft; - if (this.player.sprintingTicksLeft == 0) { - this.player.setSprinting(false); - } - } - - if (this.playerAPI.getSprintToggleTimerField() > 0) { - this.playerAPI.setSprintToggleTimerField(this.playerAPI.getSprintToggleTimerField() - 1); - } - - if (this.mc.playerController.enableEverythingIsScrewedUpMode()) { - this.player.posX = this.player.posZ = 0.5D; - this.player.posX = 0.0D; - this.player.posZ = 0.0D; - this.player.rotationYaw = this.player.ticksExisted / 12.0F; - this.player.rotationPitch = 10.0F; - this.player.posY = 68.5D; - } else { - - final boolean isJumping = this.player.movementInput.jump; - - final float minSpeed = 0.8F; - final boolean isMovingForward = this.player.movementInput.moveForward >= minSpeed; - this.customMovementInput.update(this.mc, (MovementInputFromOptions) this.player.movementInput, this.player); - - /* - * Begin ToggleSneak Changes - ToggleSprint - */ - SneakManager aSneak = SneakManager.get(this.player); - - final boolean isSprintDisabled = false; - final boolean canDoubleTap = aSneak.optionDoubleTap; - - // Detect when ToggleSprint was disabled in the in-game options menu - if (aSneak.wasSprintDisabled) { - this.player.setSprinting(false); - this.customMovementInput.UpdateSprint(false, false, aSneak); - aSneak.wasSprintDisabled = false; - } - - // Default Sprint routine converted to PlayerAPI, use if ToggleSprint is disabled - TODO - Disable sprinting - // as a whole - if (isSprintDisabled) { - // Utils.LOG_INFO("Sprint pressed"); - if (aSneak.optionDoubleTap && this.player.onGround - && !isMovingForward - && (this.player.movementInput.moveForward >= minSpeed) - && !this.player.isSprinting() - && !this.player.isUsingItem() - && !this.player.isPotionActive(Potion.blindness)) { - if ((this.playerAPI.getSprintToggleTimerField() <= 0) - && !this.settings.keyBindSprint.getIsKeyPressed()) { - this.playerAPI.setSprintToggleTimerField(7); - } else { - if (aSneak.Sprinting()) { - this.player.setSprinting(true); - this.customMovementInput.UpdateSprint(true, false, aSneak); - } else { - this.player.setSprinting(false); - this.customMovementInput.UpdateSprint(false, false, aSneak); - } - } - } - - if (!this.player.isSprinting() && (this.player.movementInput.moveForward >= minSpeed) - && !this.player.isUsingItem() - && !this.player.isPotionActive(Potion.blindness) - && this.settings.keyBindSprint.getIsKeyPressed()) { - if (aSneak.Sprinting()) { - this.player.setSprinting(true); - this.customMovementInput.UpdateSprint(true, false, aSneak); - } else { - this.player.setSprinting(false); - this.customMovementInput.UpdateSprint(false, false, aSneak); - } - } - } else { - final boolean state = this.customMovementInput.sprint; - - // Only handle changes in state under the following conditions: - // On ground, not hungry, not eating/using item, not blind, and not Vanilla - // - // 5/6/14 - onGround check removed to match vanilla's 'start sprint while jumping' behavior. - // if(this.player.onGround && enoughHunger && !this.player.isUsingItem() && - // !this.player.isPotionActive(Potion.blindness) && !this.customMovementInput.sprintHeldAndReleased) - - if (!this.player.isUsingItem() && !this.player.isPotionActive(Potion.blindness) - && !this.customMovementInput.sprintHeldAndReleased) { - if ((canDoubleTap && !this.player.isSprinting()) || !canDoubleTap) { - if (aSneak.Sprinting()) { - this.player.setSprinting(state); - } else { - this.player.setSprinting(false); - } - } - } - - if (canDoubleTap && !state - && this.player.onGround - && !isMovingForward - && (this.player.movementInput.moveForward >= minSpeed) - && !this.player.isSprinting() - && !this.player.isUsingItem() - && !this.player.isPotionActive(Potion.blindness)) { - if (this.playerAPI.getSprintToggleTimerField() == 0) { - this.playerAPI.setSprintToggleTimerField(7); - } else { - if (aSneak.Sprinting()) { - this.player.setSprinting(true); - this.customMovementInput.UpdateSprint(true, true, aSneak); - this.playerAPI.setSprintToggleTimerField(0); - } - } - } - } - - // If sprinting, break the sprint in appropriate circumstances: - // Player stops moving forward, runs into something, or gets too hungry - if (this.player.isSprinting() - && ((this.player.movementInput.moveForward < minSpeed) || this.player.isCollidedHorizontally)) { - this.player.setSprinting(false); - - // Undo toggle if we resumed vanilla operation due to Hold&Release, DoubleTap, Fly, Ride - if ((this.customMovementInput.sprintHeldAndReleased == true) || isSprintDisabled - || this.customMovementInput.sprintDoubleTapped - || this.player.capabilities.isFlying - || this.player.isRiding()) { - this.customMovementInput.UpdateSprint(false, false, aSneak); - } - } - - /* - * End ToggleSneak Changes - ToggleSprint - */ - - // // - // // Debug Framework - Added 5/7/2014 - // // - // if (this.showDebug && this.settings.keyBindPickBlock.getIsKeyPressed() && !this.handledDebugPress) - // { - // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+")); - // this.player.addChatMessage(new ChatComponentText("| ToggleSneak Debug Info |")); - // this.player.addChatMessage(new ChatComponentText("+--------------------------------------+")); - // this.player.addChatMessage(new ChatComponentText(" ")); - // this.player.addChatMessage(new ChatComponentText("isFlying - " + - // (this.player.capabilities.isFlying == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("isCreative - " + - // (this.player.capabilities.isCreativeMode == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("enableFlyBoost - " + - // (SneakManager.optionEnableFlyBoost == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("flyBoostAmount - " + - // SneakManager.optionFlyBoostAmount)); - // this.player.addChatMessage(new ChatComponentText(" ")); - // this.player.addChatMessage(new ChatComponentText("keybindSprint - " + - // (this.settings.keyBindSprint.getIsKeyPressed() == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("keybindSneak - " + - // (this.settings.keyBindSneak.getIsKeyPressed() == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText("keybindJump - " + - // (this.settings.keyBindJump.getIsKeyPressed() == true ? "True" : "False"))); - // this.player.addChatMessage(new ChatComponentText(" ")); - // this.player.addChatMessage(new ChatComponentText(" ")); - // - // this.handledDebugPress = true; - // } - // else if (this.showDebug && !this.settings.keyBindPickBlock.getIsKeyPressed() && this.handledDebugPress) - // { - // this.handledDebugPress = false; - // } - - } - } -} diff --git a/src/main/java/gtPlusPlus/core/common/CommonProxy.java b/src/main/java/gtPlusPlus/core/common/CommonProxy.java index ee624b3f24..ab7090351b 100644 --- a/src/main/java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/main/java/gtPlusPlus/core/common/CommonProxy.java @@ -1,9 +1,6 @@ package gtPlusPlus.core.common; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.Entity; import net.minecraft.entity.monster.EntityBlaze; -import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,7 +14,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.common.registry.GameRegistry; -import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; @@ -32,11 +28,9 @@ import gtPlusPlus.core.handler.GuiHandler; import gtPlusPlus.core.handler.events.EnderDragonDeathHandler; import gtPlusPlus.core.handler.events.EntityDeathHandler; import gtPlusPlus.core.handler.events.GeneralTooltipEventHandler; -import gtPlusPlus.core.handler.events.PickaxeBlockBreakEventHandler; import gtPlusPlus.core.handler.events.PlayerSleepEventHandler; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.tileentities.ModTileEntities; import gtPlusPlus.core.util.Utils; @@ -71,36 +65,24 @@ public class CommonProxy { AddToCreativeTab.initialiseTabs(); CustomInternalName.init(); - // Moved from Init after Debug Loading. - // 29/01/18 - Alkalus - // Moved earlier into PreInit, so that Items exist before they're called upon in - // recipes. - // 20/03/18 - Alkalus ModItems.init(); ModBlocks.init(); CI.preInit(); COMPAT_IntermodStaging.preInit(e); BookHandler.run(); // Registration of entities and renderers - Logger.INFO("[Proxy] Calling Entity registrator."); + Logger.INFO("[Proxy] Calling Entity registration."); registerEntities(); - Logger.INFO("[Proxy] Calling Tile Entity registrator."); + Logger.INFO("[Proxy] Calling Tile Entity registration."); registerTileEntities(); - Logger.INFO("[Proxy] Calling Render registrator."); + Logger.INFO("[Proxy] Calling Render registration."); registerRenderThings(); } public void init(final FMLInitializationEvent e) { CI.init(); - /** - * Register the Event Handlers. - */ - - // Prevents my Safes being destroyed. - Utils.registerEvent(new PickaxeBlockBreakEventHandler()); - // Block Handler for all events. Utils.registerEvent(new GeneralTooltipEventHandler()); // Handles Tooltips for items giving custom multiblock behaviour Utils.registerEvent(new SpecialBehaviourTooltipHandler()); @@ -112,10 +94,6 @@ public class CommonProxy { Utils.registerEvent(new EnderDragonDeathHandler()); Utils.registerEvent(new EntityDeathHandler()); - /** - * End of Subscribe Event registration. - */ - // Compat Handling COMPAT_HANDLER.registerMyModsOreDictEntries(); COMPAT_HANDLER.intermodOreDictionarySupport(); @@ -145,8 +123,6 @@ public class CommonProxy { Logger.INFO("Registering custom mob drops."); registerCustomMobDrops(); - // Moved last in postInit(). - // 12/12/19 - Alkalus // Moved last, to prevent recipes being generated post initialisation. Logger.INFO("Loading Gregtech API recipes."); COMPAT_HANDLER.startLoadingGregAPIBasedRecipes(); @@ -179,15 +155,8 @@ public class CommonProxy { return 0; } - public void generateMysteriousParticles(final Entity entity) {} - public void registerCustomMobDrops() { - // Zombie - EntityUtils.registerDropsForMob(EntityZombie.class, ItemUtils.getSimpleStack(ModItems.itemBomb), 2, 10); - EntityUtils.registerDropsForMob(EntityZombie.class, ALLOY.TUMBAGA.getTinyDust(1), 1, 10); - EntityUtils.registerDropsForMob(EntityZombie.class, ALLOY.POTIN.getTinyDust(1), 1, 10); - // Blazes if (ItemUtils.doesOreDictHaveEntryFor("dustPyrotheum")) { EntityUtils.registerDropsForMob( @@ -202,22 +171,6 @@ public class CommonProxy { 10); } - // Special mobs Support - if (ReflectionUtils.doesClassExist("toast.specialMobs.entity.zombie.EntityBrutishZombie")) { - Class<?> aBrutishZombie = ReflectionUtils.getClass("toast.specialMobs.entity.zombie.EntityBrutishZombie"); - ItemStack aFortune1 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1); - ItemStack aFortune2 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1); - ItemStack aFortune3 = ItemUtils.getEnchantedBook(Enchantment.fortune, 1); - EntityUtils.registerDropsForMob(aBrutishZombie, aFortune1, 1, 100); - EntityUtils.registerDropsForMob(aBrutishZombie, aFortune2, 1, 50); - EntityUtils.registerDropsForMob(aBrutishZombie, aFortune3, 1, 1); - EntityUtils.registerDropsForMob( - aBrutishZombie, - ItemUtils.getItemStackOfAmountFromOreDict("ingotRedAlloy", 1), - 3, - 200); - } - // GalaxySpace Support if (ReflectionUtils.doesClassExist("galaxyspace.core.entity.mob.EntityEvolvedColdBlaze")) { Class<?> aColdBlaze = ReflectionUtils.getClass("galaxyspace.core.entity.mob.EntityEvolvedColdBlaze"); @@ -246,19 +199,7 @@ public class CommonProxy { } } - protected final AutoMap<Pair<Item, IItemRenderer>> mItemRenderMappings = new AutoMap<Pair<Item, IItemRenderer>>(); - - public static void registerItemRendererGlobal(Item aItem, IItemRenderer aRenderer) { - GTplusplus.proxy.registerItemRenderer(aItem, aRenderer); - } - - public void registerItemRenderer(Item aItem, IItemRenderer aRenderer) { - if (Utils.isServer()) { - return; - } else { - mItemRenderMappings.add(new Pair<Item, IItemRenderer>(aItem, aRenderer)); - } - } + protected final AutoMap<Pair<Item, IItemRenderer>> mItemRenderMappings = new AutoMap<>(); public World getClientWorld() { return null; diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java index be35a360d1..e90596c876 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Baubles.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.common.compat; import static gregtech.api.enums.Mods.Baubles; -import static gregtech.api.enums.Mods.PlayerAPI; import static gregtech.client.GT_TooltipHandler.Tier.EV; import static gregtech.client.GT_TooltipHandler.Tier.HV; import static gregtech.client.GT_TooltipHandler.Tier.IV; @@ -22,7 +21,6 @@ import gtPlusPlus.core.item.bauble.BatteryPackBaseBauble; import gtPlusPlus.core.item.bauble.FireProtectionBauble; import gtPlusPlus.core.item.general.ItemCloakingDevice; import gtPlusPlus.core.item.general.ItemHealingDevice; -import gtPlusPlus.core.item.general.ItemSlowBuildingRing; public class COMPAT_Baubles { @@ -56,9 +54,5 @@ public class COMPAT_Baubles { registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_3, 1, OreDictionary.WILDCARD_VALUE), UV); ModItems.itemChargePack_High_4 = new BatteryPackBaseBauble(9); registerTieredTooltip(new ItemStack(ModItems.itemChargePack_High_4, 1, OreDictionary.WILDCARD_VALUE), UHV); - - if (PlayerAPI.isModLoaded()) { - ModItems.itemSlowBuildingRing = new ItemSlowBuildingRing(); - } } } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java index e17bccb60a..907e6a0c42 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java @@ -14,7 +14,7 @@ public class COMPAT_ExtraUtils { run(); } - private static final void run() { + private static void run() { ItemUtils.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0); // GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium)); diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java index f3c83785c4..9a9557e418 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_HarvestCraft.java @@ -8,7 +8,7 @@ public class COMPAT_HarvestCraft { run(); } - private static final void run() { + private static void run() { FishTrapHandler.pamsHarvestCraftCompat(); } } diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java index 92da90184f..d2b53c701d 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_IC2.java @@ -40,7 +40,7 @@ public class COMPAT_IC2 { run(); } - private static final void run() { + private static void run() { if (ConfigSwitches.disableIC2Recipes) { diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java deleted file mode 100644 index 286de43fcb..0000000000 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_PlayerAPI.java +++ /dev/null @@ -1,38 +0,0 @@ -package gtPlusPlus.core.common.compat; - -import api.player.client.ClientPlayerAPI; -import gtPlusPlus.core.common.BasePlayer; - -public class COMPAT_PlayerAPI { - - public static class commonProxy { - - public static void initPre() {} - - public static void Init() {} - - public static void initPost() {} - } - - public static class clientProxy { - - public static void initPre() { - // Utils.registerEvent(SneakManager.instance); - } - - public static void Init() { - ClientPlayerAPI.register("SneakManager", BasePlayer.class); - } - - public static void initPost() {} - } - - public static class serverProxy { - - public static void initPre() {} - - public static void Init() {} - - public static void initPost() {} - } -} diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java index fd760af771..768414b9f0 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java @@ -15,7 +15,7 @@ public class COMPAT_Thaumcraft { } } - private static final void run() { + private static void run() { for (int i = 0; i <= 6; i++) { ItemUtils.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard " + i, i); diff --git a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java index f746042c2d..726aa897df 100644 --- a/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java +++ b/src/main/java/gtPlusPlus/core/common/compat/COMPAT_Witchery.java @@ -13,7 +13,7 @@ public class COMPAT_Witchery { run(); } - private static final void run() { + private static void run() { // Koboldite ItemStack aKobolditeDust = ItemUtils .getItemStackWithMeta(Witchery.isModLoaded(), "witchery:ingredient", "Koboldite Dust", 148, 1); diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java index cf71ce6bc7..06e1ed2314 100644 --- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java @@ -1,8 +1,116 @@ package gtPlusPlus.core.config; import static gregtech.api.enums.Mods.GregTech; -import static gtPlusPlus.core.lib.CORE.*; -import static gtPlusPlus.core.lib.CORE.ConfigSwitches.*; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.MACHINE_INFO; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.baseMaxPollutionPerSecondRocketFuelGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.baseMinPollutionPerSecondRocketFuelGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondGeothermalGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.basePollutionPerSecondSemiFluidGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.boilerSteamPerSecond; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropDrainedShard; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.chanceToDropFluoriteOre; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIntegration; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableIC2Recipes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.dumpItemAndBlockData; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeBatteryAlloy; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAlternativeDivisionSigilRecipe; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTextures; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCircuits; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Cables; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustom_Pipes; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Dehydrators; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_FluidTanks; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_GeothermalEngines; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Pollution; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RF_Convetor; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_RocketEngines; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SimpleWasher; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SolarGenerators; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_SteamConverter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_Tesseracts; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMachine_WorldAccelerators; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiSizeTools; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_AlloyBlastSmelter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_Cyclotron; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCokeOven; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialCuttingMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialElectrolyzer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialExtrudingMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialFishingPort; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialMacerationStack; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialMultiMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialPlatePress; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialSifter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialThermalCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialWashPlant; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_IndustrialWireMill; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LargeAutoCrafter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_LiquidFluorideThoriumReactor; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MatterFabricator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_MultiTank; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearFuelRefinery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_NuclearSaltProcessingPlant; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_PowerSubstation; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableMultiblock_ThermalBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableOldGTcircuits; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableSulfuricAcidFix; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableThaumcraftShardUnification; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableWatchdogBGM; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.hideUniversalCells; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiABS; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDT; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvDistillationTower_ModeDistillery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvEBF; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAdvImplosion; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAlgaePond; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiAutoCrafter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiCyclotron; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiFrothFlotationCell; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialAlloySmelter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialArcFurnace; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialChisel; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCokeOven; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialCuttingMachine; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialDehydrator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialElectrolyzer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialExtruder; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialFishingPond; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialForgeHammer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMacerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMixer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeFluid; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMetal; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialMultiMachine_ModeMisc; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeBending; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialPlatePress_ModeForming; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialRockBreaker; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialSifter; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialThermalCentrifuge; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialVacuumFreezer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeChemBath; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWashPlant_ModeWasher; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIndustrialWireMill; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiIsaMill; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiLargeSemiFluidGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiMassFabricator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiMolecularTransformer; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiPackager; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiRefinery; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiThermalBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionPerSecondMultiTreeFarm; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierBoiler; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierGeothermalGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierRocketFuelGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.pollutionReleasedByTierSemiFluidGenerator; +import static gtPlusPlus.core.lib.CORE.ConfigSwitches.showHiddenNEIItems; +import static gtPlusPlus.core.lib.CORE.EVERGLADESBIOME_ID; +import static gtPlusPlus.core.lib.CORE.EVERGLADES_ID; +import static gtPlusPlus.core.lib.CORE.turbineCutoffBase; import java.io.File; diff --git a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java index 4b71fefdb9..a98097967a 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/container/Container_ProjectTable.java @@ -65,8 +65,6 @@ public class Container_ProjectTable extends Container { // Storage Side for (var6 = 0; var6 < 3; ++var6) { for (var7 = 0; var7 < 3; ++var7) { - // Utils.LOG_WARNING("Adding slots at var:"+(var7 + var6 * 4)+" x:"+(8 + var7 * 18)+" y:"+(7 + var6 * - // 18)); this.addSlotToContainer( new Slot(this.craftMatrix, nextFreeSlot, 8 + 18 + (var7 * 18), 8 + (var6 * 18))); this.slotGrid[o] = nextFreeSlot; diff --git a/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java b/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java deleted file mode 100644 index a9a7b33ad7..0000000000 --- a/src/main/java/gtPlusPlus/core/container/Container_RoundRobinator.java +++ /dev/null @@ -1,241 +0,0 @@ -package gtPlusPlus.core.container; - -import java.util.Iterator; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.ICrafting; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.GT_Values; -import gtPlusPlus.core.block.ModBlocks; -import gtPlusPlus.core.inventories.Inventory_RoundRobinator; -import gtPlusPlus.core.slots.SlotNoInput; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; - -public class Container_RoundRobinator extends Container { - - public TileEntityRoundRobinator tile_entity; - public final Inventory_RoundRobinator inventoryChest; - - private final World worldObj; - private final int posX; - private final int posY; - private final int posZ; - - private final boolean[] mActiveData = new boolean[] { false, false, false, false }; - - public static int mStorageSlotNumber = 4; // Number of slots in storage area - public static int mInventorySlotNumber = 36; // Inventory Slots (Inventory - // and Hotbar) - public static int mFullSlotNumber = mInventorySlotNumber + mStorageSlotNumber; // All - // slots - - public Container_RoundRobinator(final InventoryPlayer inventory, final TileEntityRoundRobinator te) { - this.tile_entity = te; - this.inventoryChest = te.getInventory(); - boolean[] aTemp = te.getActiveSides(); - if (aTemp != null && aTemp.length == 4) { - for (int i = 0; i < 4; i++) { - mActiveData[i] = aTemp[i]; - } - } - - int var6; - int var7; - this.worldObj = te.getWorldObj(); - this.posX = te.xCoord; - this.posY = te.yCoord; - this.posZ = te.zCoord; - - int o = 0; - int xStart = 134; - int yStart = 32; - - try { - // 0 - this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart, yStart)); - this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart + 18, yStart)); - this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart, yStart + 17)); - this.addSlotToContainer(new SlotNoInput(this.inventoryChest, o++, xStart + 18, yStart + 17)); - - // Player Inventory - for (var6 = 0; var6 < 3; ++var6) { - for (var7 = 0; var7 < 9; ++var7) { - this.addSlotToContainer( - new Slot(inventory, var7 + (var6 * 9) + 9, 8 + (var7 * 18), 84 + (var6 * 18))); - } - } - // Player Hotbar - for (var6 = 0; var6 < 9; ++var6) { - this.addSlotToContainer(new Slot(inventory, var6, 8 + (var6 * 18), 142)); - } - } catch (Throwable t) { - t.printStackTrace(); - } - this.detectAndSendChanges(); - } - - @Override - public ItemStack slotClick(final int aSlotIndex, final int aMouseclick, final int aShifthold, - final EntityPlayer aPlayer) { - - if (!aPlayer.worldObj.isRemote) { - if (aSlotIndex < 4) { - this.tile_entity.toggleSide(ForgeDirection.getOrientation(aSlotIndex + 2)); - // Logger.INFO("Toggling side: "+(aSlotIndex+2)+" | Active: - // "+this.tile_entity.getSideActive(aSlotIndex+2)+" | Data:"+this.tile_entity.getDataString()); - } - } - return GT_Values.NI; - // return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); - } - - @Override - public void onContainerClosed(final EntityPlayer par1EntityPlayer) { - super.onContainerClosed(par1EntityPlayer); - } - - @Override - public boolean canInteractWith(final EntityPlayer par1EntityPlayer) { - if (this.worldObj.getBlock(this.posX, this.posY, this.posZ) != ModBlocks.blockRoundRobinator) { - return false; - } - - return par1EntityPlayer.getDistanceSq(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D) <= 64D; - } - - @Override - public final void addCraftingToCrafters(ICrafting par1ICrafting) { - try { - super.addCraftingToCrafters(par1ICrafting); - } catch (Throwable var3) { - var3.printStackTrace(); - } - } - - @Override - public final void removeCraftingFromCrafters(ICrafting par1ICrafting) { - try { - super.removeCraftingFromCrafters(par1ICrafting); - } catch (Throwable var3) { - var3.printStackTrace(); - } - } - - @Override - public final void detectAndSendChanges() { - try { - super.detectAndSendChanges(); - detectAndSendChangesEx(); - } catch (Throwable var2) { - var2.printStackTrace(); - } - } - - @Override - public final void updateProgressBar(int par1, int par2) { - try { - super.updateProgressBar(par1, par2); - updateProgressBarEx(par1, par2); - } catch (Throwable var4) { - var4.printStackTrace(); - } - } - - public int mSide_1 = 0; - public int mSide_2 = 0; - public int mSide_3 = 0; - public int mSide_4 = 0; - public int mTier = 1; - public int mTickRate = 50; - - private int oSide_1 = 0; - private int oSide_2 = 0; - private int oSide_3 = 0; - private int oSide_4 = 0; - private int oTier = 1; - private int oTickRate = 50; - - private int mTimer = 0; - - public void detectAndSendChangesEx() { - super.detectAndSendChanges(); - if (!this.tile_entity.getWorldObj().isRemote) { - boolean[] aTemp = tile_entity.getActiveSides(); - for (int i = 0; i < 4; i++) { - mActiveData[i] = aTemp[i]; - } - this.mSide_1 = aTemp[0] ? 1 : 0; - this.mSide_2 = aTemp[1] ? 1 : 0; - this.mSide_3 = aTemp[2] ? 1 : 0; - this.mSide_4 = aTemp[3] ? 1 : 0; - this.mTier = this.tile_entity.getTier(); - this.mTickRate = this.tile_entity.getTickRate(); - ++this.mTimer; - Iterator var2 = this.crafters.iterator(); - - while (true) { - ICrafting var1; - do { - if (!var2.hasNext()) { - this.oSide_1 = this.mSide_1; - this.oSide_2 = this.mSide_2; - this.oSide_3 = this.mSide_3; - this.oSide_4 = this.mSide_4; - this.oTier = this.mTier; - this.oTickRate = this.mTickRate; - return; - } - var1 = (ICrafting) var2.next(); - if (this.mTimer % 500 == 10 || this.oSide_1 != this.mSide_1) { - var1.sendProgressBarUpdate(this, 2, this.mSide_1); - } - if (this.mTimer % 500 == 10 || this.oSide_2 != this.mSide_2) { - var1.sendProgressBarUpdate(this, 4, this.mSide_2); - } - if (this.mTimer % 500 == 10 || this.oSide_3 != this.mSide_3) { - var1.sendProgressBarUpdate(this, 6, this.mSide_3); - } - if (this.mTimer % 500 == 10 || this.oSide_4 != this.mSide_4) { - var1.sendProgressBarUpdate(this, 8, this.mSide_4); - } - if (this.mTimer % 500 == 10 || this.oTier != this.mTier) { - var1.sendProgressBarUpdate(this, 10, this.mTier); - } - if (this.mTimer % 500 == 10 || this.oTickRate != this.mTickRate) { - var1.sendProgressBarUpdate(this, 12, this.mTickRate); - } - } while (this.mTimer % 500 != 10); - } - } - } - - @SideOnly(Side.CLIENT) - public void updateProgressBarEx(int par1, int par2) { - super.updateProgressBar(par1, par2); - switch (par1) { - case 2: - this.mSide_1 = par2; - break; - case 4: - this.mSide_2 = par2; - break; - case 6: - this.mSide_3 = par2; - case 8: - this.mSide_4 = par2; - case 10: - this.mTier = par2; - case 12: - this.mTickRate = par2; - break; - } - } -} diff --git a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java index f9b4a43641..4f54a0795a 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/container/Container_SuperJukebox.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.container; -import java.util.Iterator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -177,21 +175,25 @@ public class Container_SuperJukebox extends Container { public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) { if (tile_entity == null || tile_entity.getWorldObj().isRemote) return null; switch (aSlotIndex) { - case SLOT_HOLO_PLAY: + case SLOT_HOLO_PLAY -> { if (tile_entity == null) return null; tile_entity.mIsPlaying = !tile_entity.mIsPlaying; Logger.INFO("Jukebox | Playing: " + tile_entity.mIsPlaying); tile_entity.jukeboxLogicUpdate(); return null; - case SLOT_HOLO_LOOP: + } + case SLOT_HOLO_LOOP -> { if (tile_entity == null) return null; tile_entity.mIsLooping = !tile_entity.mIsLooping; Logger.INFO("Jukebox | Looping: " + tile_entity.mIsLooping); return null; - case 20: + } + case 20 -> { return null; - default: + } + default -> { return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer); + } } } @@ -206,9 +208,8 @@ public class Container_SuperJukebox extends Container { isPlaying = tile_entity.mIsPlaying; isLooping = tile_entity.mIsLooping; - Iterator var2 = this.crafters.iterator(); - while (var2.hasNext()) { - ICrafting var1 = (ICrafting) var2.next(); + for (Object crafter : this.crafters) { + ICrafting var1 = (ICrafting) crafter; var1.sendProgressBarUpdate(this, 102, isPlaying ? 1 : 0); var1.sendProgressBarUpdate(this, 103, isLooping ? 1 : 0); } @@ -224,12 +225,8 @@ public class Container_SuperJukebox extends Container { public void updateProgressBar(int par1, int par2) { super.updateProgressBar(par1, par2); switch (par1) { - case 102: - isPlaying = (par2 != 0); - break; - case 103: - isLooping = (par2 != 0); - break; + case 102 -> isPlaying = (par2 != 0); + case 103 -> isLooping = (par2 != 0); } } } diff --git a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java index 5af33d3684..2f2d69364f 100644 --- a/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/container/Container_VolumetricFlaskSetter.java @@ -1,7 +1,5 @@ package gtPlusPlus.core.container; -import java.util.Iterator; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -147,9 +145,8 @@ public class Container_VolumetricFlaskSetter extends Container { mCustomValue = mTileEntity.getCustomValue(); mTimer++; - Iterator var2 = this.crafters.iterator(); - while (var2.hasNext()) { - ICrafting var1 = (ICrafting) var2.next(); + for (Object crafter : this.crafters) { + ICrafting var1 = (ICrafting) crafter; if (mTimer % 20 == 10 || oCustomValue != mCustomValue) { var1.sendProgressBarUpdate(this, 0, mCustomValue); } @@ -163,9 +160,7 @@ public class Container_VolumetricFlaskSetter extends Container { public void updateProgressBar(int par1, int par2) { super.updateProgressBar(par1, par2); switch (par1) { - case 0: - mCustomValue = (short) par2; - break; + case 0 -> mCustomValue = (short) par2; } } diff --git a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java index 4be3605ff1..1bd9d09b60 100644 --- a/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java +++ b/src/main/java/gtPlusPlus/core/entity/InternalEntityRegistry.java @@ -5,10 +5,7 @@ import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; -import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion; -import gtPlusPlus.core.entity.projectile.EntityThrowableBomb; import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; import gtPlusPlus.core.util.Utils; @@ -20,8 +17,6 @@ public class InternalEntityRegistry { public static void registerEntities() { Logger.INFO("Registering GT++ Entities."); - // EntityRegistry.registerGlobalEntityID(EntityPrimedMiningExplosive.class, "MiningCharge", - // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 0, 0), Utils.rgbtoHexValue(125, 125, 125)); EntityRegistry.registerModEntity( EntityPrimedMiningExplosive.class, "MiningCharge", @@ -31,31 +26,6 @@ public class InternalEntityRegistry { 20, true); - // EntityRegistry.registerGlobalEntityID(EntitySulfuricAcidPotion.class, "throwablePotionSulfuric", - // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(200, 0, 200), Utils.rgbtoHexValue(125, 125, - // 125)); - EntityRegistry.registerModEntity( - EntitySulfuricAcidPotion.class, - "throwablePotionSulfuric", - mEntityID++, - GTplusplus.instance, - 64, - 20, - true); - - // EntityRegistry.registerGlobalEntityID(EntityHydrofluoricAcidPotion.class, "throwablePotionHydrofluoric", - // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 0, 0), Utils.rgbtoHexValue(255, 255, 255)); - EntityRegistry.registerModEntity( - EntityHydrofluoricAcidPotion.class, - "throwablePotionHydrofluoric", - mEntityID++, - GTplusplus.instance, - 64, - 20, - true); - - // EntityRegistry.registerGlobalEntityID(EntityToxinballSmall.class, "toxinBall", - // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 25, 0), Utils.rgbtoHexValue(0, 125, 0)); EntityRegistry.registerModEntity( EntityToxinballSmall.class, "toxinBall", @@ -65,8 +35,6 @@ public class InternalEntityRegistry { 20, true); - // EntityRegistry.registerGlobalEntityID(EntityStaballoyConstruct.class, "constructStaballoy", - // EntityRegistry.findGlobalUniqueEntityId(), Utils.rgbtoHexValue(0, 75, 0), Utils.rgbtoHexValue(50, 220, 50)); EntityRegistry.registerModEntity( EntityStaballoyConstruct.class, "constructStaballoy", @@ -90,15 +58,6 @@ public class InternalEntityRegistry { Utils.rgbtoHexValue(75, 75, 75)); EntityRegistry.registerModEntity( - EntityThrowableBomb.class, - "EntityThrowableBomb", - mEntityID++, - GTplusplus.instance, - 64, - 10, - true); - - EntityRegistry.registerModEntity( EntityLightningAttack.class, "EntityLightningAttack", mEntityID++, diff --git a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java index 933109730c..741b830885 100644 --- a/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java +++ b/src/main/java/gtPlusPlus/core/entity/monster/EntitySickBlaze.java @@ -41,7 +41,7 @@ public class EntitySickBlaze extends EntityMob { @Override protected void entityInit() { super.entityInit(); - this.dataWatcher.addObject(mDataWatcherID, new Byte((byte) 0)); + this.dataWatcher.addObject(mDataWatcherID, 0); } /** @@ -107,13 +107,6 @@ public class EntitySickBlaze extends EntityMob { } } - if (this.rand.nextInt(24) == 0) { - /* - * this.worldObj.playSoundEffect(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire", 1.0F + - * this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F); - */ - } - if (!this.onGround && this.motionY < 0.0D) { this.motionY *= 0.6D; } diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java deleted file mode 100644 index da848575a3..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityHydrofluoricAcidPotion.java +++ /dev/null @@ -1,141 +0,0 @@ -package gtPlusPlus.core.entity.projectile; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.EntityUtils; - -public class EntityHydrofluoricAcidPotion extends EntityThrowable { - - public EntityHydrofluoricAcidPotion(World world) { - super(world); - } - - public EntityHydrofluoricAcidPotion(World world, EntityLivingBase entity) { - super(world, entity); - } - - public EntityHydrofluoricAcidPotion(World world, double posX, double posY, double posZ) { - super(world, posX, posY, posZ); - } - - /** - * Called when this EntityThrowable hits a block or entity. - */ - @Override - protected void onImpact(MovingObjectPosition object) { - int xBlock = object.blockX; - int yBlock = object.blockY; - int zBlock = object.blockZ; - if (object.entityHit != null) { - byte b0 = 6; - if (!GT_Utility.isWearingFullRadioHazmat((EntityLivingBase) object.entityHit)) { - object.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0); - EntityUtils.setEntityOnFire(object.entityHit, 5); - - if (object.entityHit instanceof EntityPlayer) { - EntityPlayer mPlayer = (EntityPlayer) object.entityHit; - mPlayer.addPotionEffect(new PotionEffect(Potion.blindness.getId(), 200, 1)); - mPlayer.addPotionEffect(new PotionEffect(Potion.moveSlowdown.getId(), 300, 2)); - mPlayer.addPotionEffect(new PotionEffect(Potion.confusion.getId(), 250, 2)); - } - - object.entityHit.fireResistance = 0; - ravage(EntityUtils.findBlockPosUnderEntity(object.entityHit)); - } - } - if (object.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - ravage(new BlockPos(xBlock, yBlock, zBlock)); - } - - String mParticleType = "reddust"; - int e = 0; - for (int i = 0; i < 24; ++i) { - if ((e = MathUtils.randInt(0, 5)) <= 1) { - if (e == 0) mParticleType = "largesmoke"; - if (e == 1) mParticleType = "flame"; - } - this.worldObj.spawnParticle( - mParticleType, - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - } - - if (!this.worldObj.isRemote) { - this.setDead(); - } - } - - private boolean ravage(BlockPos blockpos) { - - int radius = 2; - - for (int i = (blockpos.xPos - radius); i < (blockpos.xPos + radius); i++) { - for (int j = (blockpos.yPos - radius); j < (blockpos.yPos + radius); j++) { - for (int h = (blockpos.zPos - radius); h < (blockpos.zPos + radius); h++) { - - int mChance = MathUtils.randInt(1, 10); - if (mChance <= 3) { - Block mBlockhit = worldObj.getBlock(i, j, h); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - - // GT_Pollution.addPollution(worldObj.getChunkFromBlockCoords(blockpos.xPos, blockpos.zPos), - // mPol); - - if (mBlockhit == Blocks.grass || mBlockhit == Blocks.mycelium) { - worldObj.setBlock(i, j + 1, h, Blocks.fire); - worldObj.setBlock(i, j, h, Blocks.dirt); - } else if (mBlockhit == Blocks.leaves || mBlockhit == Blocks.leaves2) { - worldObj.setBlock(i, j, h, Blocks.fire); - } else if (mBlockhit == Blocks.tallgrass) { - worldObj.setBlock(i, j, h, Blocks.fire); - if (worldObj.getBlock(i, j - 1, h) == Blocks.grass) { - worldObj.setBlock(i, j - 1, h, Blocks.dirt); - } - } else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block - || mBlockhit == Blocks.pumpkin - || mBlockhit == Blocks.potatoes) { - worldObj.setBlock(i, j + 1, h, Blocks.fire); - worldObj.setBlock(i, j, h, Blocks.dirt); - } else - if (mBlockhit == Blocks.air) { - worldObj.setBlock(i, j, h, Blocks.fire); - } - } - } - } - } - - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java deleted file mode 100644 index 3c865de497..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntitySulfuricAcidPotion.java +++ /dev/null @@ -1,130 +0,0 @@ -package gtPlusPlus.core.entity.projectile; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.EntityUtils; - -public class EntitySulfuricAcidPotion extends EntityThrowable { - - public EntitySulfuricAcidPotion(World world) { - super(world); - } - - public EntitySulfuricAcidPotion(World world, EntityLivingBase entity) { - super(world, entity); - } - - public EntitySulfuricAcidPotion(World world, double posX, double posY, double posZ) { - super(world, posX, posY, posZ); - } - - /** - * Called when this EntityThrowable hits a block or entity. - */ - @Override - protected void onImpact(MovingObjectPosition object) { - int xBlock = object.blockX; - int yBlock = object.blockY; - int zBlock = object.blockZ; - if (object.entityHit != null) { - byte b0 = 6; - if (!GT_Utility.isWearingFullRadioHazmat((EntityLivingBase) object.entityHit)) { - object.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), b0); - EntityUtils.setEntityOnFire(object.entityHit, 10); - object.entityHit.fireResistance = 0; - ravage(EntityUtils.findBlockPosUnderEntity(object.entityHit)); - } - } - if (object.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - ravage(new BlockPos(xBlock, yBlock, zBlock)); - } - - String mParticleType = "reddust"; - int e = 0; - for (int i = 0; i < 24; ++i) { - if ((e = MathUtils.randInt(0, 5)) <= 1) { - if (e == 0) mParticleType = "largesmoke"; - if (e == 1) mParticleType = "flame"; - } - this.worldObj.spawnParticle( - mParticleType, - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - } - - if (!this.worldObj.isRemote) { - this.setDead(); - } - } - - private boolean ravage(BlockPos blockpos) { - - int radius = 1; - - for (int i = (blockpos.xPos - radius); i < (blockpos.xPos + radius); i++) { - for (int j = (blockpos.yPos - radius); j < (blockpos.yPos + radius); j++) { - for (int h = (blockpos.zPos - radius); h < (blockpos.zPos + radius); h++) { - - int mChance = MathUtils.randInt(1, 10); - if (mChance <= 3) { - Block mBlockhit = worldObj.getBlock(i, j, h); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - - // GT_Pollution.addPollution(worldObj.getChunkFromBlockCoords(blockpos.xPos, blockpos.zPos), - // mPol); - - if (mBlockhit == Blocks.grass || mBlockhit == Blocks.mycelium) { - worldObj.setBlock(i, j + 1, h, Blocks.fire); - worldObj.setBlock(i, j, h, Blocks.dirt); - } else if (mBlockhit == Blocks.leaves || mBlockhit == Blocks.leaves2) { - worldObj.setBlock(i, j, h, Blocks.fire); - } else if (mBlockhit == Blocks.tallgrass) { - worldObj.setBlock(i, j, h, Blocks.fire); - if (worldObj.getBlock(i, j - 1, h) == Blocks.grass) { - worldObj.setBlock(i, j - 1, h, Blocks.dirt); - } - } else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block - || mBlockhit == Blocks.pumpkin - || mBlockhit == Blocks.potatoes) { - worldObj.setBlock(i, j + 1, h, Blocks.fire); - worldObj.setBlock(i, j, h, Blocks.dirt); - } else - if (mBlockhit == Blocks.air) { - worldObj.setBlock(i, j, h, Blocks.fire); - } - } - } - } - } - - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java deleted file mode 100644 index 99ae5ae97c..0000000000 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityThrowableBomb.java +++ /dev/null @@ -1,314 +0,0 @@ -package gtPlusPlus.core.entity.projectile; - -import net.minecraft.block.Block; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.init.Blocks; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.EntityUtils; -import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; - -public class EntityThrowableBomb extends EntityThrowable { - - public EntityThrowableBomb(World world) { - super(world); - } - - public EntityThrowableBomb(World world, EntityLivingBase entity) { - super(world, entity); - } - - public EntityThrowableBomb(World world, double posX, double posY, double posZ) { - super(world, posX, posY, posZ); - } - - /** - * Called when this EntityThrowable hits a block or entity. - */ - @Override - protected void onImpact(MovingObjectPosition object) { - int xBlock = object.blockX; - int yBlock = object.blockY; - int zBlock = object.blockZ; - if (object.entityHit != null) { - byte b0 = 6; - if (!GT_Utility.isWearingFullRadioHazmat((EntityLivingBase) object.entityHit)) { - object.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 20); - EntityUtils.setEntityOnFire(object.entityHit, 20); - object.entityHit.fireResistance = 0; - ravage(EntityUtils.findBlockPosUnderEntity(object.entityHit)); - } - } - if (object.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) { - - ravage(new BlockPos(xBlock, yBlock, zBlock)); - for (BlockPos aSur : new BlockPos(xBlock, yBlock, zBlock).getSurroundingBlocks()) { - ravage(new BlockPos(aSur.xPos, aSur.yPos, aSur.zPos)); - for (BlockPos aSur2 : new BlockPos(aSur.xPos, aSur.yPos, aSur.zPos).getSurroundingBlocks()) { - // ravage(new BlockPos(aSur2.xPos, aSur2.yPos, aSur2.zPos)); - } - } - } - - String mParticleType = "reddust"; - int e = 0; - for (int i = 0; i < 127; ++i) { - if ((e = MathUtils.randInt(0, 5)) <= 1) { - if (e == 0) mParticleType = "largesmoke"; - if (e == 1) mParticleType = "flame"; - } - this.worldObj.spawnParticle( - mParticleType, - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - } - - if (!this.worldObj.isRemote) { - this.setDead(); - } - } - - private boolean ravage(BlockPos blockpos) { - - int radius = 5; - - for (int i = (blockpos.xPos - radius); i < (blockpos.xPos + radius); i++) { - for (int j = (blockpos.yPos - radius); j < (blockpos.yPos + radius); j++) { - for (int h = (blockpos.zPos - radius); h < (blockpos.zPos + radius); h++) { - - int mChance = MathUtils.randInt(0, 100); - if (mChance <= 3) { - Block mBlockhit = worldObj.getBlock(i, j, h); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "flame", - this.posX + MathUtils.randDouble(-2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - this.worldObj.spawnParticle( - "largesmoke", - this.posX + MathUtils.randDouble(2, 2), - this.posY + MathUtils.randDouble(-2, 2), - this.posZ + MathUtils.randDouble(-2, 2), - 0.0D, - 0.0D, - 0.0D); - - PollutionUtils - .addPollution(worldObj.getChunkFromBlockCoords(blockpos.xPos, blockpos.zPos), 500); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 0.01f, true); - if (mBlockhit == Blocks.grass || mBlockhit == Blocks.mycelium) { - worldObj.setBlock(i, j + 1, h, Blocks.fire); - worldObj.setBlock(i, j, h, Blocks.dirt); - } else if (mBlockhit == Blocks.leaves || mBlockhit == Blocks.leaves2) { - worldObj.setBlock(i, j, h, Blocks.fire); - } else if (mBlockhit == Blocks.tallgrass) { - worldObj.setBlock(i, j, h, Blocks.fire); - if (worldObj.getBlock(i, j - 1, h) == Blocks.grass) { - worldObj.setBlock(i, j - 1, h, Blocks.dirt); - } - } else if (mBlockhit == Blocks.carrots || mBlockhit == Blocks.melon_block - || mBlockhit == Blocks.pumpkin - || mBlockhit == Blocks.potatoes) { - worldObj.setBlock(i, j + 1, h, Blocks.fire); - worldObj.setBlock(i, j, h, Blocks.dirt); - } else - if (mBlockhit == Blocks.air) { - worldObj.setBlock(i, j, h, Blocks.fire); - } - } - } - } - } - - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java index 6c490ca693..da1a59600d 100644 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinball.java @@ -134,8 +134,8 @@ public abstract class EntityToxinball extends EntityFireball { this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ).expand(1.0D, 1.0D, 1.0D)); double d0 = 0.0D; - for (int i = 0; i < list.size(); ++i) { - Entity entity1 = (Entity) list.get(i); + for (Object o : list) { + Entity entity1 = (Entity) o; if (entity1.canBeCollidedWith() && (!entity1.isEntityEqual(this.shootingEntity) || this.ticksInAir >= 25)) { diff --git a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java index d2d7836f3d..f2f8b8a8cc 100644 --- a/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java +++ b/src/main/java/gtPlusPlus/core/entity/projectile/EntityToxinballSmall.java @@ -41,23 +41,12 @@ public class EntityToxinballSmall extends EntityToxinball { int k = MoP.blockZ; switch (MoP.sideHit) { - case 0: - --j; - break; - case 1: - ++j; - break; - case 2: - --k; - break; - case 3: - ++k; - break; - case 4: - --i; - break; - case 5: - ++i; + case 0 -> --j; + case 1 -> ++j; + case 2 -> --k; + case 3 -> ++k; + case 4 -> --i; + case 5 -> ++i; } if (this.worldObj.isAirBlock(i, j, k)) { diff --git a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index 601f91b3e9..2e08493d0d 100644 --- a/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/main/java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java @@ -8,19 +8,11 @@ import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; public class Gui_ID_Registry { - private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<Class<? extends IGuiManagerMiscUtils>, MU_GuiId>(); - private static final Map<Integer, MU_GuiId> idMap = new HashMap<Integer, MU_GuiId>(); + private static final Map<Class<? extends IGuiManagerMiscUtils>, MU_GuiId> classMap = new HashMap<>(); + private static final Map<Integer, MU_GuiId> idMap = new HashMap<>(); private static int nextId = 0; - static { - // registerGuiHandlers(Gui_Types.Tile, Arrays.asList(new Class[] {TileAlveary.class})); - // registerGuiHandlers(MU_GuiType.Item, Arrays.asList(new Class[] { ItemBackpack.class, - // ItemBackpackNaturalist.class, ItemBeealyzer.class, ItemCatalogue.class, ItemFlutterlyzer.class, - // ItemHabitatLocator.class, ItemImprinter.class, ItemInfuser.class, ItemLetter.class, ItemSolderingIron.class, - // ItemTreealyzer.class })); - // registerGuiHandlers(MU_GuiType.Entity, Arrays.asList(new Class[] { EntityMinecartApiary.class, - // EntityMinecartBeehouse.class })); - } + static {} private static void registerGuiHandlers(final Gui_Types MU_GuiType, final List<Class<? extends IGuiManagerMiscUtils>> guiHandlerClasses) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java index 19d912b30f..eb019b500f 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_DecayablesChest.java @@ -26,9 +26,6 @@ public class GUI_DecayablesChest extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(final int i, final int j) { - // this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752); - // this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, - // 4210752); } diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java index f4a3c628de..db8019a93a 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_ProjectTable.java @@ -27,9 +27,6 @@ public class GUI_ProjectTable extends GuiContainer { @Override protected void drawGuiContainerForegroundLayer(final int i, final int j) { - // this.fontRendererObj.drawString(I18n.format("Workbench", new Object[0]), 28, 6, 4210752); - // this.fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, - // 4210752); } diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java deleted file mode 100644 index 40e4eafe7f..0000000000 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_RoundRobinator.java +++ /dev/null @@ -1,125 +0,0 @@ -package gtPlusPlus.core.gui.machine; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.lang.reflect.Method; - -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.container.Container_RoundRobinator; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -@SideOnly(Side.CLIENT) -public class GUI_RoundRobinator extends GuiContainer { - - private static final ResourceLocation craftingTableGuiTextures = new ResourceLocation( - GTPlusPlus.ID, - "textures/gui/RoundRobinator.png"); - private TileEntityRoundRobinator mTile; - private Container_RoundRobinator mContainer; - private static final Method mDrawItemStack; - - static { - mDrawItemStack = ReflectionUtils.getMethod( - GuiContainer.class, - "drawItemStack", - new Class[] { ItemStack.class, int.class, int.class, String.class }); - } - - public GUI_RoundRobinator(final InventoryPlayer player_inventory, final TileEntityRoundRobinator te) { - this(new Container_RoundRobinator(player_inventory, te)); - mTile = te; - } - - private GUI_RoundRobinator(final Container_RoundRobinator aContainer) { - super(aContainer); - mContainer = aContainer; - } - - @Override - protected void drawGuiContainerForegroundLayer(final int i, final int j) { - super.drawGuiContainerForegroundLayer(i, j); - - int xStart = 134; - int yStart = 31; - mTile = this.mContainer.tile_entity; - - int tier = mContainer.mTier; - int aTickRate = mContainer.mTickRate; - - fontRendererObj.drawString("Round Robinator", 85, 4, Utils.rgbtoHexValue(50, 150, 50)); - fontRendererObj.drawString("Tier: " + tier, 85, 12, Utils.rgbtoHexValue(50, 150, 50)); - fontRendererObj.drawString("Rate: 1 Item/" + aTickRate + "t", 85, 20, Utils.rgbtoHexValue(50, 150, 50)); - - boolean[] aStates = new boolean[] { mContainer.mSide_1 == 0 ? false : true, - mContainer.mSide_2 == 0 ? false : true, mContainer.mSide_3 == 0 ? false : true, - mContainer.mSide_4 == 0 ? false : true }; - - fontRendererObj - .drawString("West: " + (aStates[0] ? "Active" : "Disabled"), 5, 5, Utils.rgbtoHexValue(50, 50, 50)); - fontRendererObj - .drawString("North: " + (aStates[1] ? "Active" : "Disabled"), 5, 15, Utils.rgbtoHexValue(50, 50, 50)); - fontRendererObj - .drawString("South: " + (aStates[2] ? "Active" : "Disabled"), 5, 25, Utils.rgbtoHexValue(50, 50, 50)); - fontRendererObj - .drawString("East: " + (aStates[3] ? "Active" : "Disabled"), 5, 35, Utils.rgbtoHexValue(50, 50, 50)); - fontRendererObj.drawString("Toggling South will visually", 5, 65, Utils.rgbtoHexValue(150, 50, 50)); - fontRendererObj.drawString("toggle East, This is a visual bug.", 5, 74, Utils.rgbtoHexValue(150, 50, 50)); - drawStatus(aStates[0], xStart, yStart); - drawStatus(aStates[1], xStart + 18, yStart); - drawStatus(aStates[2], xStart, yStart + 18); - drawStatus(aStates[3], xStart + 18, yStart + 18); - } - - @Override - protected void drawGuiContainerBackgroundLayer(final float f, final int i, final int j) { - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); - this.mc.renderEngine.bindTexture(craftingTableGuiTextures); - final int x = (this.width - this.xSize) / 2; - final int y = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize); - } - - private static ItemStack aGreenGlass; - private static ItemStack aRedGlass; - - private void drawStatus(boolean aStateActive, int x, int y) { - if (aGreenGlass == null) { - Item pane = ItemUtils.getSimpleStack(Blocks.stained_glass_pane).getItem(); - aGreenGlass = ItemUtils.simpleMetaStack(pane, 5, 1); - } - if (aRedGlass == null) { - Item pane = ItemUtils.getSimpleStack(Blocks.stained_glass_pane).getItem(); - aRedGlass = ItemUtils.simpleMetaStack(pane, 14, 1); - } - if (mDrawItemStack != null) { - try { - if (aStateActive) { - mDrawItemStack.invoke(this, new Object[] { aGreenGlass, x, y, "" }); - } else { - mDrawItemStack.invoke(this, new Object[] { aRedGlass, x, y, "" }); - } - } catch (Throwable t) { - t.printStackTrace(); - } - } - } - - // This method is called when the Gui is first called! - @Override - public void initGui() { - super.initGui(); - } -} diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java index 598cfd61ef..e453c61641 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_SuperJukebox.java @@ -60,7 +60,7 @@ public class GUI_SuperJukebox extends GUI_Base_Tile_Entity { final int yStart = (this.height - this.ySize) / 2; final int x3 = x2 - xStart; final int y3 = y2 - yStart + 5; - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); if (y3 >= 17 && y3 <= 33) { if (x3 >= 80 && x3 <= 96) { diff --git a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java index ce0a05adc4..d3b30c87c1 100644 --- a/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/gui/machine/GUI_VolumetricFlaskSetter.java @@ -96,18 +96,10 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer { log("Found Digit: " + c + " | char value"); } else { switch (c) { - case '0': - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': + case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' -> { log("Found Digit: " + c + " | char switch"); return true; + } } } return isNum; @@ -115,28 +107,10 @@ public class GUI_VolumetricFlaskSetter extends GuiContainer { public boolean isNumber(int c) { switch (c) { - case Keyboard.KEY_0: - case Keyboard.KEY_1: - case Keyboard.KEY_2: - case Keyboard.KEY_3: - case Keyboard.KEY_4: - case Keyboard.KEY_5: - case Keyboard.KEY_6: - case Keyboard.KEY_7: - case Keyboard.KEY_8: - case Keyboard.KEY_9: - case Keyboard.KEY_NUMPAD0: - case Keyboard.KEY_NUMPAD1: - case Keyboard.KEY_NUMPAD2: - case Keyboard.KEY_NUMPAD3: - case Keyboard.KEY_NUMPAD4: - case Keyboard.KEY_NUMPAD5: - case Keyboard.KEY_NUMPAD6: - case Keyboard.KEY_NUMPAD7: - case Keyboard.KEY_NUMPAD8: - case Keyboard.KEY_NUMPAD9: + case Keyboard.KEY_0, Keyboard.KEY_1, Keyboard.KEY_2, Keyboard.KEY_3, Keyboard.KEY_4, Keyboard.KEY_5, Keyboard.KEY_6, Keyboard.KEY_7, Keyboard.KEY_8, Keyboard.KEY_9, Keyboard.KEY_NUMPAD0, Keyboard.KEY_NUMPAD1, Keyboard.KEY_NUMPAD2, Keyboard.KEY_NUMPAD3, Keyboard.KEY_NUMPAD4, Keyboard.KEY_NUMPAD5, Keyboard.KEY_NUMPAD6, Keyboard.KEY_NUMPAD7, Keyboard.KEY_NUMPAD8, Keyboard.KEY_NUMPAD9 -> { log("Found Digit: " + Keyboard.getKeyName(c) + " | LWJGL Keybinding"); return true; + } } return false; } diff --git a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java index ebd33600d3..5e6973ab2a 100644 --- a/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java +++ b/src/main/java/gtPlusPlus/core/gui/widget/GuiValueField.java @@ -7,7 +7,7 @@ import net.minecraft.client.gui.GuiTextField; import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; +import gtPlusPlus.preloader.CORE_Preloader; public class GuiValueField extends GuiTextField { @@ -25,15 +25,6 @@ public class GuiValueField extends GuiTextField { mGUI = aGUI; } - public boolean canLoseFocus() { - Field canLoseFocus = ReflectionUtils - .getField(GuiTextField.class, DevHelper.isObfuscatedEnvironment() ? "field_146212_n" : "canLoseFocus"); - if (canLoseFocus != null) { - return (boolean) ReflectionUtils.getFieldValue(canLoseFocus, this); - } - return true; - } - @Override public boolean isFocused() { return super.isFocused(); @@ -42,17 +33,16 @@ public class GuiValueField extends GuiTextField { public boolean isBackgroundDrawingEnabled() { Field enableBackgroundDrawing = ReflectionUtils.getField( GuiTextField.class, - DevHelper.isObfuscatedEnvironment() ? "field_146215_m" : "enableBackgroundDrawing"); + !CORE_Preloader.DEV_ENVIRONMENT ? "field_146215_m" : "enableBackgroundDrawing"); if (enableBackgroundDrawing != null) { - return (boolean) ReflectionUtils.getFieldValue(enableBackgroundDrawing, this); + return ReflectionUtils.getFieldValue(enableBackgroundDrawing, this); } return true; } public int getLineScrollOffset() { - Field lineScrollOffset = ReflectionUtils.getField( - GuiTextField.class, - DevHelper.isObfuscatedEnvironment() ? "field_146225_q" : "lineScrollOffset"); + Field lineScrollOffset = ReflectionUtils + .getField(GuiTextField.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_146225_q" : "lineScrollOffset"); if (lineScrollOffset != null) { return (int) ReflectionUtils.getFieldValue(lineScrollOffset, this); } diff --git a/src/main/java/gtPlusPlus/core/handler/BookHandler.java b/src/main/java/gtPlusPlus/core/handler/BookHandler.java index 273179bdcc..5d17b9d90d 100644 --- a/src/main/java/gtPlusPlus/core/handler/BookHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/BookHandler.java @@ -21,7 +21,7 @@ public class BookHandler { public static int mBookKeeperCount = 0; - public static Map<Integer, BookTemplate> mBookMap = new HashMap<Integer, BookTemplate>(); + public static Map<Integer, BookTemplate> mBookMap = new HashMap<>(); public static BookTemplate book_ThermalBoiler; public static BookTemplate book_MultiPowerStation; @@ -64,65 +64,79 @@ public class BookHandler { "Alkalus", new String[] { // Page 1 - "So, when it comes to power storage you really have three separate options:\n" + " \n" - + "Battery Buffers,\n" - + "Energy Buffers,\n" - + "The Power Sub-Station\n", + """ + So, when it comes to power storage you really have three separate options: + \s + Battery Buffers, + Energy Buffers, + The Power Sub-Station + """, // Page 2 - "Battery Buffer\n" + " \n" - + "Is rather portable. Allowing you to throw set one up and insert batteries where ever you may need." - + "\n" - + "They output 1A for each battery stored inside, up to a maximum of 16A.", + """ + Battery Buffer + \s + Is rather portable. Allowing you to throw set one up and insert batteries where ever you may need. + They output 1A for each battery stored inside, up to a maximum of 16A.""", // Page 3 - "Energy Buffer\n" + " \n" - + "Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power." - + "\n" - + "Energy Buffers can output 4A from the output side, however accept 16A as input.", + """ + Energy Buffer + \s + Is a more optimal choice for storage in your base. Once placed down, they cannot be moved without losing all stored power. + Energy Buffers can output 4A from the output side, however accept 16A as input.""", // Page 4 - "The Power Sub-Station" + " \n" - + "Is used for storing Insane amounts of power later game." - + "\n" - + "Consumes 2% of the average voltage of all energy type hatches every tick." - + "\n", + """ + The Power Sub-Station\s + Is used for storing Insane amounts of power later game. + Consumes 2% of the average voltage of all energy type hatches every tick. + """, // Page 5 - "Allows Insertion/Removal of power from the rear face of the controller, swap with a screwdriver." - + "\n" - + "Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure." - + "\n", + """ + Allows Insertion/Removal of power from the rear face of the controller, swap with a screwdriver. + Variable Height Structure, between 4-16Y. Inserted Redox Cells dictate max energy tier of structure. + """, // Page 6 - "Redox Cells cannot be placed into the Top or Bottom layer and only take up 3xhx3 internally." - + "\n" - + "Different Tier cells CANNOT be mixed together." - + "\n", + """ + Redox Cells cannot be placed into the Top or Bottom layer and only take up 3xhx3 internally. + Different Tier cells CANNOT be mixed together. + """, // Page 7 - "All Hatches Must be HV at a Minimum, this minimum tier is in place to stop people abusing ULV/LV hatches to lower the avg/t." - + "\n" - + "Currently the GUI will NOT display anything at all until the structure forms, this is a known bug." - + "\n", + """ + All Hatches Must be HV at a Minimum, this minimum tier is in place to stop people abusing ULV/LV hatches to lower the avg/t. + Currently the GUI will NOT display anything at all until the structure forms, this is a known bug. + """, // Page 8 - "Valid Hatches:\n" + "Energy Hatch,\n" - + "Dynamo Hatch,\n" - + "Charging Bus,\n" - + "Discharging Bus,\n" - + "Dynamo Buffer,\n" - + "Multi-Amp Dynamo Hatch.\n\n\n" - + "Structure MUST contain at least one energy input and one energy output hatch." }); + """ + Valid Hatches: + Energy Hatch, + Dynamo Hatch, + Charging Bus, + Discharging Bus, + Dynamo Buffer, + Multi-Amp Dynamo Hatch. + + + Structure MUST contain at least one energy input and one energy output hatch.""" }); // Test Novel book_ModularBauble = writeBookTemplate( "Manual_Modular_Bauble", "How to: Modular Baubles", "Alkalus", - new String[] { "Concept: This idea came from wanting flexibility. \n" - + "First step, Build a Modularity table to begin customisation of your Bauble. \n" - + " After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level/100.", - "Defence:\n" + "Can be upgraded by combining metal plates with the bauble. \n" - + " | +1 | Aluminium \n" - + " | +2 | Stainless Steel \n" - + " | +3 | Tungsten \n" - + " | +4 | Tungsten Steel \n" - + " | +5 | Naquadah \n", - "There was once a sad and lonely oak tree. \n", "There was once a sad and lonely oak tree. \n", + new String[] { + """ + Concept: This idea came from wanting flexibility.\s + First step, Build a Modularity table to begin customisation of your Bauble.\s + After this has been constructed, you can now combine the upgrades listed within this book to improve the baubles level/100.""", + """ + Defence: + Can be upgraded by combining metal plates with the bauble.\s + | +1 | Aluminium\s + | +2 | Stainless Steel\s + | +3 | Tungsten\s + | +4 | Tungsten Steel\s + | +5 | Naquadah\s + """, "There was once a sad and lonely oak tree. \n", + "There was once a sad and lonely oak tree. \n", "There was once a sad and lonely oak tree. \n" }); // Test Novel @@ -145,45 +159,57 @@ public class BookHandler { "Alkalus", new String[] { // Page 1 - "Fission Fuel Processing Plant\n" + "Size: 3x9x3 [LxHxW]\n" - + "Controller: Center, Bottom\n" - + "4x Input Hatch\n" - + "2x Output Hatch\n" - + "1x Output Bus\n" - + "1x ZPM+ Muffler\n" - + "1x Maintenance Hatch\n" - + "1x Energy Hatch\n", + """ + Fission Fuel Processing Plant + Size: 3x9x3 [LxHxW] + Controller: Center, Bottom + 4x Input Hatch + 2x Output Hatch + 1x Output Bus + 1x ZPM+ Muffler + 1x Maintenance Hatch + 1x Energy Hatch + """, // Page 2 - "[1] 7x Hastelloy-X or I/O\n" + "[2] 5x Incoloy-DS Fluid Containment\n" - + "[3] 4x Zeron-100 Shielding\n" - + "[4] 17x Hastelloy-N Sealant Case" - + "\n" - + "Multiblock Construction\n" - + "Convention is [LxHxW]\n" - + "\n", + """ + [1] 7x Hastelloy-X or I/O + [2] 5x Incoloy-DS Fluid Containment + [3] 4x Zeron-100 Shielding + [4] 17x Hastelloy-N Sealant Case + Multiblock Construction + Convention is [LxHxW] + + """, // Page 3 - "Layer 1/2:\n" + "[1][1][1]\n" - + "[1][1][1]\n" - + "[1][1][1]\n" - + "\n" - + "Layer 3/5/6\n" - + "[ ][4][ ]\n" - + "[4][2][4]\n" - + "[ ][4][ ]\n" - + "\n", + """ + Layer 1/2: + [1][1][1] + [1][1][1] + [1][1][1] + + Layer 3/5/6 + [ ][4][ ] + [4][2][4] + [ ][4][ ] + + """, // Page 4 - "Layer 4\n" + "[ ][3][ ]\n" - + "[3][2][3]\n" - + "[ ][3][ ]\n" - + "\n" - + "Layer 7/8/9\n" - + "[ ][ ][ ]\n" - + "[ ][3][ ]\n" - + "[ ][ ][ ]\n", + """ + Layer 4 + [ ][3][ ] + [3][2][3] + [ ][3][ ] + + Layer 7/8/9 + [ ][ ][ ] + [ ][3][ ] + [ ][ ][ ] + """, // Page 5 - "Fission Fuel\n" + "Processing Plant" - + "----------------------\n" - + "This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor [LFTR]." }); + """ + Fission Fuel + Processing Plant---------------------- + This structure is used to produce the Molten Salts required to run a Liquid Fluorine Thorium Reactor [LFTR].""" }); book_MultiChemicalPlant = writeBookTemplate( "book_Multi_ChemicalPlant", @@ -195,41 +221,31 @@ public class BookHandler { "This book will explain how the Chemical Plant is constructed, which blocks are valid to upgrade it and also how the upgrades work.", // Info - "Solid Casings = Plant tier" + "\n" - + "Machine Casings = Hatch tier" - + "\n" - + "Higher tier coils More Speed" - + "\n" - + "T1 50% , T2 100% , T3 150%, etc" - + "\n", - "Higher tier pipe casings boost parallel" + "\n" - + "and reduce catalyst consumption." - + "\n" - + "+2 parallel per tier, 20% extra chance of" - + "\n" - + "not damaging catalyst per tier.", - "Awakened Draconium Coil (or above) with" + "\n" - + "Tungstensteel Pipe Casing" - + "\n" - + "does not damage catalyst at all.", + """ + Solid Casings = Plant tier + Machine Casings = Hatch tier + Higher tier coils More Speed + T1 50% , T2 100% , T3 150%, etc + """, """ + Higher tier pipe casings boost parallel + and reduce catalyst consumption. + +2 parallel per tier, 20% extra chance of + not damaging catalyst per tier.""", """ + Awakened Draconium Coil (or above) with + Tungstensteel Pipe Casing + does not damage catalyst at all.""", // Machine Casings - "Valid Solid Machine Casings:" + "\n" - + "1 - Strong Bronze" - + "\n" - + "2 - Solid Steel" - + "\n" - + "3 - Sturdy Aluminium" - + "\n" - + "4 - Clean Stainless Steel" - + "\n" - + "5 - Stable Titanium" - + "\n" - + "6 - Robust Tungstensteel" - + "\n" - + "7 - Vigorous Laurenium" - + "\n" - + "8 - Rugged Botmium", + """ + Valid Solid Machine Casings: + 1 - Strong Bronze + 2 - Solid Steel + 3 - Sturdy Aluminium + 4 - Clean Stainless Steel + 5 - Stable Titanium + 6 - Robust Tungstensteel + 7 - Vigorous Laurenium + 8 - Rugged Botmium""", // Machine Casings "Valid Tiered Machine Casings:" + "\n" @@ -265,201 +281,134 @@ public class BookHandler { + GT_Values.VN[9], // Pipe Casings - "Valid Pipe Casings:" + "\n" - + "\n" - + "1 - Bronze" - + "\n" - + "2 - Steel" - + "\n" - + "3 - Titanium" - + "\n" - + "4 - Tungstensteel", + """ + Valid Pipe Casings: + + 1 - Bronze + 2 - Steel + 3 - Titanium + 4 - Tungstensteel""", // Coils - "Valid Coils:" + "\n" - + "\n" - + "1 - Cupronickel" - + "\n" - + "2 - Kanthal" - + "\n" - + "3 - Nichrome" - + "\n" - + "4 - TPV-Alloy" - + "\n" - + "5 - HSS-G" - + "\n" - + "6 - HSS-S" - + "\n" - + "7 - Naquadah" - + "\n" - + "8 - Naquadah Alloy" - + "\n" - + "9 - Trinium" - + "\n" - + "10 - Fluxed Electrum", - "11 - Awakened Draconium" + "\n" - + "12 - Infinity" - + "\n" - + "13 - Hypogen" - + "\n" - + "14 - Eternal", + """ + Valid Coils: + + 1 - Cupronickel + 2 - Kanthal + 3 - Nichrome + 4 - TPV-Alloy + 5 - HSS-G + 6 - HSS-S + 7 - Naquadah + 8 - Naquadah Alloy + 9 - Trinium + 10 - Fluxed Electrum""", """ + 11 - Awakened Draconium + 12 - Infinity + 13 - Hypogen + 14 - Eternal""", // Requirements - "Multiblock Requirements:" + "\n" - + "\n" - + "27x Coils" - + "\n" - + "18x Pipe Casings" - + "\n" - + "57x Tiered Machine Casings" - + "\n" - + "70+ Solid Casings" - + "\n" - + "1x Catalyst Housing (Catalysts cannot go inside an Input Bus)", + """ + Multiblock Requirements: + + 27x Coils + 18x Pipe Casings + 57x Tiered Machine Casings + 70+ Solid Casings + 1x Catalyst Housing (Catalysts cannot go inside an Input Bus)""", // Construction Guide - "Construction Guide Pt1:" + "\n" - + "\n" - + "Controller is placed on a middle casing in the bottom layer" - + "\n" - + "Hatches can only be placed on the bottom layer edges", - "Construction Guide Pt2:" + "\n" - + "\n" - + "7x7x7 Hollow frame of solid casings" - + "\n" - + "5x1x5 layer of solid casings (fills in top layer)" - + "\n" - + "5x1x5 layer of machine casings (fills in bottom layer)", - "Construction Guide Pt3:" + "\n" - + "In the central 3x5x3:" - + "\n" - + "3x1x3 layer of Coils, surrounded by ring of Machine Casings" - + "\n" - + "3x1x3 layer of Pipe Casings" - + "\n" - + "3x1x3 layer of Coils" - + "\n" - + "3x1x3 layer of Pipe Casings" - + "\n" - + "3x1x3 layer of Coils, surrounded by ring of Machine Casings", + """ + Construction Guide Pt1: + + Controller is placed on a middle casing in the bottom layer + Hatches can only be placed on the bottom layer edges""", """ + Construction Guide Pt2: + + 7x7x7 Hollow frame of solid casings + 5x1x5 layer of solid casings (fills in top layer) + 5x1x5 layer of machine casings (fills in bottom layer)""", """ + Construction Guide Pt3: + In the central 3x5x3: + 3x1x3 layer of Coils, surrounded by ring of Machine Casings + 3x1x3 layer of Pipe Casings + 3x1x3 layer of Coils + 3x1x3 layer of Pipe Casings + 3x1x3 layer of Coils, surrounded by ring of Machine Casings""", // Construction Guide Info - "Information:" + "\n" - + "\n" - + "A = Air" - + "\n" - + "X = Solid Casing" - + "\n" - + "M = Machine Casing" - + "\n" - + "P = Pipe Casing" - + "\n" - + "C = Coil Casing", - "Layer 1:" + "\n" - + "\n" - + "XXXXXXX" - + "\n" - + "XMMMMMX" - + "\n" - + "XMMMMMX" - + "\n" - + "XMMMMMX" - + "\n" - + "XMMMMMX" - + "\n" - + "XMMMMMX" - + "\n" - + "XXXXXXX", - "Layer 2:" + "\n" - + "\n" - + "XAAAAAX" - + "\n" - + "AMMMMMA" - + "\n" - + "AMCCCMA" - + "\n" - + "AMCCCMA" - + "\n" - + "AMCCCMA" - + "\n" - + "AMMMMMA" - + "\n" - + "XAAAAAX", - "Layer 3:" + "\n" - + "\n" - + "XAAAAAX" - + "\n" - + "AAAAAAA" - + "\n" - + "AAPPPAA" - + "\n" - + "AAPPPAA" - + "\n" - + "AAPPPAA" - + "\n" - + "AAAAAAA" - + "\n" - + "XAAAAAX", - "Layer 4:" + "\n" - + "\n" - + "XAAAAAX" - + "\n" - + "AAAAAAA" - + "\n" - + "AACCCAA" - + "\n" - + "AACCCAA" - + "\n" - + "AACCCAA" - + "\n" - + "AAAAAAA" - + "\n" - + "XAAAAAX", - "Layer 5:" + "\n" - + "\n" - + "XAAAAAX" - + "\n" - + "AAAAAAA" - + "\n" - + "AAPPPAA" - + "\n" - + "AAPPPAA" - + "\n" - + "AAPPPAA" - + "\n" - + "AAAAAAA" - + "\n" - + "XAAAAAX", - "Layer 6:" + "\n" - + "\n" - + "XAAAAAX" - + "\n" - + "AMMMMMA" - + "\n" - + "AMCCCMA" - + "\n" - + "AMCCCMA" - + "\n" - + "AMCCCMA" - + "\n" - + "AMMMMMA" - + "\n" - + "XAAAAAX", - "Layer 7:" + "\n" - + "\n" - + "XXXXXXX" - + "\n" - + "XXXXXXX" - + "\n" - + "XXXXXXX" - + "\n" - + "XXXXXXX" - + "\n" - + "XXXXXXX" - + "\n" - + "XXXXXXX" - + "\n" - + "XXXXXXX", }); + """ + Information: + + A = Air + X = Solid Casing + M = Machine Casing + P = Pipe Casing + C = Coil Casing""", """ + Layer 1: + + XXXXXXX + XMMMMMX + XMMMMMX + XMMMMMX + XMMMMMX + XMMMMMX + XXXXXXX""", """ + Layer 2: + + XAAAAAX + AMMMMMA + AMCCCMA + AMCCCMA + AMCCCMA + AMMMMMA + XAAAAAX""", """ + Layer 3: + + XAAAAAX + AAAAAAA + AAPPPAA + AAPPPAA + AAPPPAA + AAAAAAA + XAAAAAX""", """ + Layer 4: + + XAAAAAX + AAAAAAA + AACCCAA + AACCCAA + AACCCAA + AAAAAAA + XAAAAAX""", """ + Layer 5: + + XAAAAAX + AAAAAAA + AAPPPAA + AAPPPAA + AAPPPAA + AAAAAAA + XAAAAAX""", """ + Layer 6: + + XAAAAAX + AMMMMMA + AMCCCMA + AMCCCMA + AMCCCMA + AMMMMMA + XAAAAAX""", """ + Layer 7: + + XXXXXXX + XXXXXXX + XXXXXXX + XXXXXXX + XXXXXXX + XXXXXXX + XXXXXXX""", }); } public static ItemStack ItemBookWritten_ThermalBoiler; diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java index b359fe99ba..7aa9c73236 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_HANDLER.java @@ -48,7 +48,6 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechCyclotron; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechDehydrator; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechEnergyBuffer; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechFactoryGradeReplacementMultis; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeneratorsULV; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechGeothermalThermalGenerator; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechHiAmpTransformer; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechIndustrialAlloySmelter; @@ -90,12 +89,10 @@ import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSemiFluidgenerator import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSimpleWasher; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarGenerators; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSolarTower; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamCondenser; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSteamMultis; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechSuperChests; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThaumcraftDevices; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechThreadedBuffers; -import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredChunkloaders; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTieredFluidTanks; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechTreeFarmerTE; import gtPlusPlus.xmod.gregtech.registration.gregtech.GregtechWirelessChargers; @@ -125,11 +122,9 @@ public class COMPAT_HANDLER { */ new RECIPES_LaserEngraver(); - GregtechGeneratorsULV.run(); GregtechEnergyBuffer.run(); GregtechLFTR.run(); GregtechNuclearSaltProcessingPlant.run(); - GregtechSteamCondenser.run(); GregtechIndustrialCentrifuge.run(); GregtechIndustrialCokeOven.run(); GregtechIndustrialPlatePress.run(); @@ -163,7 +158,6 @@ public class COMPAT_HANDLER { GregtechIndustrialCuttingFactory.run(); GregtechSuperChests.run(); GregtechIndustrialFishPond.run(); - GregtechTieredChunkloaders.run(); GregtechIndustrialExtruder.run(); GregtechIndustrialMultiMachine.run(); GregtechBufferDynamos.run(); @@ -250,11 +244,11 @@ public class COMPAT_HANDLER { runQueuedOnLoadComplete(event); } - public static final AutoMap<RunnableWithInfo<String>> mRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>(); - public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<RunnableWithInfo<String>>(); + public static final AutoMap<RunnableWithInfo<String>> mRecipesToGenerate = new AutoMap<>(); + public static final AutoMap<RunnableWithInfo<String>> mGtRecipesToGenerate = new AutoMap<>(); - public static final AutoMap<RunnableWithInfo<String>> mObjectsToRunInPostInit = new AutoMap<RunnableWithInfo<String>>(); - public static final AutoMap<ItemPackage> mObjectsToRunInOnLoadComplete = new AutoMap<ItemPackage>(); + public static final AutoMap<RunnableWithInfo<String>> mObjectsToRunInPostInit = new AutoMap<>(); + public static final AutoMap<ItemPackage> mObjectsToRunInOnLoadComplete = new AutoMap<>(); public static void runQueuedRecipes() { // Add autogenerated Recipes from Item Components diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java index 0593c833f3..af09762c08 100644 --- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java +++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java @@ -10,7 +10,6 @@ import gtPlusPlus.xmod.bop.HANDLER_BiomesOPlenty; import gtPlusPlus.xmod.forestry.HANDLER_FR; import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.ic2.HANDLER_IC2; -import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks; import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft; import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF; import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers; @@ -30,7 +29,6 @@ public class COMPAT_IntermodStaging { public static void init(FMLInitializationEvent init) { HANDLER_GT.init(); HANDLER_TF.init(); - HANDLER_OpenBlocks.init(); } public static void postInit(FMLPostInitializationEvent postinit) { @@ -42,7 +40,6 @@ public class COMPAT_IntermodStaging { HANDLER_Tinkers.postInit(); HANDLER_CropsPlusPlus.postInit(postinit); HANDLER_Railcraft.postInit(); - HANDLER_OpenBlocks.postInit(); RecipeRemovals.postInit(); } diff --git a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java index a2f08e2ba1..2da010cb1f 100644 --- a/src/main/java/gtPlusPlus/core/handler/GuiHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/GuiHandler.java @@ -15,7 +15,6 @@ import gtPlusPlus.core.container.Container_DecayablesChest; import gtPlusPlus.core.container.Container_FishTrap; import gtPlusPlus.core.container.Container_PestKiller; import gtPlusPlus.core.container.Container_ProjectTable; -import gtPlusPlus.core.container.Container_RoundRobinator; import gtPlusPlus.core.container.Container_SuperJukebox; import gtPlusPlus.core.container.Container_VolumetricFlaskSetter; import gtPlusPlus.core.gui.beta.Gui_ID_Registry; @@ -25,7 +24,6 @@ import gtPlusPlus.core.gui.machine.GUI_DecayablesChest; import gtPlusPlus.core.gui.machine.GUI_FishTrap; import gtPlusPlus.core.gui.machine.GUI_PestKiller; import gtPlusPlus.core.gui.machine.GUI_ProjectTable; -import gtPlusPlus.core.gui.machine.GUI_RoundRobinator; import gtPlusPlus.core.gui.machine.GUI_SuperJukebox; import gtPlusPlus.core.gui.machine.GUI_VolumetricFlaskSetter; import gtPlusPlus.core.interfaces.IGuiManager; @@ -35,7 +33,6 @@ import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; public class GuiHandler implements IGuiHandler { @@ -54,7 +51,7 @@ public class GuiHandler implements IGuiHandler { public static final int GUI13 = 12; // Decayables Chest public static final int GUI14 = 13; // Super Jukebox public static final int GUI15 = 14; // Pest Killer - public static final int GUI16 = 15; // Round-Robinator + public static final int GUI16 = 15; // None public static final int GUI17 = 16; // None public static final int GUI18 = 17; // Volumetric Flask Setter @@ -88,8 +85,6 @@ public class GuiHandler implements IGuiHandler { return new Container_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te); } else if (ID == GUI15) { return new Container_PestKiller(player.inventory, (TileEntityPestKiller) te); - } else if (ID == GUI16) { - return new Container_RoundRobinator(player.inventory, (TileEntityRoundRobinator) te); } else if (ID == GUI18) { return new Container_VolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te); } @@ -130,8 +125,6 @@ public class GuiHandler implements IGuiHandler { return new GUI_SuperJukebox(player.inventory, (TileEntitySuperJukebox) te); } else if (ID == GUI15) { return new GUI_PestKiller(player.inventory, (TileEntityPestKiller) te); - } else if (ID == GUI16) { - return new GUI_RoundRobinator(player.inventory, (TileEntityRoundRobinator) te); } else if (ID == GUI18) { return new GUI_VolumetricFlaskSetter( new Container_VolumetricFlaskSetter(player.inventory, (TileEntityVolumetricFlaskSetter) te)); diff --git a/src/main/java/gtPlusPlus/core/handler/MobMentality.java b/src/main/java/gtPlusPlus/core/handler/MobMentality.java deleted file mode 100644 index 15be7cc4f4..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/MobMentality.java +++ /dev/null @@ -1,61 +0,0 @@ -package gtPlusPlus.core.handler; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.IMob; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraftforge.event.entity.living.LivingHurtEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.core.util.minecraft.EntityUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; - -public class MobMentality { - - public static HashSet<Class<EntityLivingBase>> sIgnoredTypes = new HashSet<Class<EntityLivingBase>>(); - - @SubscribeEvent - public void onEntityDamaged(LivingHurtEvent event) { - final EntityLivingBase target = event.entityLiving; - for (Class<EntityLivingBase> aEntityClass : sIgnoredTypes) { - if (aEntityClass.isInstance(target)) { - return; - } - } - if (target instanceof EntityLivingBase) { - final EntityLivingBase entity = target; - final Entity attacker = event.source.getSourceOfDamage(); - if ( - /* this.configuration.shouldIgnoreNeutralMobs() && */ !(entity instanceof IMob)) { - return; - } - if (attacker == null) { - return; - } - if (attacker instanceof EntityLivingBase && !PlayerUtils.isRealPlayer((EntityLivingBase) attacker)) { - return; - } - if (attacker instanceof EntityPlayer && PlayerUtils.isCreative((EntityPlayer) attacker)) { - return; - } - if (attacker instanceof EntityLivingBase) { - List<Entity> aEntityList = target.worldObj.loadedEntityList; - List<EntityLivingBase> aRangedEntity = new ArrayList<EntityLivingBase>(); - for (Entity aEntity : aEntityList) { - if (target.getClass().isInstance(aEntity)) { - if (EntityUtils.getDistance(target, aEntity) <= 32) { - aRangedEntity.add((EntityLivingBase) aEntity); - } - } - } - for (EntityLivingBase aEntity : aRangedEntity) { - aEntity.setRevengeTarget((EntityLivingBase) attacker); - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java index 8e04b5b68f..9a2f57233b 100644 --- a/src/main/java/gtPlusPlus/core/handler/PacketHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/PacketHandler.java @@ -30,12 +30,12 @@ public class PacketHandler { /** * Registers a message and message handler */ - private static final void registerMessage(Class handlerClass, Class messageClass) { + private static void registerMessage(Class handlerClass, Class messageClass) { Side side = AbstractClientMessageHandler.class.isAssignableFrom(handlerClass) ? Side.CLIENT : Side.SERVER; registerMessage(handlerClass, messageClass, side); } - private static final void registerMessage(Class handlerClass, Class messageClass, Side side) { + private static void registerMessage(Class handlerClass, Class messageClass, Side side) { INSTANCE.registerMessage(handlerClass, messageClass, packetId++, side); if (AbstractPacket.class.isInstance(messageClass.getClass())) { AbstractPacket aPacket = ReflectionUtils.createNewInstanceFromConstructor( diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java index 371c8f21e4..16781cea8c 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/DecayableRecipe.java @@ -8,7 +8,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class DecayableRecipe { - public static final AutoMap<DecayableRecipe> mRecipes = new AutoMap<DecayableRecipe>(); + public static final AutoMap<DecayableRecipe> mRecipes = new AutoMap<>(); public final int mTime; public final ItemStack mInput; @@ -23,8 +23,7 @@ public class DecayableRecipe { @Override public boolean equals(Object o) { - if (o instanceof DecayableRecipe) { - DecayableRecipe i = (DecayableRecipe) o; + if (o instanceof DecayableRecipe i) { if (i.mTime == this.mTime && GT_Utility.areStacksEqual(mInput, i.mInput) && GT_Utility.areStacksEqual(mOutput, i.mOutput)) { return true; diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java index 3e20194498..9eb3a1826e 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/LateRegistrationHandler.java @@ -13,7 +13,7 @@ public class LateRegistrationHandler { init(); } - private static final void init() { + private static void init() { for (final ShapedRecipeObject item : COMPAT_HANDLER.AddRecipeQueue) { item.buildRecipe(); } diff --git a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java index 005ebba204..abf7300f7a 100644 --- a/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/Recipes/RegistrationHandler.java @@ -3,7 +3,6 @@ package gtPlusPlus.core.handler.Recipes; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.recipe.RECIPES_General; -import gtPlusPlus.core.recipe.RECIPES_MachineComponents; import gtPlusPlus.core.recipe.RECIPES_Machines; import gtPlusPlus.core.recipe.RECIPE_Batteries; @@ -16,10 +15,9 @@ public class RegistrationHandler { init(); } - private static final void init() { + private static void init() { RECIPES_General.loadRecipes(); RECIPES_Machines.loadRecipes(); - RECIPES_MachineComponents.loadRecipes(); RECIPE_Batteries.loadRecipes(); Logger.INFO("Loaded: " + recipesSuccess + " Failed: " + recipesFailed); COMPAT_HANDLER.areInitItemsLoaded = true; diff --git a/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java b/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java index 3546d47f65..678f2ac62f 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/CustomMovementHandler.java @@ -57,8 +57,6 @@ public class CustomMovementHandler { // Check to see if Enabled - Added 6/17/14 to provide option to disable Sneak Toggle final boolean isSneaking = SneakManager.get(thisPlayer).Sneaking(); - // Utils.LOG_INFO("Can sneak: "+isSneaking); - // Utils.LOG_INFO("Can sprint: "+SneakManager.Sprinting()); if (isSneaking) { // Key Pressed if (settings.keyBindSneak.getIsKeyPressed() && !this.handledSneakPress) { diff --git a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java index d464f953a3..c92985b802 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/EntityDeathHandler.java @@ -19,8 +19,8 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; public class EntityDeathHandler { - private static final HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>> mMobDropMap = new HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>>(); - private static final HashSet<Class> mInternalClassKeyCache = new HashSet<Class>(); + private static final HashMap<Class, AutoMap<Triplet<ItemStack, Integer, Integer>>> mMobDropMap = new HashMap<>(); + private static final HashSet<Class> mInternalClassKeyCache = new HashSet<>(); /** * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. @@ -31,13 +31,10 @@ public class EntityDeathHandler { * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok) */ public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aMaxAmount, int aChance) { - Triplet<ItemStack, Integer, Integer> aData = new Triplet<ItemStack, Integer, Integer>( - aStack, - aMaxAmount, - aChance); + Triplet<ItemStack, Integer, Integer> aData = new Triplet<>(aStack, aMaxAmount, aChance); AutoMap<Triplet<ItemStack, Integer, Integer>> aDataMap = mMobDropMap.get(aMobClass); if (aDataMap == null) { - aDataMap = new AutoMap<Triplet<ItemStack, Integer, Integer>>(); + aDataMap = new AutoMap<>(); } aDataMap.put(aData); mMobDropMap.put(aMobClass, aDataMap); @@ -49,9 +46,7 @@ public class EntityDeathHandler { + ") as a valid drop for " + aMobClass.getCanonicalName()); - if (!mInternalClassKeyCache.contains(aMobClass)) { - mInternalClassKeyCache.add(aMobClass); - } + mInternalClassKeyCache.add(aMobClass); } private static ItemStack processItemDropTriplet(Triplet<ItemStack, Integer, Integer> aData) { @@ -117,7 +112,6 @@ public class EntityDeathHandler { @SubscribeEvent public void onEntityDrop(LivingDropsEvent event) { - boolean aDidDrop = false; if (event == null || event.entityLiving == null) { return; } @@ -125,9 +119,9 @@ public class EntityDeathHandler { EntityPlayer aPlayer = (EntityPlayer) event.entityLiving; dropMeatFromPlayer(aPlayer); } else { - for (Class c : mInternalClassKeyCache) { + for (Class<?> c : mInternalClassKeyCache) { if (c.isInstance(event.entityLiving)) { - aDidDrop = processDropsForMob(event.entityLiving); + processDropsForMob(event.entityLiving); } } } diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java index 867a2538f3..650fd70efd 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java @@ -11,6 +11,7 @@ import gregtech.api.enums.Mods; public class GeneralTooltipEventHandler { @Optional.Method(modid = Mods.Names.ADVANCED_SOLAR_PANEL) + @SuppressWarnings("unused") public static void molecularTransformer(ItemTooltipEvent event) { if (event.itemStack.getItem() == Item.getItemFromBlock(AdvancedSolarPanel.blockMolecularTransformer)) { event.toolTip.add("" + EnumChatFormatting.RED + "Disabled, Use the multiblock"); diff --git a/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java deleted file mode 100644 index fec88a5d74..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ /dev/null @@ -1,104 +0,0 @@ -package gtPlusPlus.core.handler.events; - -import java.util.Timer; -import java.util.TimerTask; -import java.util.UUID; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.proxy.ClientProxy; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.player.PlayerCache; - -public class LoginEventHandler { - - public String localPlayersName; - public UUID localPlayersUUID; - private EntityPlayer localPlayerRef; - - @SubscribeEvent - public void onPlayerLogin(final PlayerEvent.PlayerLoggedInEvent event) { - - this.localPlayerRef = event.player; - this.localPlayersName = event.player.getDisplayName(); - this.localPlayersUUID = event.player.getUniqueID(); - - // Set this for easier use elsewhere. - if (event.player.getEntityWorld().isRemote) { - ClientProxy.playerName = this.localPlayersName; - } - - try { - // new SegmentAnalytics(event.player); - } catch (Throwable t) { - // SegmentAnalytics.LOG("Failed to create Analytics submission during log in process."); - } - - try { - - if (this.localPlayerRef instanceof EntityPlayerMP) { - - // Populates player cache - if (!this.localPlayerRef.worldObj.isRemote) { - PlayerCache.appendParamChanges(this.localPlayersName, this.localPlayersUUID.toString()); - } - - /* - * if (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009") || - * localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ - * Utils.LOG_INFO("Spawning a new Santa Thread."); Thread t = new Thread() { UUID threadHandlerIDthing = - * localPlayersUUID; - * @Override public void run() { while(true && Minecraft.getMinecraft().getIntegratedServer() != null) { - * try { if(localPlayerRef == null){ localPlayerRef = - * Utils.getPlayerOnServerFromUUID(threadHandlerIDthing); } //ImQ009 is a legend. if - * (localPlayerRef.getCommandSenderName().toLowerCase().equalsIgnoreCase("ImQ009")){ - * Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); - * localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems. - * itemIngotRaisinBread, MathUtils.randInt(1, 5))); } if - * (localPlayerRef.getCommandSenderName().toLowerCase().contains("player")){ - * Utils.messagePlayer(localPlayerRef, "Enjoy some complimentary Raisin Bread."); - * localPlayerRef.inventory.addItemStackToInventory(UtilsItems.getSimpleStack(ModItems. - * itemIngotRaisinBread, MathUtils.randInt(1, 5))); } Thread.sleep(1000*60*MathUtils.randInt(15, 90)); } - * catch (InterruptedException ie) { Utils.LOG_INFO("Santa Mode Disabled."); } } - * Utils.LOG_INFO("Thread Stopped. Handler Closed."); } }; //t.start(); } - */ - - } - } catch (final Throwable errr) { - Logger.INFO("Login Handler encountered an error."); - } - } - - // Handles notifying the player about a version update. - public Timer ShortTimer(EntityPlayer localPlayer, final int seconds) { - Timer timer; - timer = new Timer(); - timer.schedule(new NotifyPlayer(localPlayer), seconds * 1000); - return timer; - } - - // Timer Task for notifying the player. - class NotifyPlayer extends TimerTask { - - final EntityPlayer toMessage; - - public NotifyPlayer(EntityPlayer localPlayer) { - toMessage = localPlayer; - } - - @Override - public void run() { - if (toMessage != null) { - if (toMessage instanceof EntityPlayerMP) { - PlayerUtils.messagePlayer( - toMessage, - "You're not using the latest recommended version of GT++, consider updating."); - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java deleted file mode 100644 index 05dc46b2b2..0000000000 --- a/src/main/java/gtPlusPlus/core/handler/events/PickaxeBlockBreakEventHandler.java +++ /dev/null @@ -1,20 +0,0 @@ -package gtPlusPlus.core.handler.events; - -import net.minecraftforge.event.entity.player.PlayerInteractEvent; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; - -public class PickaxeBlockBreakEventHandler { - - @SubscribeEvent - public void onPlayerInteraction(final PlayerInteractEvent aEvent) { - if ((aEvent.entityPlayer != null) && (aEvent.entityPlayer.worldObj != null) - && (aEvent.action != null) - && (aEvent.world.provider != null) - && !aEvent.entityPlayer.worldObj.isRemote - && (aEvent.action != null) - && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR)) { - // Utils.LOG_ERROR("Test"); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java index 5fa5739940..8fb4a61c44 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/events/PlayerSleepEventHandler.java @@ -18,14 +18,14 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; +import gtPlusPlus.preloader.CORE_Preloader; public class PlayerSleepEventHandler { private static Field sEffectDuration = ReflectionUtils - .getField(PotionEffect.class, DevHelper.isObfuscatedEnvironment() ? "field_76460_b" : "duration"); - private static ArrayList<Potion> sPositiveEffects = new ArrayList<Potion>(); - private static ArrayList<Potion> sNegativeEffects = new ArrayList<Potion>(); + .getField(PotionEffect.class, !CORE_Preloader.DEV_ENVIRONMENT ? "field_76460_b" : "duration"); + private static ArrayList<Potion> sPositiveEffects = new ArrayList<>(); + private static ArrayList<Potion> sNegativeEffects = new ArrayList<>(); public static void init() { Utils.registerEvent(new PlayerSleepEventHandler()); diff --git a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java index 14e9af20ec..ad6477026f 100644 --- a/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java +++ b/src/main/java/gtPlusPlus/core/handler/events/SneakManager.java @@ -10,7 +10,7 @@ public class SneakManager { // We make this a singleton for clientside data storage. - public static ConcurrentHashMap<String, SneakManager> mPlayerCache = new ConcurrentHashMap<String, SneakManager>(); + public static ConcurrentHashMap<String, SneakManager> mPlayerCache = new ConcurrentHashMap<>(); private static void addPlayer(EntityPlayer aPlayer) { String aKey = getKey(aPlayer); diff --git a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java index e9e2609e1e..43b7d3a2d1 100644 --- a/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java +++ b/src/main/java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java @@ -18,7 +18,7 @@ import net.minecraft.world.World; public class Workbench_CraftingHandler { private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler(); - private final List<IRecipe> recipes = new ArrayList<IRecipe>(); + private final List<IRecipe> recipes = new ArrayList<>(); public static final Workbench_CraftingHandler getInstance() { return instance; @@ -44,8 +44,7 @@ public class Workbench_CraftingHandler { if (par2ArrayOfObj[i] instanceof String[]) { final String as[] = (String[]) par2ArrayOfObj[i++]; - for (int l = 0; l < as.length; l++) { - final String s2 = as[l]; + for (final String s2 : as) { k++; j = s2.length(); s = (new StringBuilder()).append(s).append(s2).toString(); @@ -59,7 +58,7 @@ public class Workbench_CraftingHandler { } } - final HashMap<Character, ItemStack> hashmap = new HashMap<Character, ItemStack>(); + final HashMap<Character, ItemStack> hashmap = new HashMap<>(); for (; i < par2ArrayOfObj.length; i += 2) { final Character character = (Character) par2ArrayOfObj[i]; @@ -92,13 +91,11 @@ public class Workbench_CraftingHandler { } public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { - final ArrayList<ItemStack> arraylist = new ArrayList<ItemStack>(); + final ArrayList<ItemStack> arraylist = new ArrayList<>(); final Object aobj[] = par2ArrayOfObj; final int i = aobj.length; - for (int j = 0; j < i; j++) { - final Object obj = aobj[j]; - + for (final Object obj : aobj) { if (obj instanceof ItemStack) { arraylist.add(((ItemStack) obj).copy()); continue; @@ -144,9 +141,7 @@ public class Workbench_CraftingHandler { * item.getMaxDamage() - j1; if (k1 < 0) { k1 = 0; } return new ItemStack(itemstack.itemID, 1, k1); } */ - for (int k = 0; k < this.recipes.size(); k++) { - final IRecipe irecipe = this.recipes.get(k); - + for (final IRecipe irecipe : this.recipes) { if (irecipe.matches(par1InventoryCrafting, par2World)) { return irecipe.getCraftingResult(par1InventoryCrafting); } diff --git a/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java b/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java deleted file mode 100644 index bb051daecd..0000000000 --- a/src/main/java/gtPlusPlus/core/inventories/Inventory_RoundRobinator.java +++ /dev/null @@ -1,154 +0,0 @@ -package gtPlusPlus.core.inventories; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -public class Inventory_RoundRobinator implements IInventory { - - private final String name = "Round Robinator"; - - /** Defining your inventory size this way is handy */ - public static final int INV_SIZE = 4; - - /** Inventory's size must be same as number of slots you add to the Container class */ - private ItemStack[] inventory = new ItemStack[INV_SIZE]; - - public void readFromNBT(final NBTTagCompound nbt) { - final NBTTagList list = nbt.getTagList("Items", 10); - this.inventory = new ItemStack[INV_SIZE]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 0) && (slot < INV_SIZE)) { - // Utils.LOG_INFO("Trying to read NBT data from inventory."); - this.inventory[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - - public void writeToNBT(final NBTTagCompound nbt) { - final NBTTagList list = new NBTTagList(); - for (int i = 0; i < INV_SIZE; i++) { - final ItemStack stack = this.inventory[i]; - if (stack != null) { - // Utils.LOG_INFO("Trying to write NBT data to inventory."); - final NBTTagCompound data = new NBTTagCompound(); - stack.writeToNBT(data); - data.setInteger("Slot", i); - list.appendTag(data); - } - } - nbt.setTag("Items", list); - } - - @Override - public int getSizeInventory() { - return this.inventory.length; - } - - public ItemStack[] getInventory() { - return this.inventory; - } - - @Override - public ItemStack getStackInSlot(final int slot) { - return this.inventory[slot]; - } - - @Override - public ItemStack decrStackSize(final int slot, final int amount) { - ItemStack stack = this.getStackInSlot(slot); - if (stack != null) { - if (stack.stackSize > amount) { - stack = stack.splitStack(amount); - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } else { - // this method also calls markDirty, so we don't need to call it again - this.setInventorySlotContents(slot, null); - } - } - return stack; - } - - @Override - public ItemStack getStackInSlotOnClosing(final int slot) { - final ItemStack stack = this.getStackInSlot(slot); - this.setInventorySlotContents(slot, null); - return stack; - } - - @Override - public void setInventorySlotContents(final int slot, final ItemStack stack) { - this.inventory[slot] = stack; - - if ((stack != null) && (stack.stackSize > this.getInventoryStackLimit())) { - stack.stackSize = this.getInventoryStackLimit(); - } - - // Don't forget this line or your inventory will not be saved! - this.markDirty(); - } - - // 1.7.2+ renamed to getInventoryName - @Override - public String getInventoryName() { - return this.name; - } - - // 1.7.2+ renamed to hasCustomInventoryName - @Override - public boolean hasCustomInventoryName() { - return this.name.length() > 0; - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - /** - * This is the method that will handle saving the inventory contents, as it is called (or should be called!) anytime - * the inventory changes. Perfect. Much better than using onUpdate in an Item, as this will also let you change - * things in your inventory without ever opening a Gui, if you want. - */ - // 1.7.2+ renamed to markDirty - @Override - public void markDirty() { - for (int i = 0; i < this.getSizeInventory(); ++i) { - final ItemStack temp = this.getStackInSlot(i); - if (temp != null) { - // Utils.LOG_INFO("Slot "+i+" contains "+temp.getDisplayName()+" x"+temp.stackSize); - } - - if ((temp != null) && (temp.stackSize == 0)) { - this.inventory[i] = null; - } - } - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return true; - } - - // 1.7.2+ renamed to openInventory(EntityPlayer player) - @Override - public void openInventory() {} - - // 1.7.2+ renamed to closeInventory(EntityPlayer player) - @Override - public void closeInventory() {} - - /** - * This method doesn't seem to do what it claims to do, as items can still be left-clicked and placed in the - * inventory even when this returns false - */ - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index ef18d4dd5b..d8dc72d700 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -61,16 +61,12 @@ import gtPlusPlus.core.item.general.chassis.ItemBoilerChassis; import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoil; import gtPlusPlus.core.item.general.chassis.ItemDehydratorCoilWire; import gtPlusPlus.core.item.general.spawn.ItemCustomSpawnEgg; -import gtPlusPlus.core.item.general.throwables.ItemHydrofluoricAcidPotion; -import gtPlusPlus.core.item.general.throwables.ItemSulfuricAcidPotion; -import gtPlusPlus.core.item.general.throwables.ItemThrowableBomb; import gtPlusPlus.core.item.init.ItemsFoods; import gtPlusPlus.core.item.materials.DustDecayable; import gtPlusPlus.core.item.tool.misc.DebugScanner; import gtPlusPlus.core.item.tool.misc.GregtechPump; import gtPlusPlus.core.item.wearable.WearableLoader; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.material.ALLOY; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; @@ -100,7 +96,7 @@ public final class ModItems { public static ItemCustomSpawnEgg itemCustomSpawnEgg; public static Item itemIngotBatteryAlloy; - public static Item itemPlateBatteryAlloy; + public static Item itemHydrogenBlob; public static Item itemBedLocator_Base; @@ -109,7 +105,6 @@ public final class ModItems { public static Item itemPersonalCloakingDevice; public static Item itemPersonalHealingDevice; public static Item itemSupremePizzaGloves; - public static Item itemSlowBuildingRing; public static ItemBlueprint itemBlueprintBase; @@ -180,9 +175,6 @@ public final class ModItems { public static Item itemHalfCompleteCasings; - public static Item itemSulfuricPotion; - public static Item itemHydrofluoricPotion; - public static Item itemCustomBook; // Unstable Elements & Related Content @@ -223,11 +215,6 @@ public final class ModItems { public static ItemDummyResearch itemDummyResearch; - public static CoreItem itemBombCasing; - public static CoreItem itemBombUnf; - public static CoreItem itemDetCable; - public static ItemThrowableBomb itemBomb; - public static BaseItemMetaFood itemMetaFood; public static ItemMagicFeather itemMagicFeather; @@ -287,14 +274,7 @@ public final class ModItems { EnumChatFormatting.GRAY, false, Utils.rgbtoHexValue(255, 255, 255)).setTextureName(GregTech.ID + ":" + "gt.metaitem.01/" + "761"); - itemSulfuricPotion = new ItemSulfuricAcidPotion( - "itemSulfuricPotion", - "Throwable Vial of Sulfuric Acid", - "Burn your foes alive!").setTextureName(GTPlusPlus.ID + ":itemSulfuricAcidPotion"); - itemHydrofluoricPotion = new ItemHydrofluoricAcidPotion( - "itemHydrofluoricPotion", - "Throwable Vial of Hydrofluoric Acid", - "They won't see this coming, nor anything after!").setTextureName(GTPlusPlus.ID + ":itemPotion"); + // Start meta Item Generation ItemsFoods.load(); @@ -378,9 +358,6 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.TUNGSTEN_TITANIUM_CARBIDE); // LFTR Fuel components - // MaterialGenerator.generate(MISC_MATERIALS.HYDROXIDE); //LFTR fuel component - // MaterialGenerator.generate(MISC_MATERIALS.AMMONIA); //LFTR fuel component - // MaterialGenerator.generate(MISC_MATERIALS.AMMONIUM); //LFTR fuel component MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_BIFLUORIDE); // LFTR fuel component MaterialGenerator.generateNuclearDusts(FLUORIDES.BERYLLIUM_HYDROXIDE); // LFTR fuel component // MaterialGenerator.generateNuclearDusts(FLUORIDES.AMMONIUM_TETRAFLUOROBERYLLATE); // LFTR fuel component @@ -613,12 +590,6 @@ public final class ModItems { // fluidLftrCore4 = FluidUtils.addGTFluidNoPrefix("LiFBeF2UF4", "LiFBeF2UF4", new short[]{50, 255, 100, 100}, 0, // 800, null, CI.emptyCells(1), 1000, true); // LFTR Blanket Fluid Processing - // fluidLftrBlanket1 = FluidUtils.addGTFluidNoPrefix("LiFThF4", "LiFThF4", new short[]{50, 150, 255, 50}, 0, - // 500, null, CI.emptyCells(1), 1000, true); - // fluidLftrBlanket2 = FluidUtils.addGTFluidNoPrefix("LiFBeF2ThF4", "LiFBeF2ThF4", new short[]{100, 150, 100, - // 100}, 0, 500, null, CI.emptyCells(1), 1000, true); - // fluidLftrBlanket3 = FluidUtils.addGTFluidNoPrefix("UF6F2", "UF6F2", new short[]{10, 150, 10, 100}, 0, 500, - // null, CI.emptyCells(1), 1000, true); fluidNuclearWaste = FluidUtils.addGTFluidNoPrefix( "nuclear.waste", "Nuclear Waste", @@ -666,10 +637,6 @@ public final class ModItems { * GT_OreDictUnificator.registerOre("dustZrF4", * ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); */ - // GT_OreDictUnificator.registerOre("cellZrF4", - // ItemUtils.getItemStackOfAmountFromOreDict("cellZirconiumTetrafluoride", 1)); - // GT_OreDictUnificator.registerOre("dustZrF4", - // ItemUtils.getItemStackOfAmountFromOreDict("dustZirconiumTetrafluoride", 1)); fluidZrF4 = FluidUtils.generateFluidNoPrefix( "ZirconiumTetrafluoride", "Zirconium Tetrafluoride", @@ -761,7 +728,7 @@ public final class ModItems { "dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, - new String[] { "" + StringUtils.superscript("238Np"), + new String[] { StringUtils.superscript("238Np"), "Result: Plutonium 238 (" + StringUtils.superscript("238Pu") + ")" }, ELEMENT.getInstance().PLUTONIUM238.getDust(1).getItem(), 5); @@ -774,7 +741,7 @@ public final class ModItems { "dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, - new String[] { "" + StringUtils.superscript("226Ra"), + new String[] { StringUtils.superscript("226Ra"), "Result: Radon (" + StringUtils.superscript("222Rn") + ")" }, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5); @@ -782,7 +749,7 @@ public final class ModItems { "dustProtactinium233", ELEMENT.getInstance().PROTACTINIUM.getRgbAsHex(), 32000, - new String[] { "" + StringUtils.superscript("233Pa"), + new String[] { StringUtils.superscript("233Pa"), "Result: Uranium 233(" + StringUtils.superscript("233U") + ")" }, ELEMENT.getInstance().URANIUM233.getDust(1).getItem(), 6); @@ -790,7 +757,7 @@ public final class ModItems { "dustMolybdenum99", ELEMENT.getInstance().MOLYBDENUM.getRgbAsHex(), 16450, - new String[] { "" + StringUtils.superscript("99Mo"), + new String[] { StringUtils.superscript("99Mo"), "Result: Technicium 99ᵐ (" + StringUtils.superscript("99ᵐTc") + ")" }, dustTechnetium99M, 4); @@ -824,15 +791,6 @@ public final class ModItems { // Milled Ore Processing new MilledOreProcessing(); - // Bombs - itemBombCasing = new CoreItem("itemBombCasing", "Bomb Casing", tabMisc); - itemBombCasing.setTextureName(GTPlusPlus.ID + ":bomb_casing"); - itemBombUnf = new CoreItem("itemBombUnf", "Bomb (unf)", tabMisc); - itemBombUnf.setTextureName(GTPlusPlus.ID + ":bomb_casing"); - itemDetCable = new CoreItem("itemDetCable", "Det. Cable", tabMisc); - itemDetCable.setTextureName("string"); - itemBomb = new ItemThrowableBomb(); - // IC2 Exp Logger.INFO("IndustrialCraft2 Found - Loading Resources."); @@ -848,12 +806,6 @@ public final class ModItems { Logger.INFO("Baubles Not Found - Skipping Resources."); } - // Special Item Handling Case - if (ConfigSwitches.enableAlternativeBatteryAlloy) { - ModItems.itemPlateBatteryAlloy = ItemUtils - .generateSpecialUsePlate("BatteryAlloy", "Battery Alloy", new short[] { 35, 228, 141 }, 0); - } - // Buffer Cores! Item itemBufferCore; for (int i = 1; i <= 10; i++) { @@ -877,7 +829,7 @@ public final class ModItems { // Custom GT++ Crafting Components /* - * Try generate dusts for missing rare earth materials if they don't exist + * Try to generate dusts for missing rare earth materials if they don't exist */ if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustGadolinium", 1))) { ItemUtils.generateSpecialUseDusts( diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java index a0f7c9b34f..3b22db5b6f 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemBurnable.java @@ -23,7 +23,7 @@ public class BaseItemBurnable extends CoreItem { } public void registerFuel(int burn) { - CORE.burnables.add(new Pair<Integer, ItemStack>(burn, ItemUtils.getSimpleStack(this, 1))); + CORE.burnables.add(new Pair<>(burn, ItemUtils.getSimpleStack(this, 1))); } public final void registerOrdictionary(String name) { diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java index 485e508805..dea21a97c4 100644 --- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java @@ -127,7 +127,7 @@ public class BaseItemComponent extends Item { // Register Component Map<String, ItemStack> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); if (aMap == null) { - aMap = new HashMap<String, ItemStack>(); + aMap = new HashMap<>(); } String aKey = componentType.getGtOrePrefix().name(); ItemStack x = aMap.get(aKey); @@ -417,10 +417,10 @@ public class BaseItemComponent extends Item { FINEWIRE("FineWire", "Fine @ Wire", "wireFine", OrePrefixes.wireFine), PLATEDENSE("PlateDense", "Dense @ Plate", "plateDense", OrePrefixes.plateDense),; - private String COMPONENT_NAME; - private String DISPLAY_NAME; - private String OREDICT_NAME; - private OrePrefixes a_GT_EQUAL; + private final String COMPONENT_NAME; + private final String DISPLAY_NAME; + private final String OREDICT_NAME; + private final OrePrefixes a_GT_EQUAL; private ComponentTypes(final String LocalName, final String DisplayName, final String OreDictName, final OrePrefixes aPrefix) { diff --git a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java index b1b9e05b9e..f328479b70 100644 --- a/src/main/java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/main/java/gtPlusPlus/core/item/base/CoreItem.java @@ -221,8 +221,6 @@ public class CoreItem extends Item { list.add(tooltip); } else break; } - // list.add(this.descColour+this.itemDescription); - // super.addInformation(stack, aPlayer, list, bool); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index cd1331be55..99b6407249 100644 --- a/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/main/java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -24,8 +24,6 @@ public class BaseItemCell extends BaseItemComponent { public BaseItemCell(final Material material) { super(material, BaseItemComponent.ComponentTypes.CELL); this.fluidColour = (short[]) material.getRGBA(); - // FluidContainerRegistry.registerFluidContainer(material.getFluid(1000), ItemUtils.getSimpleStack(this), - // Ic2Items.cell.copy()); } public BaseItemCell(final String unlocalName, final String localName, final short[] RGBa) { diff --git a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index ba2b48b363..08df349d66 100644 --- a/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/main/java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -93,7 +93,7 @@ public class BaseItemDustUnique extends Item { // Register Component Map<String, ItemStack> aMap = Material.mComponentMap.get(aName); if (aMap == null) { - aMap = new HashMap<String, ItemStack>(); + aMap = new HashMap<>(); } String aKey = OrePrefixes.dust.name(); ItemStack x = aMap.get(aKey); diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 99fef5e19e..40ecd9d3e7 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -91,8 +91,6 @@ public class BaseItemIngotHot extends BaseItemIngot { } else { this.base = i.registerIcon( GTPlusPlus.ID + ":" + "item" + BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()); - // this.overlay = i.registerIcon(GTPlusPlus.ID + ":" + - // "item"+BaseItemComponent.ComponentTypes.HOTINGOT.getComponent()+"_Overlay"); } // this.overlay = cellMaterial.getFluid(1000).getFluid().get } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java index cde5ec3f24..e13136d87e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockGtBlock.java @@ -22,7 +22,7 @@ import gtPlusPlus.core.util.sys.KeyboardUtils; public class ItemBlockGtBlock extends ItemBlock { - public static HashMap<String, String> sNameCache = new HashMap<String, String>(); + public static HashMap<String, String> sNameCache = new HashMap<>(); protected final int blockColour; private int sRadiation; @@ -51,8 +51,7 @@ public class ItemBlockGtBlock extends ItemBlock { this.blockColour = block.getBlockColor(); } - if (block instanceof BlockBaseModular) { - BlockBaseModular g = (BlockBaseModular) block; + if (block instanceof BlockBaseModular g) { this.mMaterial = g.getMaterialEx(); this.thisBlockType = g.thisBlock; } else { @@ -87,11 +86,6 @@ public class ItemBlockGtBlock extends ItemBlock { @Override public String getItemStackDisplayName(ItemStack stack) { return this.thisBlock.getLocalizedName(); - // Logger.INFO("Unlocal Name: "+this.getUnlocalizedName()); - // String aFormattedLangName = GetProperName(); - // return - // GT_LanguageManager.addStringLocalization("block."+mMaterial.getUnlocalizedName()+"."+this.thisBlockType.name().toLowerCase()+".name", - // aFormattedLangName); } public int getRenderColor(final int aMeta) { diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java index 8c1555a73a..54cfefbac2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockMeta.java @@ -18,15 +18,14 @@ import gtPlusPlus.api.objects.data.AutoMap; public class ItemBlockMeta extends ItemBlockWithMetadata { private final Block mBlock; - private HashMap<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<Integer, AutoMap<String>>(); + private HashMap<Integer, AutoMap<String>> aTooltips = new LinkedHashMap<>(); public ItemBlockMeta(final Block aBlock) { super(aBlock, aBlock); this.mBlock = aBlock; this.setMaxDamage(0); this.setHasSubtypes(true); - if (aBlock instanceof ITileTooltip) { - ITileTooltip aTooltip = (ITileTooltip) aBlock; + if (aBlock instanceof ITileTooltip aTooltip) { // aTooltips.put(aTooltip.getTooltipID(), aTooltip.getTooltipMap()); } } diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java index c8c6f01232..cdb2934a40 100644 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java +++ b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockOre.java @@ -49,9 +49,9 @@ public class ItemBlockOre extends ItemBlock { return this.mThisColour; } - private static Map<String, AutoMap<String>> mMapOreBlockItemToDimName = new LinkedHashMap<String, AutoMap<String>>(); + private static Map<String, AutoMap<String>> mMapOreBlockItemToDimName = new LinkedHashMap<>(); private static boolean mInitOres_Everglades = false; - private AutoMap<String> mDimsForThisOre = new AutoMap<String>(); + private AutoMap<String> mDimsForThisOre = new AutoMap<>(); @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { @@ -62,7 +62,7 @@ public class ItemBlockOre extends ItemBlock { for (Material m1 : m2) { AutoMap<String> aMap = mMapOreBlockItemToDimName.get(m1.getUnlocalizedName().toLowerCase()); if (aMap == null) { - aMap = new AutoMap<String>(); + aMap = new AutoMap<>(); } String aDimName = "Everglades"; if (!aMap.containsValue(aDimName)) { diff --git a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java b/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java deleted file mode 100644 index 9a128655c7..0000000000 --- a/src/main/java/gtPlusPlus/core/item/base/itemblock/ItemBlockRoundRobinator.java +++ /dev/null @@ -1,105 +0,0 @@ -package gtPlusPlus.core.item.base.itemblock; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlockWithMetadata; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class ItemBlockRoundRobinator extends ItemBlockWithMetadata { - - private final Block mBlock; - - public ItemBlockRoundRobinator(final Block aBlock) { - super(aBlock, aBlock); - this.mBlock = aBlock; - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add("Attempts to output items evenly on all four horizontal planes"); - if (stack.getItemDamage() == 0) { - list.add("1 Item per enabled side every 400 ticks"); - } else if (stack.getItemDamage() == 1) { - list.add("1 Item per enabled side every 100 ticks"); - } else if (stack.getItemDamage() == 2) { - list.add("1 Item per enabled side every 20 ticks"); - } else if (stack.getItemDamage() == 3) { - list.add("1 Item per enabled side every 10 ticks"); - } else if (stack.getItemDamage() == 4) { - list.add("1 Item per enabled side every tick"); - } - list.add("Top and bottom do not pull, so you must push items in"); - list.add("Sides can also be disabled with a screwdriver"); - list.add("Shift+RMB with empty hand to view inventory contents"); - super.addInformation(stack, aPlayer, list, bool); - } - - /** - * Gets an icon index based on an item's damage value - */ - @Override - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(final int p_77617_1_) { - return this.mBlock.getIcon(0, p_77617_1_); - } - - /** - * Returns the metadata of the block which this Item (ItemBlock) can place - */ - @Override - public int getMetadata(final int p_77647_1_) { - return p_77647_1_; - } - - @Override - public String getUnlocalizedName(final ItemStack stack) { - return this.getUnlocalizedName() + "." + stack.getItemDamage(); - } - - @Override - public boolean isDamageable() { - return false; - } - - @Override - public int getItemEnchantability() { - return 0; - } - - @Override - public boolean getIsRepairable(ItemStack p_82789_1_, ItemStack p_82789_2_) { - return false; - } - - @Override - public boolean isBookEnchantable(ItemStack stack, ItemStack book) { - return false; - } - - @Override - public boolean showDurabilityBar(ItemStack stack) { - return false; - } - - @Override - public double getDurabilityForDisplay(ItemStack stack) { - return 0; - } - - @Override - public int getItemEnchantability(ItemStack stack) { - return 0; - } - - @Override - public boolean getHasSubtypes() { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java index 64c5f76109..6560ac5ff2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemMisc.java @@ -130,9 +130,9 @@ public class BaseItemMisc extends Item { DROP("Droplet", " Droplet", "droplet"), MUSHROOM("Mushroom", " Mushroom", "mushroom"); - private String TYPE; - private String DISPLAY_NAME_SUFFIX; - private String OREDICT_PREFIX; + private final String TYPE; + private final String DISPLAY_NAME_SUFFIX; + private final String OREDICT_PREFIX; private MiscTypes(final String LocalName, final String DisplayNameSuffix, final String OreDictPrefix) { this.TYPE = LocalName; diff --git a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java index 56ecf59274..8c1efb96c2 100644 --- a/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java +++ b/src/main/java/gtPlusPlus/core/item/base/misc/BaseItemParticle.java @@ -17,7 +17,7 @@ import gtPlusPlus.core.item.base.CoreItem; public abstract class BaseItemParticle extends CoreItem { - protected static final Map<Integer, Integer> aColourMap = new LinkedHashMap<Integer, Integer>(); + protected static final Map<Integer, Integer> aColourMap = new LinkedHashMap<>(); private final int aMaxCount; public BaseItemParticle(String aType, int aCount, EnumRarity aRarity) { diff --git a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java index 6b4d3ab4a3..13c8986a78 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java +++ b/src/main/java/gtPlusPlus/core/item/base/ore/BaseOreComponent.java @@ -68,7 +68,7 @@ public class BaseOreComponent extends Item { // Register Component Map<String, ItemStack> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); if (aMap == null) { - aMap = new HashMap<String, ItemStack>(); + aMap = new HashMap<>(); } String aKey = "Invalid"; if (componentType == ComponentTypes.CRUSHED) { @@ -243,10 +243,10 @@ public class BaseOreComponent extends Item { CRUSHEDPURIFIED("crushedPurified", "Purified Crushed ", " Ore", true), MILLED("milled", "Milled ", " Ore", true); - private String COMPONENT_NAME; - private String PREFIX; - private String DISPLAY_NAME; - private boolean HAS_OVERLAY; + private final String COMPONENT_NAME; + private final String PREFIX; + private final String DISPLAY_NAME; + private final boolean HAS_OVERLAY; private ComponentTypes(final String LocalName, final String prefix, final String DisplayName, final boolean overlay) { diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 0ac31ef30b..7b017fb093 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -40,7 +40,7 @@ public class BaseBauble extends Item implements IBauble { */ private BaubleType mThisBauble; - private List<String> damageNegations = new ArrayList<String>(); + private List<String> damageNegations = new ArrayList<>(); Multimap<String, AttributeModifier> attributes = HashMultimap.create(); public BaseBauble(BaubleType type, String displayName) { @@ -71,8 +71,7 @@ public class BaseBauble extends Item implements IBauble { @SubscribeEvent public void onPlayerAttacked(LivingAttackEvent event) { - if (event.entityLiving instanceof EntityPlayer) { - EntityPlayer player = (EntityPlayer) event.entityLiving; + if (event.entityLiving instanceof EntityPlayer player) { if (getCorrectBauble(player) != null && damageNegations.contains(event.source.damageType)) event.setCanceled(true); } diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java index 4dcca46145..0b8ce24974 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ElectricBaseBauble.java @@ -22,6 +22,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Mods; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import ic2.api.item.ElectricItem; @@ -140,13 +141,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + this.getTier(stack) + + GT_Utility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + this.getTransferLimit(stack) + + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -154,12 +155,13 @@ public abstract class ElectricBaseBauble extends BaseBauble implements IElectric EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + (long) this.getCharge(stack) + + GT_Utility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + + GT_Utility.formatNumbers( + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); super.addInformation(stack, aPlayer, list, bool); diff --git a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java index ca4ec308f6..5e31b2ad89 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/FireProtectionBauble.java @@ -18,7 +18,7 @@ import baubles.api.BaubleType; import cpw.mods.fml.common.registry.GameRegistry; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; +import gtPlusPlus.preloader.CORE_Preloader; public class FireProtectionBauble extends BaseBauble { @@ -26,7 +26,7 @@ public class FireProtectionBauble extends BaseBauble { static { isImmuneToFire = ReflectionUtils - .getField(Entity.class, DevHelper.isObfuscatedEnvironment() ? "func_70045_F" : "isImmuneToFire"); + .getField(Entity.class, !CORE_Preloader.DEV_ENVIRONMENT ? "func_70045_F" : "isImmuneToFire"); } public static boolean fireImmune(Entity aEntity) { @@ -89,17 +89,14 @@ public class FireProtectionBauble extends BaseBauble { @Override public void onEquipped(final ItemStack arg0, final EntityLivingBase aPlayer) { if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; - } + if (aPlayer instanceof EntityPlayer bPlayer) {} } } @Override public void onUnequipped(final ItemStack arg0, final EntityLivingBase aPlayer) { if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; + if (aPlayer instanceof EntityPlayer bPlayer) { if (bPlayer.isPotionActive(Potion.fireResistance)) { bPlayer.removePotionEffect(Potion.fireResistance.id); } @@ -111,8 +108,7 @@ public class FireProtectionBauble extends BaseBauble { @Override public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase aPlayer) { if (!aPlayer.worldObj.isRemote) { - if (aPlayer instanceof EntityPlayer) { - EntityPlayer bPlayer = (EntityPlayer) aPlayer; + if (aPlayer instanceof EntityPlayer bPlayer) { if (!fireImmune(bPlayer)) { setEntityImmuneToFire(bPlayer, true); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 2dcb726171..b914730ee2 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -46,7 +46,7 @@ public class AgriculturalChem extends ItemPackage { private static boolean aBOP; private static boolean aTiCon; - private static AutoMap<FluidStack> mBloodFluids = new AutoMap<FluidStack>(); + private static AutoMap<FluidStack> mBloodFluids = new AutoMap<>(); /** * Fluids @@ -336,20 +336,20 @@ public class AgriculturalChem extends ItemPackage { } } - private static final AutoMap<ItemStack> mMeats = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mFish = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mFruits = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mVege = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mNuts = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mSeeds = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mPeat = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mBones = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mBoneMeal = new AutoMap<ItemStack>(); - - private static final AutoMap<ItemStack> mList_Master_Meats = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>(); - private static final AutoMap<ItemStack> mList_Master_Bones = new AutoMap<ItemStack>(); + private static final AutoMap<ItemStack> mMeats = new AutoMap<>(); + private static final AutoMap<ItemStack> mFish = new AutoMap<>(); + private static final AutoMap<ItemStack> mFruits = new AutoMap<>(); + private static final AutoMap<ItemStack> mVege = new AutoMap<>(); + private static final AutoMap<ItemStack> mNuts = new AutoMap<>(); + private static final AutoMap<ItemStack> mSeeds = new AutoMap<>(); + private static final AutoMap<ItemStack> mPeat = new AutoMap<>(); + private static final AutoMap<ItemStack> mBones = new AutoMap<>(); + private static final AutoMap<ItemStack> mBoneMeal = new AutoMap<>(); + + private static final AutoMap<ItemStack> mList_Master_Meats = new AutoMap<>(); + private static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<>(); + private static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<>(); + private static final AutoMap<ItemStack> mList_Master_Bones = new AutoMap<>(); private static void processAllOreDict() { processOreDict("listAllmeatraw", mMeats); @@ -520,9 +520,8 @@ public class AgriculturalChem extends ItemPackage { if (aItemRegInstance != null) { Field aFertField = ReflectionUtils.getField(aItemRegInstance.getClass(), "fertilizerCompound"); Object aItemInstance = aFertField.get(aItemRegInstance); - if (aItemInstance instanceof Item) { + if (aItemInstance instanceof Item aForestryFert) { aFertForestry = ItemUtils.getSimpleStack((Item) aItemInstance); - Item aForestryFert = (Item) aItemInstance; CORE.RA.addDehydratorRecipe( new ItemStack[] { CI.getNumberedCircuit(11), ItemUtils.getSimpleStack(aDustOrganicFert, 4) }, diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java index a6047efab8..7bbd78d3f5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/CoalTar.java @@ -156,8 +156,6 @@ public class CoalTar extends ItemPackage { private static void recipeCoalTarToCoalTarOil() { // v - Distill (60% Tar oil/15% Naphtha/20% Ethylbenzene/5% Anthracene) // Create Coal Tar Oil - // FluidUtils.generateFluidNonMolten("CoalTarOil", "Coal Tar Oil", 240, new short[]{240, 240, 150, 100}, null, - // null); GT_Values.RA.addDistilleryRecipe( CI.getNumberedCircuit(1), // Circuit FluidUtils.getFluidStack("fluid.coaltar", 1000), // aInput @@ -299,8 +297,6 @@ public class CoalTar extends ItemPackage { Utils.rgbtoHexValue(125, 125, 125)); // v - Dehydrate // Lithium Peroxide - 2 LiOOH → Li2O2 + H2O2 + 2 H2O - // Lithium_Peroxide = FluidUtils.generateFluidNonMolten("LithiumPeroxide", "Lithium Peroxide", 446, new - // short[]{135, 135, 135, 100}, null, null); } @Override diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index cf80e40522..81eed041c6 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -37,7 +37,6 @@ import gtPlusPlus.core.material.MaterialStack; import gtPlusPlus.core.material.NONMATERIAL; import gtPlusPlus.core.material.state.MaterialState; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.BioRecipes; @@ -95,7 +94,6 @@ public class GenericChem extends ItemPackage { */ // Phenol Byproducts - public Item PhenolicResins; // https://en.wikipedia.org/wiki/Phenol_formaldehyde_resin public static ItemGenericChemBase mGenericChemItem1; public static Item mAdvancedCircuit; @@ -143,13 +141,7 @@ public class GenericChem extends ItemPackage { @Override public void items() { - PhenolicResins = ItemUtils.generateSpecialUseDusts( - "phenolicresins", - "Phenolic Resin", - "HOC6H4CH2OH", - Utils.rgbtoHexValue(80, 40, 40))[0]; - // MaterialGenerator.generate(BAKELITE, false); - // MaterialGenerator.generate(NYLON, false); + MaterialGenerator.generate(TEFLON, false); mGenericChemItem1 = new ItemGenericChemBase(); @@ -805,19 +797,19 @@ public class GenericChem extends ItemPackage { } - private static final ItemStack getTierOneChip() { + private static ItemStack getTierOneChip() { return CI.getNumberedAdvancedCircuit(4); } - private static final ItemStack getTierTwoChip() { + private static ItemStack getTierTwoChip() { return CI.getNumberedAdvancedCircuit(8); } - private static final ItemStack getTierThreeChip() { + private static ItemStack getTierThreeChip() { return CI.getNumberedAdvancedCircuit(12); } - private static final ItemStack getTierFourChip() { + private static ItemStack getTierFourChip() { return CI.getNumberedAdvancedCircuit(16); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java index db495f3955..46a595e756 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/IonParticles.java @@ -20,8 +20,8 @@ import gtPlusPlus.core.util.Utils; public class IonParticles extends BaseItemParticle { - public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>(); - public static HashMap<Integer, String> MetaToNameMap = new HashMap<Integer, String>(); + public static HashMap<String, Integer> NameToMetaMap = new HashMap<>(); + public static HashMap<Integer, String> MetaToNameMap = new HashMap<>(); public IonParticles() { super("Ion", ELEMENT.NAMES.length, EnumRarity.rare); diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java index b3b40f339c..1eacad3e49 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/MilledOreProcessing.java @@ -551,10 +551,10 @@ public class MilledOreProcessing extends ItemPackage { } private void addPineOilExtraction() { - AutoMap<ItemStack> aLogs = new AutoMap<ItemStack>(); - AutoMap<ItemStack> aLeaves = new AutoMap<ItemStack>(); - AutoMap<ItemStack> aSaplings = new AutoMap<ItemStack>(); - AutoMap<ItemStack> aPinecones = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aLogs = new AutoMap<>(); + AutoMap<ItemStack> aLeaves = new AutoMap<>(); + AutoMap<ItemStack> aSaplings = new AutoMap<>(); + AutoMap<ItemStack> aPinecones = new AutoMap<>(); ItemStack aCrushedPine = ItemUtils.getSimpleStack(AgriculturalChem.mCrushedPine, 1); @@ -652,7 +652,7 @@ public class MilledOreProcessing extends ItemPackage { public static ItemStack[] cleanArray(ItemStack[] input) { int aArraySize = input.length; - AutoMap<ItemStack> aCleanedItems = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aCleanedItems = new AutoMap<>(); for (ItemStack checkStack : input) { if (ItemUtils.checkForInvalidItems(checkStack)) { aCleanedItems.put(checkStack); @@ -668,7 +668,7 @@ public class MilledOreProcessing extends ItemPackage { return aOutput; } - private static final HashMap<String, Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>> aMilledFluidMap = new HashMap<String, Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>>(); + private static final HashMap<String, Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>> aMilledFluidMap = new HashMap<>(); public static void registerOreDataForMilledType(Fluid aMilledFluid, Materials aOutput1, int aPerc1, Materials aOutput2, int aPerc2, Materials aOutput3, int aPerc3, Materials aOutput4, int aPerc4) { @@ -687,11 +687,11 @@ public class MilledOreProcessing extends ItemPackage { public static void registerOreDataForMilledType(Fluid aMilledFluid, Material aOutput1, int aPerc1, Material aOutput2, int aPerc2, Material aOutput3, int aPerc3, Material aOutput4, int aPerc4) { - Pair<Material, Integer> aFluidOutput1 = new Pair<Material, Integer>(aOutput1, aPerc1); - Pair<Material, Integer> aFluidOutput2 = new Pair<Material, Integer>(aOutput2, aPerc2); - Pair<Material, Integer> aFluidOutput3 = new Pair<Material, Integer>(aOutput3, aPerc3); - Pair<Material, Integer> aFluidOutput4 = new Pair<Material, Integer>(aOutput4, aPerc4); - Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>> aDataQuad = new Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>>( + Pair<Material, Integer> aFluidOutput1 = new Pair<>(aOutput1, aPerc1); + Pair<Material, Integer> aFluidOutput2 = new Pair<>(aOutput2, aPerc2); + Pair<Material, Integer> aFluidOutput3 = new Pair<>(aOutput3, aPerc3); + Pair<Material, Integer> aFluidOutput4 = new Pair<>(aOutput4, aPerc4); + Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>> aDataQuad = new Quad<>( aFluidOutput1, aFluidOutput2, aFluidOutput3, @@ -706,7 +706,7 @@ public class MilledOreProcessing extends ItemPackage { private static ItemStack[] getArrayFromQuad( Quad<Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>, Pair<Material, Integer>> aData) { - AutoMap<ItemStack> aOutputs = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aOutputs = new AutoMap<>(); for (Object aPair : aData.values()) { if (aPair != null && Pair.class.isInstance(aPair)) { Pair aObj = (Pair) aPair; @@ -724,7 +724,7 @@ public class MilledOreProcessing extends ItemPackage { } private static AutoMap<ItemStack> getItemStackFromPair(Material aMat, Integer aCount) { - AutoMap<ItemStack> aOutputs = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aOutputs = new AutoMap<>(); if (aCount > 64) { AutoMap<Integer> sizes = getStackSizes(aCount); for (int aSplitSize : sizes) { @@ -739,7 +739,7 @@ public class MilledOreProcessing extends ItemPackage { } private static AutoMap<Integer> getStackSizes(int aBigSize) { - AutoMap<Integer> aSizes = new AutoMap<Integer>(); + AutoMap<Integer> aSizes = new AutoMap<>(); if (aBigSize <= 64) { aSizes.add(aBigSize); } else { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index d50a59b8e5..07b2913434 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -33,8 +33,8 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; public class RocketFuels extends ItemPackage { - public static HashSet<String> mValidRocketFuelNames = new HashSet<String>(); - public static HashMap<Integer, Fluid> mValidRocketFuels = new HashMap<Integer, Fluid>(); + public static HashSet<String> mValidRocketFuelNames = new HashSet<>(); + public static HashMap<Integer, Fluid> mValidRocketFuels = new HashMap<>(); public static Fluid Oil_Heavy; public static Fluid Diesel; @@ -215,7 +215,7 @@ public class RocketFuels extends ItemPackage { } private static void addRocketFuelsToMap() { - HashMap<Integer, GTPP_Recipe> mRocketFuels = new LinkedHashMap<Integer, GTPP_Recipe>(); + HashMap<Integer, GTPP_Recipe> mRocketFuels = new LinkedHashMap<>(); mRocketFuels.put( 0, new GTPP_Recipe( diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java index 9212c995e2..0202c1c54e 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/StandardBaseParticles.java @@ -20,8 +20,8 @@ import gtPlusPlus.core.util.Utils; public class StandardBaseParticles extends BaseItemParticle { - public static HashMap<String, Integer> NameToMetaMap = new HashMap<String, Integer>(); - public static HashMap<Integer, String> MetaToNameMap = new HashMap<Integer, String>(); + public static HashMap<String, Integer> NameToMetaMap = new HashMap<>(); + public static HashMap<Integer, String> MetaToNameMap = new HashMap<>(); public StandardBaseParticles() { super("Base", aTypes.length, EnumRarity.rare); diff --git a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java index cce12371b0..9da7de5578 100644 --- a/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java +++ b/src/main/java/gtPlusPlus/core/item/crafting/ItemDummyResearch.java @@ -33,8 +33,8 @@ public class ItemDummyResearch extends ItemGenericToken { RESEARCH_10_SPARGING("Gas Sparging", "Blowing gas for results"), RESEARCH_11_MOLECULAR_TRANSFORMER("Molecular Transformation", "Turning things into something better"); - private String mName; - private String mDesc; + private final String mName; + private final String mDesc; private ASSEMBLY_LINE_RESEARCH(String aName, String aDesc) { mName = aName; @@ -43,7 +43,7 @@ public class ItemDummyResearch extends ItemGenericToken { } } - private static Map<String, Integer> mInternalNameToIdMap = new LinkedHashMap<String, Integer>(); + private static Map<String, Integer> mInternalNameToIdMap = new LinkedHashMap<>(); public static ItemStack getResearchStack(ASSEMBLY_LINE_RESEARCH aResearchName, int aStacksize) { Integer aMeta = mInternalNameToIdMap.get(Utils.sanitizeString(aResearchName.mName)); diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index 0b1c8eeadd..7aaa5ffc53 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -29,7 +29,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class BaseItemMetaFood extends ItemFood { - private static final HashMap<Integer, IIcon> mIconMap = new HashMap<Integer, IIcon>(); + private static final HashMap<Integer, IIcon> mIconMap = new HashMap<>(); private static int mTotalMetaItems = 0; /* @@ -91,20 +91,20 @@ public class BaseItemMetaFood extends ItemFood { 4, 1, 64, - new AutoMap<PotionEffectPackage>(), + new AutoMap<>(), new setOnFire(), getOreDictNamesAsArrayList("listAllmeatcooked")); } - private static final HashMap<Integer, Integer> mMaxStackSizeMap = new HashMap<Integer, Integer>(); - private static final HashMap<Integer, String> mTooltipMap = new HashMap<Integer, String>(); - private static final HashMap<Integer, EnumRarity> mRarityMap = new HashMap<Integer, EnumRarity>(); - private static final HashMap<Integer, Integer> mHealAmountMap = new HashMap<Integer, Integer>(); - private static final HashMap<Integer, Float> mSaturationAmountMap = new HashMap<Integer, Float>(); - private static final HashMap<Integer, AutoMap<PotionEffectPackage>> mPotionEffectsMap = new HashMap<Integer, AutoMap<PotionEffectPackage>>(); - private static final HashMap<Integer, Boolean> mHasSpecialBehaviourMap = new HashMap<Integer, Boolean>(); - private static final HashMap<Integer, SpecialFoodBehaviour> mSpecialBehaviourMap = new HashMap<Integer, SpecialFoodBehaviour>(); - private static final HashMap<Integer, ArrayList<String>> mOreDictNames = new HashMap<Integer, ArrayList<String>>(); + private static final HashMap<Integer, Integer> mMaxStackSizeMap = new HashMap<>(); + private static final HashMap<Integer, String> mTooltipMap = new HashMap<>(); + private static final HashMap<Integer, EnumRarity> mRarityMap = new HashMap<>(); + private static final HashMap<Integer, Integer> mHealAmountMap = new HashMap<>(); + private static final HashMap<Integer, Float> mSaturationAmountMap = new HashMap<>(); + private static final HashMap<Integer, AutoMap<PotionEffectPackage>> mPotionEffectsMap = new HashMap<>(); + private static final HashMap<Integer, Boolean> mHasSpecialBehaviourMap = new HashMap<>(); + private static final HashMap<Integer, SpecialFoodBehaviour> mSpecialBehaviourMap = new HashMap<>(); + private static final HashMap<Integer, ArrayList<String>> mOreDictNames = new HashMap<>(); public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, final float aSaturationModifier, final int aMaxStacksize) { @@ -115,9 +115,9 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap<PotionEffectPackage>(), + new AutoMap<>(), null, - new ArrayList<String>()); + new ArrayList<>()); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, @@ -129,7 +129,7 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap<PotionEffectPackage>(), + new AutoMap<>(), null, aOreDictNames); } @@ -144,9 +144,9 @@ public class BaseItemMetaFood extends ItemFood { aHealAmount, aSaturationModifier, aMaxStacksize, - new AutoMap<PotionEffectPackage>(), + new AutoMap<>(), null, - new ArrayList<String>()); + new ArrayList<>()); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, final int aHealAmount, @@ -176,7 +176,7 @@ public class BaseItemMetaFood extends ItemFood { aMaxStacksize, aPotionEffects, null, - new ArrayList<String>()); + new ArrayList<>()); } public static void registerNewMetaFood(final int aMetaID, String aTooltip, EnumRarity aRarity, @@ -221,7 +221,7 @@ public class BaseItemMetaFood extends ItemFood { BaseItemMetaFood.registerMetaFoods(); } - private static final int getMetaKey(ItemStack aStack) { + private static int getMetaKey(ItemStack aStack) { return aStack.getItemDamage(); } @@ -416,7 +416,7 @@ public class BaseItemMetaFood extends ItemFood { } private static AutoMap<PotionEffectPackage> getPotionEffectPackage(PotionEffectPackage... aEffects) { - AutoMap<PotionEffectPackage> aPackage = new AutoMap<PotionEffectPackage>(); + AutoMap<PotionEffectPackage> aPackage = new AutoMap<>(); if (aEffects != null && aEffects.length > 0) { for (PotionEffectPackage aEffect : aEffects) { aPackage.put(aEffect); @@ -426,7 +426,7 @@ public class BaseItemMetaFood extends ItemFood { } private static ArrayList<String> getOreDictNamesAsArrayList(String... aOreDictNames) { - ArrayList<String> aPackage = new ArrayList<String>(); + ArrayList<String> aPackage = new ArrayList<>(); if (aOreDictNames != null && aOreDictNames.length > 0) { for (String aEffect : aOreDictNames) { aPackage.add(aEffect); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java index 9407f5c5ad..61bdfe6705 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -235,16 +235,12 @@ public class ItemBlueprint extends Item implements IItemBlueprint { && !itemStack.stackTagCompound.getString("mName").equals("")) { // Has Blueprint but invalid name set Logger.WARNING("Has Blueprint but invalid name set"); - // itemStack.stackTagCompound = null; - // createNBT(itemStack); return false; } else if (!itemStack.stackTagCompound.getBoolean("mBlueprint") && itemStack.stackTagCompound.getString("mName").equals("")) { // Has no Blueprint, but strangely has a name Logger.WARNING("Has no Blueprint, but strangely has a name"); - // itemStack.stackTagCompound = null; - // createNBT(itemStack); return false; } return false; @@ -276,15 +272,20 @@ public class ItemBlueprint extends Item implements IItemBlueprint { return null; } Object o = null; - if (tagNBT.equals("mID")) { - o = itemStack.stackTagCompound.getInteger(tagNBT); - } else if (tagNBT.equals("mBlueprint")) { - o = itemStack.stackTagCompound.getBoolean(tagNBT); - } else if (tagNBT.equals("mName")) { - o = itemStack.stackTagCompound.getString(tagNBT); - } else if (tagNBT.equals("")) { - // For More Tag Support - // o = itemStack.stackTagCompound.getInteger(tagNBT); + switch (tagNBT) { + case "mID": + o = itemStack.stackTagCompound.getInteger(tagNBT); + break; + case "mBlueprint": + o = itemStack.stackTagCompound.getBoolean(tagNBT); + break; + case "mName": + o = itemStack.stackTagCompound.getString(tagNBT); + break; + case "": + // For More Tag Support + // o = itemStack.stackTagCompound.getInteger(tagNBT); + break; } if (o != null) { return o; diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java index e0949f830a..3193262859 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemCloakingDevice.java @@ -19,6 +19,7 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; +import gregtech.api.util.GT_Utility; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -63,8 +64,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric continue; } if (is != null) { - if (is.getItem() instanceof IElectricItem) { - final IElectricItem electricItem = (IElectricItem) is.getItem(); + if (is.getItem() instanceof final IElectricItem electricItem) { this.chargeEU = ElectricItem.manager.getCharge(is); } } @@ -120,7 +120,7 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric } public int secondsLeft(final ItemStack stack) { - double r = 0; + double r; r = this.getCharge(stack) / (10000 * 20); return (int) MathUtils.decimalRounding(r); } @@ -135,33 +135,20 @@ public class ItemCloakingDevice extends Item implements IElectricItem, IElectric list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.3", - this.getTier(this.thisStack), - this.getTransferLimit(this.thisStack))); + GT_Utility.formatNumbers(this.getTier(this.thisStack)), + GT_Utility.formatNumbers(this.getTransferLimit(this.thisStack)))); list.add( StatCollector.translateToLocalFormatted( "item.personalCloakingDevice.tooltip.4", - (long) this.getCharge(stack), + GT_Utility.formatNumbers(this.getCharge(stack)), MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)))); list.add( - StatCollector - .translateToLocalFormatted("item.personalCloakingDevice.tooltip.5", this.secondsLeft(stack))); + StatCollector.translateToLocalFormatted( + "item.personalCloakingDevice.tooltip.5", + GT_Utility.formatNumbers(this.secondsLeft(stack)))); super.addInformation(stack, aPlayer, list, bool); } - /* - * @Override public ItemStack getContainerItem(ItemStack itemStack) { ItemStack newItem = itemStack.copy(); - * newItem.stackSize = 1; extractEnergy(newItem, 150000, false); return newItem; } - */ - - /* - * @Override public boolean hasContainerItem(ItemStack stack) { return true; } - */ - - /* - * @Override public int getBurnTime(ItemStack fuel) { if ((fuel == null) || (fuel.getItem() != this)) { return 0; } - * return extractEnergy(fuel, 150000, true) / 50 / 100; } - */ - @Override public double charge(final ItemStack stack, final double amount, final int tier, final boolean ignoreTransferLimit, final boolean simulate) { diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java index e413c0933a..d457369a4c 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGenericToken.java @@ -46,12 +46,12 @@ public class ItemGenericToken extends CoreItem { EnumChatFormatting.RESET, false, null); - mLocalNames = new HashMap<Integer, String>(); - mMaxStackSizes = new HashMap<Integer, Integer>(); - mDescriptionArrays = new HashMap<Integer, String[]>(); - mRarities = new HashMap<Integer, EnumRarity>(); - mCustomNameColours = new HashMap<Integer, EnumChatFormatting>(); - mIcons = new HashMap<Integer, IIcon>(); + mLocalNames = new HashMap<>(); + mMaxStackSizes = new HashMap<>(); + mDescriptionArrays = new HashMap<>(); + mRarities = new HashMap<>(); + mCustomNameColours = new HashMap<>(); + mIcons = new HashMap<>(); mTextureDir = aTextureDir; setMaxStackSize(64); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java index 9467730cce..e1b2ee1a06 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemHealingDevice.java @@ -21,9 +21,9 @@ import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Mods; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; @@ -110,6 +110,8 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI return (int) r; } + int EUPerOperation = 1_638_400; + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { @@ -119,6 +121,9 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI String aString3 = StatCollector.translateToLocal("GTPP.nanohealer.tooltip.3"); String aString4 = StatCollector.translateToLocal("GTPP.nanohealer.tooltip.4"); String aString5 = StatCollector.translateToLocal("GTPP.nanohealer.tooltip.5"); + + String aString6 = StatCollector.translateToLocal("GTPP.nanohealer.tooltip.6"); + String aStringTooltip = StatCollector.translateToLocal("GTPP.nanohealer.hidden"); String aEuInfo = StatCollector.translateToLocal("GTPP.info.euInfo"); String aTier = StatCollector.translateToLocal("GTPP.machines.tier"); @@ -131,9 +136,13 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI list.add(""); list.add(EnumChatFormatting.GREEN + aString1 + EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN + aString2 + EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.GREEN + aString3 + EnumChatFormatting.GRAY); - list.add(EnumChatFormatting.RED + aString4 + EnumChatFormatting.GRAY); + list.add( + EnumChatFormatting.GREEN + aString2 + + GT_Utility.formatNumbers(EUPerOperation) + + aString3 + + EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GREEN + aString4 + EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.RED + aString5 + EnumChatFormatting.GRAY); list.add(""); @@ -142,13 +151,13 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI EnumChatFormatting.GRAY + aTier + ": [" + EnumChatFormatting.YELLOW - + this.getTier(stack) + + GT_Utility.formatNumbers(this.getTier(stack)) + EnumChatFormatting.GRAY + "] " + aInputLimit + ": [" + EnumChatFormatting.YELLOW - + this.getTransferLimit(stack) + + GT_Utility.formatNumbers(this.getTransferLimit(stack)) + EnumChatFormatting.GRAY + aEUT + "]"); @@ -156,15 +165,16 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI EnumChatFormatting.GRAY + aCurrentPower + ": [" + EnumChatFormatting.YELLOW - + (long) this.getCharge(stack) + + GT_Utility.formatNumbers(this.getCharge(stack)) + EnumChatFormatting.GRAY + aEU + "] [" + EnumChatFormatting.YELLOW - + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack)) + + GT_Utility.formatNumbers( + MathUtils.findPercentage(this.getCharge(stack), this.getMaxCharge(stack))) + EnumChatFormatting.GRAY + "%]"); - list.add(EnumChatFormatting.GOLD + aString5 + EnumChatFormatting.GRAY); + list.add(EnumChatFormatting.GOLD + aString6 + EnumChatFormatting.GRAY); list.add( EnumChatFormatting.GOLD + aStringTooltip + " " @@ -237,18 +247,18 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) {} @Override // TODO - public void onWornTick(final ItemStack aBaubleStack, final EntityLivingBase arg1) { + public void onWornTick(final ItemStack baubleStack, final EntityLivingBase arg1) { if (arg1 != null && arg1.worldObj != null && !arg1.worldObj.isRemote) { // Try Charge First // Inv Slots for (final ItemStack aInvStack : ((EntityPlayer) arg1).inventory.mainInventory) { - if (aInvStack == aBaubleStack) { + if (aInvStack == baubleStack) { continue; } - if (this.getCharge(aBaubleStack) == this.getMaxCharge(aBaubleStack)) { + if (this.getCharge(baubleStack) == this.getMaxCharge(baubleStack)) { break; } @@ -264,7 +274,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI aTransferRate = electricItem.getTransferLimit(aInvStack); mTier = electricItem.getTier(aInvStack); - aCurrentChargeForThisBauble = ElectricItem.manager.getCharge(aBaubleStack); + aCurrentChargeForThisBauble = ElectricItem.manager.getCharge(baubleStack); if (aCurrentChargeForThisBauble < maxValueEU) { if ((ElectricItem.manager.getCharge(aInvStack) >= aTransferRate)) { @@ -272,15 +282,14 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI double d = ElectricItem.manager .discharge(aInvStack, aTransferRate, mTier, false, true, false); // Logger.INFO("Charging from "+aInvStack.getDisplayName() +" | "+d); - ElectricItem.manager.charge(aBaubleStack, d, mTier, true, false); + ElectricItem.manager.charge(baubleStack, d, mTier, true, false); } } } } } } - if (this.getCharge(aBaubleStack) - <= (this.getMaxCharge(aBaubleStack) - getTransferLimit(aBaubleStack))) { + if (this.getCharge(baubleStack) <= (this.getMaxCharge(baubleStack) - getTransferLimit(baubleStack))) { continue; } else { break; @@ -288,12 +297,11 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI } // Try Heal - if (this.getCharge(aBaubleStack) > 0) { + if (this.getCharge(baubleStack) > 0) { - if (!(arg1 instanceof EntityPlayer)) { + if (!(arg1 instanceof EntityPlayer g)) { return; } - EntityPlayer g = (EntityPlayer) arg1; // health Check float hp = 0; if (arg1.getHealth() < arg1.getMaxHealth()) { @@ -301,7 +309,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI Logger.INFO("rx:" + rx); arg1.heal(rx * 2); hp = rx; - this.discharge(aBaubleStack, (1638400) * rx, 6, true, true, false); + this.discharge(baubleStack, (1638400) * rx, 6, true, true, false); } int hunger = 0; @@ -314,27 +322,33 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI if (hunger > 0) { saturation = 20f - aFood.getSaturationLevel(); saturation /= hunger * 2f; - this.discharge(aBaubleStack, (1638400) * (hunger + saturation), 6, true, true, false); + this.discharge(baubleStack, (1638400) * (hunger + saturation), 6, true, true, false); aFood.addStats(hunger, saturation); } } // Only show Messages if they're enabled. - if (getShowMessages(aBaubleStack)) { + if (getShowMessages(baubleStack)) { if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer( (EntityPlayer) arg1, "Your NanoBooster Whirs! Leaving you feeling stronger."); - if (hp > 0) PlayerUtils.messagePlayer((EntityPlayer) arg1, "Healed " + hp + " hp."); + if (hp > 0) PlayerUtils + .messagePlayer((EntityPlayer) arg1, "Healed " + GT_Utility.formatNumbers(hp) + " hp."); - if (hunger > 0) PlayerUtils.messagePlayer((EntityPlayer) arg1, "Healed " + hunger + " hunger."); + if (hunger > 0) PlayerUtils.messagePlayer( + (EntityPlayer) arg1, + "Healed " + GT_Utility.formatNumbers(hunger) + " hunger."); - if (saturation > 0) - PlayerUtils.messagePlayer((EntityPlayer) arg1, "Satured Hunger by " + saturation + "."); + if (saturation > 0) PlayerUtils.messagePlayer( + (EntityPlayer) arg1, + "Satured Hunger by " + GT_Utility.formatNumbers(saturation) + "."); if (hp > 0 || hunger > 0 || saturation > 0) PlayerUtils.messagePlayer( (EntityPlayer) arg1, - "You check it's remaining uses, it has " + (int) this.secondsLeft(aBaubleStack) + "."); + "You check it's remaining uses, it has " + + GT_Utility.formatNumbers(secondsLeft(baubleStack)) + + " seconds left."); } } } @@ -395,7 +409,7 @@ public class ItemHealingDevice extends Item implements IElectricItem, IElectricI boolean isShiftHeld = KeyboardUtils.isShiftKeyDown(); if (isShiftHeld) { boolean oldState = getShowMessages(superStack); - boolean newState = Utils.invertBoolean(oldState); + boolean newState = !oldState; ItemHealingDevice.setShowMessages(superStack, newState); PlayerUtils.messagePlayer(aPlayer, (!oldState ? "Showing info messages" : "Hiding info messages")); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java index e760039d68..0a3d5f7394 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemLavaFilter.java @@ -35,7 +35,7 @@ public class ItemLavaFilter extends CoreItem { setGregtechItemList(); } - private final boolean setGregtechItemList() { + private boolean setGregtechItemList() { ItemList.Component_LavaFilter.set(this); return ItemList.Component_LavaFilter.get(1) != null ? true : false; } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java index e8ff40a5fc..981ccf2af1 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java @@ -96,10 +96,9 @@ public class ItemMagicFeather extends CoreItem { private static void findSuitableBeacon(EntityPlayer player, Collection<TileEntity> tileEntities, HashSet<TileEntityBeacon> aBeaconData) { for (TileEntity t : tileEntities) { - if (!(t instanceof TileEntityBeacon)) { + if (!(t instanceof TileEntityBeacon beacon)) { continue; } - TileEntityBeacon beacon = (TileEntityBeacon) t; int level = beacon.getLevels(); if (level == 0) { continue; @@ -176,8 +175,7 @@ public class ItemMagicFeather extends CoreItem { public void onPlayerDeath(LivingDeathEvent event) { if (event.entityLiving == null) return; EntityLivingBase aEntity = event.entityLiving; - if (!(aEntity instanceof EntityPlayer) || aEntity.worldObj == null || aEntity.worldObj.isRemote) return; - EntityPlayer aPlayer = (EntityPlayer) aEntity; + if (!(aEntity instanceof EntityPlayer aPlayer) || aEntity.worldObj == null || aEntity.worldObj.isRemote) return; ItemMagicFeather.sPlayerData.remove(aPlayer); ItemMagicFeather.sBeaconData.remove(aPlayer); } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java b/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java deleted file mode 100644 index a182c4bdb9..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/ItemSlowBuildingRing.java +++ /dev/null @@ -1,136 +0,0 @@ -package gtPlusPlus.core.item.general; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import baubles.api.BaubleType; -import baubles.api.IBauble; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Mods; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.handler.events.CustomMovementHandler; -import gtPlusPlus.core.handler.events.SneakManager; -import gtPlusPlus.core.util.minecraft.ItemUtils; - -@Optional.InterfaceList( - value = { @Optional.Interface(iface = "baubles.api.IBauble", modid = Mods.Names.BAUBLES), - @Optional.Interface(iface = "baubles.api.BaubleType", modid = Mods.Names.BAUBLES) }) -public class ItemSlowBuildingRing extends Item implements IBauble { - - private final String unlocalizedName = "SlowBuildingRing"; - CustomMovementHandler x; - - public ItemSlowBuildingRing() { - this.setCreativeTab(AddToCreativeTab.tabMachines); - this.setUnlocalizedName(this.unlocalizedName); - this.setMaxStackSize(1); - this.setTextureName(GTPlusPlus.ID + ":" + "itemSlowBuildersRing"); - ItemUtils.getSimpleStack(this); - GameRegistry.registerItem(this, this.unlocalizedName); - } - - @Override - public void onUpdate(final ItemStack itemStack, final World worldObj, final Entity player, final int p_77663_4_, - final boolean p_77663_5_) { - if (worldObj.isRemote) { - return; - } - super.onUpdate(itemStack, worldObj, player, p_77663_4_, p_77663_5_); - } - - @Override - public boolean showDurabilityBar(final ItemStack stack) { - return false; - } - - @SuppressWarnings("unchecked") - @Override - public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { - list.add(""); - list.add(StatCollector.translateToLocal("item.SlowBuildingRing.tooltip.0")); - list.add(StatCollector.translateToLocal("item.SlowBuildingRing.tooltip.1")); - list.add(StatCollector.translateToLocal("item.SlowBuildingRing.tooltip.2")); - list.add(""); - super.addInformation(stack, aPlayer, list, bool); - } - - @Override - public boolean canEquip(final ItemStack arg0, final EntityLivingBase arg1) { - return true; - } - - @Override - public boolean canUnequip(final ItemStack arg0, final EntityLivingBase arg1) { - return true; - } - - @Override - public BaubleType getBaubleType(final ItemStack arg0) { - return BaubleType.RING; - } - - @Override // TODO - public void onEquipped(final ItemStack arg0, final EntityLivingBase arg1) { - try { - EntityPlayer aPlayer; - if (arg1 instanceof EntityPlayer) { - aPlayer = (EntityPlayer) arg1; - SneakManager s = SneakManager.get(aPlayer); - s.putRingOn(); - } - } catch (Throwable t) { - t.printStackTrace(); - } - } - - @Override // TODO - public void onUnequipped(final ItemStack arg0, final EntityLivingBase arg1) { - try { - EntityPlayer aPlayer; - if (arg1 instanceof EntityPlayer) { - aPlayer = (EntityPlayer) arg1; - SneakManager s = SneakManager.get(aPlayer); - s.takeRingOff(); - } - } catch (Throwable t) { - t.printStackTrace(); - } - } - - @Override // TODO - public void onWornTick(final ItemStack arg0, final EntityLivingBase arg1) { - doEffect(arg1); - } - - private static void doEffect(final EntityLivingBase arg1) { - try { - // Get World - World aWorld = arg1.worldObj; - if (aWorld != null && !aWorld.isRemote) { - EntityPlayer aPlayer; - if (arg1 instanceof EntityPlayer) { - aPlayer = (EntityPlayer) arg1; - SneakManager s = SneakManager.get(aPlayer); - if (!aPlayer.isSneaking()) { - aPlayer.setSneaking(true); - } - if (aPlayer.isSprinting()) { - aPlayer.setSprinting(false); - } - } - } - } catch (Throwable t) { - t.printStackTrace(); - } - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java index 1b287cbfb0..2c12eaa8ca 100644 --- a/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/spawn/ItemCustomSpawnEgg.java @@ -30,31 +30,26 @@ import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.util.minecraft.ItemUtils; public class ItemCustomSpawnEgg extends ItemMonsterPlacer { - private static final HashMap<Integer, IIcon> mIconMap = new HashMap<Integer, IIcon>(); + private static final HashMap<Integer, IIcon> mIconMap = new HashMap<>(); private static int mTotalMetaItems = 0; - private static final HashMap<Integer, Integer> mMaxStackSizeMap = new HashMap<Integer, Integer>(); - private static final HashMap<Integer, EnumRarity> mRarityMap = new HashMap<Integer, EnumRarity>(); - private static final HashMap<Integer, ArrayList<String>> mOreDictNames = new HashMap<Integer, ArrayList<String>>(); + private static final HashMap<Integer, Integer> mMaxStackSizeMap = new HashMap<>(); + private static final HashMap<Integer, EnumRarity> mRarityMap = new HashMap<>(); + private static final HashMap<Integer, ArrayList<String>> mOreDictNames = new HashMap<>(); - private static final HashMap<Integer, Integer> mColourBaseMap = new HashMap<Integer, Integer>(); - private static final HashMap<Integer, Integer> mColourSpotsMap = new HashMap<Integer, Integer>(); - private static final HashMap<Integer, String> mEntityNameMap = new HashMap<Integer, String>(); - private static final HashMap<Integer, String> mEntityFullNameMap = new HashMap<Integer, String>(); + private static final HashMap<Integer, Integer> mColourBaseMap = new HashMap<>(); + private static final HashMap<Integer, Integer> mColourSpotsMap = new HashMap<>(); + private static final HashMap<Integer, String> mEntityNameMap = new HashMap<>(); + private static final HashMap<Integer, String> mEntityFullNameMap = new HashMap<>(); - private static final HashMap<String, Integer> mReverseEntityMap = new HashMap<String, Integer>(); + private static final HashMap<String, Integer> mReverseEntityMap = new HashMap<>(); protected EntityLiving entityToSpawn = null; - public static ItemStack getSpawnEggForEntityname(String aEntityName, int aSize) { - return ItemUtils.simpleMetaStack(ModItems.itemCustomSpawnEgg, mReverseEntityMap.get(aEntityName), aSize); - } - public static void registerEntityForSpawnEgg(final int aMetaID, String parEntityToSpawnName, int aPrimaryColor, int aSecondaryColor) { registerEntityForSpawnEgg( @@ -78,18 +73,6 @@ public class ItemCustomSpawnEgg extends ItemMonsterPlacer { setEntityToSpawnName(aMetaID, parEntityToSpawnName); } - public static void registerEggsToOreDict() { - for (int aMetaID = 0; aMetaID < mTotalMetaItems; aMetaID++) { - ArrayList<String> aOreDictNames = mOreDictNames.get(aMetaID); - if (aOreDictNames != null && !aOreDictNames.isEmpty()) { - ItemStack aFoodStack = ItemUtils.simpleMetaStack(ModItems.itemCustomSpawnEgg, aMetaID, 1); - for (String aOreName : aOreDictNames) { - ItemUtils.addItemToOreDictionary(aFoodStack, aOreName); - } - } - } - } - public ItemCustomSpawnEgg() { super(); this.setNoRepair(); diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java deleted file mode 100644 index 4f2e91d429..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java +++ /dev/null @@ -1,40 +0,0 @@ -package gtPlusPlus.core.item.general.throwables; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion; -import gtPlusPlus.core.item.base.CoreItem; - -public class ItemHydrofluoricAcidPotion extends CoreItem { - - public ItemHydrofluoricAcidPotion(String unlocalizedName, String displayName, String description) { - super( - unlocalizedName, - displayName, - AddToCreativeTab.tabMisc, - 16, - 0, - new String[] { description }, - EnumRarity.uncommon, - EnumChatFormatting.GRAY, - false, - null); - } - - @Override - public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) { - if (!player.capabilities.isCreativeMode) { - --item.stackSize; - } - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if (!world.isRemote) { - world.spawnEntityInWorld(new EntityHydrofluoricAcidPotion(world, player)); - } - return item; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java deleted file mode 100644 index 32f6c69e1c..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java +++ /dev/null @@ -1,40 +0,0 @@ -package gtPlusPlus.core.item.general.throwables; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; - -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion; -import gtPlusPlus.core.item.base.CoreItem; - -public class ItemSulfuricAcidPotion extends CoreItem { - - public ItemSulfuricAcidPotion(String unlocalizedName, String displayName, String description) { - super( - unlocalizedName, - displayName, - AddToCreativeTab.tabMisc, - 16, - 0, - new String[] { description }, - EnumRarity.common, - EnumChatFormatting.GRAY, - false, - null); - } - - @Override - public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) { - if (!player.capabilities.isCreativeMode) { - --item.stackSize; - } - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if (!world.isRemote) { - world.spawnEntityInWorld(new EntitySulfuricAcidPotion(world, player)); - } - return item; - } -} diff --git a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java b/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java deleted file mode 100644 index 31d69044cc..0000000000 --- a/src/main/java/gtPlusPlus/core/item/general/throwables/ItemThrowableBomb.java +++ /dev/null @@ -1,129 +0,0 @@ -package gtPlusPlus.core.item.general.throwables; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import java.util.List; - -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; -import net.minecraft.item.EnumRarity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IIcon; -import net.minecraft.world.World; - -import gregtech.api.enums.ItemList; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.entity.projectile.EntityThrowableBomb; -import gtPlusPlus.core.item.base.CoreItem; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; - -public class ItemThrowableBomb extends CoreItem { - - private static AutoMap<ItemStack> mLighters = new AutoMap<ItemStack>(); - public static IIcon[] icons = new IIcon[10]; - - public ItemThrowableBomb() { - super( - "gtpp.throwable.bomb", - "Bomb", - AddToCreativeTab.tabMisc, - 16, - 0, - new String[] { "Just like Bomberman", "Have a fire source in inventory to prime" }, - EnumRarity.uncommon, - EnumChatFormatting.GRAY, - false, - null); - this.setHasSubtypes(true); - } - - @Override - public ItemStack onItemRightClick(ItemStack item, World world, EntityPlayer player) { - - if (mLighters.isEmpty()) { - mLighters.put(ItemUtils.getSimpleStack(Items.flint_and_steel)); - mLighters.put(ItemList.Tool_Lighter_Invar_Full.get(1)); - mLighters.put(ItemList.Tool_Lighter_Invar_Used.get(1)); - mLighters.put(ItemList.Tool_Lighter_Platinum_Full.get(1)); - mLighters.put(ItemList.Tool_Lighter_Platinum_Used.get(1)); - } - - // Unlit - if (item.getItemDamage() == 0) { - boolean hasLighter = false; - for (ItemStack aPlaySlot : player.inventory.mainInventory) { - if (aPlaySlot != null) { - for (ItemStack aLighter : mLighters) { - if (GT_Utility.areStacksEqual(aPlaySlot, aLighter) - || (aPlaySlot.getItem() instanceof MetaGeneratedGregtechTools - && aPlaySlot.getItemDamage() == MetaGeneratedGregtechTools.ELECTRIC_LIGHTER)) { - hasLighter = true; - break; - } - } - } - } - if (hasLighter) { - item.setItemDamage(1); - } - } - // Lit - else if (item.getItemDamage() == 1) { - if (!player.capabilities.isCreativeMode) { - --item.stackSize; - } - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if (!world.isRemote) { - world.spawnEntityInWorld(new EntityThrowableBomb(world, player)); - } - /* - * if (item.stackSize <= 0) { item = null; } - */ - } - return item; - } - - @Override - public void registerIcons(IIconRegister reg) { - icons[0] = reg.registerIcon(GTPlusPlus.ID + ":" + "bomb"); - icons[1] = reg.registerIcon(GTPlusPlus.ID + ":" + "bomb_lit"); - } - - @Override - public IIcon getIconFromDamage(int meta) { - return this.icons[meta]; - } - - @SuppressWarnings({ "unchecked" }) - @Override - public void getSubItems(Item item, CreativeTabs tab, List list) { - for (int i = 0; i < 2; i++) { - list.add(new ItemStack(item, 1, i)); - } - } - - @Override - public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { - String aLitStatus = "unlit"; - if (stack.getItemDamage() == 0) { - aLitStatus = EnumChatFormatting.BLUE + "Unlit"; - } else if (stack.getItemDamage() == 1) { - aLitStatus = EnumChatFormatting.RED + "Lit"; - } - list.add(EnumChatFormatting.GOLD + "Fuse Status: " + aLitStatus); - super.addInformation(stack, aPlayer, list, bool); - } - - @Override - public String getItemStackDisplayName(ItemStack p_77653_1_) { - // TODO Auto-generated method stub - return super.getItemStackDisplayName(p_77653_1_); - } -} diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java index f563d532a0..889c64f2f8 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/DebugScanner.java @@ -75,18 +75,15 @@ public class DebugScanner extends CoreItem { PlayerUtils.messagePlayer(player, "Invisible? " + entity.isInvisible()); PlayerUtils.messagePlayer(player, "Age: " + entity.ticksExisted); - if (entity instanceof EntityLivingBase) { - EntityLivingBase g = (EntityLivingBase) entity; + if (entity instanceof EntityLivingBase g) { PlayerUtils.messagePlayer(player, "Health: " + g.getHealth() + "/" + g.getMaxHealth()); PlayerUtils.messagePlayer(player, "On ground? " + g.onGround); PlayerUtils.messagePlayer(player, "Child? " + g.isChild()); } - if (entity instanceof EntityLiving) { - EntityLiving g = (EntityLiving) entity; + if (entity instanceof EntityLiving g) { PlayerUtils.messagePlayer(player, "Can Loot? " + g.canPickUpLoot()); } - if (entity instanceof EntityPlayer) { - EntityPlayer y = (EntityPlayer) entity; + if (entity instanceof EntityPlayer y) { PlayerUtils.messagePlayer(player, "Experience: " + y.experience); PlayerUtils.messagePlayer(player, "Name: " + y.getCommandSenderName()); } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java index 2c550962c9..9a67ee06ca 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/GregtechPump.java @@ -99,13 +99,13 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri /** The unlocalized name of this item. */ private String unlocalizedName; - private final HashMap<Integer, IIcon> mIconMap = new LinkedHashMap<Integer, IIcon>(); - private final HashMap<Integer, EnumRarity> rarity = new LinkedHashMap<Integer, EnumRarity>(); - private final HashMap<Integer, String> itemName = new LinkedHashMap<Integer, String>(); - private final HashMap<Integer, Boolean> hasEffect = new LinkedHashMap<Integer, Boolean>(); + private final HashMap<Integer, IIcon> mIconMap = new LinkedHashMap<>(); + private final HashMap<Integer, EnumRarity> rarity = new LinkedHashMap<>(); + private final HashMap<Integer, String> itemName = new LinkedHashMap<>(); + private final HashMap<Integer, Boolean> hasEffect = new LinkedHashMap<>(); - public final HashMap<Short, Long[]> mElectricStats = new LinkedHashMap<Short, Long[]>(); - public final HashMap<Short, Short> mBurnValues = new LinkedHashMap<Short, Short>(); + public final HashMap<Short, Long[]> mElectricStats = new LinkedHashMap<>(); + public final HashMap<Short, Short> mBurnValues = new LinkedHashMap<>(); public void registerPumpType(final int aID, final String aPumpName, final int aEuMax, final int aTier) { ModItems.toolGregtechPump.registerItem( @@ -1117,7 +1117,7 @@ public class GregtechPump extends Item implements ISpecialElectricItem, IElectri return getStoredFluidOfVanillaTank((IFluidTank) aTileEntity); } FluidStack f; - AutoMap<FluidTankInfo[]> m = new AutoMap<FluidTankInfo[]>(); + AutoMap<FluidTankInfo[]> m = new AutoMap<>(); for (int i = 0; i < 6; i++) { m.put(aTileEntity.getTankInfo(ForgeDirection.getOrientation(i))); } diff --git a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java index c9a4def88c..7af2c3cf56 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java +++ b/src/main/java/gtPlusPlus/core/item/tool/staballoy/StaballoySpade.java @@ -189,37 +189,38 @@ public class StaballoySpade extends ItemSpade { float DURABILITY_LOSS = 0; if (!world.isRemote) { - if (FACING.equals("below") || FACING.equals("above")) { - DURABILITY_LOSS = 0; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS - + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem)); + switch (FACING) { + case "below", "above" -> { + DURABILITY_LOSS = 0; + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + DURABILITY_LOSS = (DURABILITY_LOSS + + this.removeBlockAndDropAsItem(world, X + i, Y, Z + j, heldItem)); + } } } - } else if (FACING.equals("facingEast") || FACING.equals("facingWest")) { - DURABILITY_LOSS = 0; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS - + this.removeBlockAndDropAsItem(world, X, Y + i, Z + j, heldItem)); + case "facingEast", "facingWest" -> { + DURABILITY_LOSS = 0; + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + DURABILITY_LOSS = (DURABILITY_LOSS + + this.removeBlockAndDropAsItem(world, X, Y + i, Z + j, heldItem)); + } } } - } else if (FACING.equals("facingNorth") || FACING.equals("facingSouth")) { - DURABILITY_LOSS = 0; - for (int i = -1; i < 2; i++) { - for (int j = -1; j < 2; j++) { - DURABILITY_LOSS = (DURABILITY_LOSS - + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem)); + case "facingNorth", "facingSouth" -> { + DURABILITY_LOSS = 0; + for (int i = -1; i < 2; i++) { + for (int j = -1; j < 2; j++) { + DURABILITY_LOSS = (DURABILITY_LOSS + + this.removeBlockAndDropAsItem(world, X + j, Y + i, Z, heldItem)); + } } } } // int heldItemDurability = heldItem.getDamage(1); Logger.WARNING("Total Loss: " + (int) DURABILITY_LOSS); - // heldItem.setDamage(heldStack, DURABILITY_LOSS); - // Utils.LOG_WARNING("|GID|Durability: "+heldItem.getItemDamage()); - // Utils.LOG_WARNING("Durability: "+heldStack.getDamage(heldStack)); Logger.WARNING("1x: " + (heldItem.getItemDamage())); final int itemdmg = heldItem.getItemDamage(); final int maxdmg = heldItem.getMaxDamage(); @@ -316,8 +317,6 @@ public class StaballoySpade extends ItemSpade { public boolean checkFacing(final ItemStack aStack, final EntityPlayer aPlayer, final World world) { if (aPlayer != null) { final int direction = MathHelper.floor_double((aPlayer.rotationYaw * 4F) / 360F + 0.5D) & 3; - // Utils.LOG_WARNING("Player - F: "+direction); - // Utils.LOG_WARNING("Player - getLookVec(): "+localPlayer.getLookVec().yCoord); /* * if (localPlayer.getLookVec().yCoord > 0){ localPlayer.getLookVec().yCoord; } diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java index a47fa597be..06e6c54ca8 100644 --- a/src/main/java/gtPlusPlus/core/lib/CORE.java +++ b/src/main/java/gtPlusPlus/core/lib/CORE.java @@ -60,7 +60,7 @@ public class CORE { public static final GameProfile gameProfile = new GameProfile( UUID.nameUUIDFromBytes("gtplusplus.core".getBytes()), "[GT++]"); - public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<World, EntityPlayerMP>(); + public static final WeakHashMap<World, EntityPlayerMP> fakePlayerCache = new WeakHashMap<>(); // Tooltips; public static final Supplier<String> GT_Tooltip = () -> StatCollector.translateToLocal("GTPP.core.GT_Tooltip"); public static final Supplier<String> GT_Tooltip_Builder = () -> StatCollector @@ -76,14 +76,14 @@ public class CORE { */ // Burnables List - public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<Pair<Integer, ItemStack>>(); + public static List<Pair<Integer, ItemStack>> burnables = new ArrayList<>(); // TesseractMaps public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractGenerator>> sTesseractGeneratorOwnershipMap = new HashMap<>(); public static final Map<UUID, Map<Integer, GT_MetaTileEntity_TesseractTerminal>> sTesseractTerminalOwnershipMap = new HashMap<>(); // BookMap - public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<String, ItemStack>(); + public static final Map<String, ItemStack> sBookList = new ConcurrentHashMap<>(); /** * Some Gregtech Material and Recipe Variables diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java index fe1dcd618d..11ef72f06c 100644 --- a/src/main/java/gtPlusPlus/core/material/Material.java +++ b/src/main/java/gtPlusPlus/core/material/Material.java @@ -36,12 +36,12 @@ import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; public class Material { - public static final Set<Material> mMaterialMap = new HashSet<Material>(); - public static HashMap<String, Material> mMaterialCache = new HashMap<String, Material>(); + public static final Set<Material> mMaterialMap = new HashSet<>(); + public static HashMap<String, Material> mMaterialCache = new HashMap<>(); - public static final Map<String, Map<String, ItemStack>> mComponentMap = new HashMap<String, Map<String, ItemStack>>(); + public static final Map<String, Map<String, ItemStack>> mComponentMap = new HashMap<>(); - public static HashMap<String, String> sChemicalFormula = new HashMap<String, String>(); + public static HashMap<String, String> sChemicalFormula = new HashMap<>(); private String unlocalizedName; private String localizedName; @@ -88,7 +88,7 @@ public class Material { public short werkstoffID; - public static AutoMap<Materials> invalidMaterials = new AutoMap<Materials>(); + public static AutoMap<Materials> invalidMaterials = new AutoMap<>(); public Material(final String materialName, final MaterialState defaultState, final MaterialStack... inputs) { this(materialName, defaultState, null, inputs); @@ -376,7 +376,7 @@ public class Material { rgba = null; } - mComponentMap.put(unlocalizedName, new HashMap<String, ItemStack>()); + mComponentMap.put(unlocalizedName, new HashMap<>()); try { this.unlocalizedName = Utils.sanitizeString(materialName); @@ -414,8 +414,8 @@ public class Material { Short[] mMixedRGB = new Short[3]; AutoMap<Material> mMaterialSet = MaterialUtils.getCompoundMaterialsRecursively(this); for (int mnh = 0; mnh < 3; mnh++) { - AutoMap<Short> aDataSet = new AutoMap<Short>(); - Set<Material> set4 = new HashSet<Material>(); + AutoMap<Short> aDataSet = new AutoMap<>(); + Set<Material> set4 = new HashSet<>(); for (Material u : mMaterialSet) { // if (u.getState() == MaterialState.ORE || u.getState() == MaterialState.SOLID) set4.add(u); @@ -571,7 +571,7 @@ public class Material { this.vRadiationLevel = (byte) radiationLevel; } else { if (vMaterialInput.size() > 0) { - AutoMap<Byte> aDataSet = new AutoMap<Byte>(); + AutoMap<Byte> aDataSet = new AutoMap<>(); for (MaterialStack m : this.vMaterialInput) { aDataSet.put(m.getStackMaterial().vRadiationLevel); } @@ -582,7 +582,7 @@ public class Material { + aAverage + "."); this.isRadioactive = true; - this.vRadiationLevel = (byte) aAverage; + this.vRadiationLevel = aAverage; } else { Logger.MATERIALS(this.getLocalizedName() + " is not radioactive."); this.isRadioactive = false; @@ -617,8 +617,8 @@ public class Material { int tempSmallestSize = 0; if (this.vSmallestRatio != null) { - for (int v = 0; v < this.vSmallestRatio.length; v++) { - tempSmallestSize = (int) (tempSmallestSize + this.vSmallestRatio[v]); + for (long l : this.vSmallestRatio) { + tempSmallestSize = (int) (tempSmallestSize + l); } this.smallestStackSizeWhenProcessing = tempSmallestSize; // Valid stacksizes } else { @@ -670,11 +670,11 @@ public class Material { } String ratio = ""; if (this.vSmallestRatio != null) { - for (int hu = 0; hu < this.vSmallestRatio.length; hu++) { + for (long l : this.vSmallestRatio) { if (ratio.equals("")) { - ratio = String.valueOf(this.vSmallestRatio[hu]); + ratio = String.valueOf(l); } else { - ratio = ratio + ":" + this.vSmallestRatio[hu]; + ratio = ratio + ":" + l; } } } @@ -825,7 +825,7 @@ public class Material { } // build hash table with count - AutoMap<Material> sets = new AutoMap<Material>(); + AutoMap<Material> sets = new AutoMap<>(); if (this.vMaterialInput != null) { for (MaterialStack r : this.vMaterialInput) { if (r.getStackMaterial().getTextureSet().mSetName.toLowerCase().contains("fluid")) { @@ -834,8 +834,7 @@ public class Material { sets.put(r.getStackMaterial()); } } - TextureSet mostUsedTypeTextureSet = MaterialUtils - .getMostCommonTextureSet(new ArrayList<Material>(sets.values())); + TextureSet mostUsedTypeTextureSet = MaterialUtils.getMostCommonTextureSet(new ArrayList<>(sets.values())); if (mostUsedTypeTextureSet != null && mostUsedTypeTextureSet instanceof TextureSet) { Logger.MATERIALS( "Set textureset for " + this.localizedName + " to be " + mostUsedTypeTextureSet.mSetName + "."); @@ -938,7 +937,7 @@ public class Material { String aKey = aPrefix.name(); Map<String, ItemStack> g = mComponentMap.get(this.unlocalizedName); if (g == null) { - Map<String, ItemStack> aMap = new HashMap<String, ItemStack>(); + Map<String, ItemStack> aMap = new HashMap<>(); mComponentMap.put(unlocalizedName, aMap); g = aMap; } @@ -1245,7 +1244,7 @@ public class Material { return new int[] {}; } - private final short getComponentCount(final MaterialStack[] inputs) { + private short getComponentCount(final MaterialStack[] inputs) { if (inputs == null || inputs.length < 1) { return 1; @@ -1271,8 +1270,6 @@ public class Material { // Utils.LOG_MATERIALS("length: "+inputs.length); final long[] tempRatio = new long[tempInput.size()]; for (int x = 0; x < tempInput.size(); x++) { - // tempPercentage = tempPercentage+inputs[x].percentageToUse; - // this.mMaterialList.add(inputs[x]); if (tempInput.get(x) != null) { tempRatio[x] = tempInput.get(x).getPartsPerOneHundred(); } @@ -1282,16 +1279,16 @@ public class Material { if (smallestRatio.length > 0) { String tempRatioStringThing1 = ""; - for (int r = 0; r < tempRatio.length; r++) { - tempRatioStringThing1 = tempRatioStringThing1 + tempRatio[r] + " : "; + for (long value : tempRatio) { + tempRatioStringThing1 = tempRatioStringThing1 + value + " : "; } Logger.MATERIALS("Default Ratio: " + tempRatioStringThing1); String tempRatioStringThing = ""; int tempSmallestCraftingUseSize = 0; - for (int r = 0; r < smallestRatio.length; r++) { - tempRatioStringThing = tempRatioStringThing + smallestRatio[r] + " : "; - tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + smallestRatio[r]); + for (long l : smallestRatio) { + tempRatioStringThing = tempRatioStringThing + l + " : "; + tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + l); } // this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize; Logger.MATERIALS("Smallest Ratio: " + tempRatioStringThing); @@ -1546,7 +1543,7 @@ public class Material { public final int calculateMeltingPoint() { try { - AutoMap<Integer> aDataSet = new AutoMap<Integer>(); + AutoMap<Integer> aDataSet = new AutoMap<>(); for (MaterialStack m : this.vMaterialInput) { aDataSet.put(m.getStackMaterial().getMeltingPointC()); } @@ -1561,7 +1558,7 @@ public class Material { public final int calculateBoilingPoint() { try { - AutoMap<Integer> aDataSet = new AutoMap<Integer>(); + AutoMap<Integer> aDataSet = new AutoMap<>(); for (MaterialStack m : this.vMaterialInput) { aDataSet.put(m.getStackMaterial().getBoilingPointC()); } @@ -1576,7 +1573,7 @@ public class Material { public final long calculateProtons() { try { - AutoMap<Long> aDataSet = new AutoMap<Long>(); + AutoMap<Long> aDataSet = new AutoMap<>(); for (MaterialStack m : this.vMaterialInput) { aDataSet.put(m.getStackMaterial().getProtons()); } @@ -1591,7 +1588,7 @@ public class Material { public final long calculateNeutrons() { try { - AutoMap<Long> aDataSet = new AutoMap<Long>(); + AutoMap<Long> aDataSet = new AutoMap<>(); for (MaterialStack m : this.vMaterialInput) { aDataSet.put(m.getStackMaterial().getNeutrons()); } @@ -1653,7 +1650,7 @@ public class Material { // Register Component Map<String, ItemStack> aMap = Material.mComponentMap.get(componentMaterial.getUnlocalizedName()); if (aMap == null) { - aMap = new HashMap<String, ItemStack>(); + aMap = new HashMap<>(); } String aKey = aPrefix.name(); ItemStack x = aMap.get(aKey); diff --git a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java index 62fe3440ec..2e120107c9 100644 --- a/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java +++ b/src/main/java/gtPlusPlus/core/material/MaterialGenerator.java @@ -60,7 +60,7 @@ import gtPlusPlus.xmod.gregtech.loaders.RecipeGen_ShapedCrafting; public class MaterialGenerator { - public static final AutoMap<Set<RunnableWithInfo<Material>>> mRecipeMapsToGenerate = new AutoMap<Set<RunnableWithInfo<Material>>>(); + public static final AutoMap<Set<RunnableWithInfo<Material>>> mRecipeMapsToGenerate = new AutoMap<>(); @SuppressWarnings("unused") private static volatile Item temp; @@ -336,7 +336,7 @@ public class MaterialGenerator { } if (generateOre) { - tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE, Colour.intValue()); + tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE); } DustState aState = new DustState(generateDust, generateSmallTinyDusts, generateSmallTinyDusts); @@ -385,7 +385,7 @@ public class MaterialGenerator { final short[] C = matInfo.getRGBA(); final Integer Colour = Utils.rgbtoHexValue(C[0], C[1], C[2]); - tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE, Colour.intValue()); + tempBlock = new BlockBaseOre(matInfo, BlockTypes.ORE); tempBlock = new BlockBaseModular(matInfo, BlockTypes.STANDARD); temp = new BaseItemIngot(matInfo); temp = new BaseItemDust(matInfo); diff --git a/src/main/java/gtPlusPlus/core/material/Particle.java b/src/main/java/gtPlusPlus/core/material/Particle.java index 77ccb2ab43..099c03297f 100644 --- a/src/main/java/gtPlusPlus/core/material/Particle.java +++ b/src/main/java/gtPlusPlus/core/material/Particle.java @@ -42,7 +42,7 @@ public class Particle { public static final Particle UNKNOWN; - public static final AutoMap<Particle> aMap = new AutoMap<Particle>(); + public static final AutoMap<Particle> aMap = new AutoMap<>(); static { diff --git a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java index 34abbd0844..9fb5cde101 100644 --- a/src/main/java/gtPlusPlus/core/material/state/MaterialState.java +++ b/src/main/java/gtPlusPlus/core/material/state/MaterialState.java @@ -10,7 +10,7 @@ public enum MaterialState { ORE(5), PURE_GAS(6); - private int STATE; + private final int STATE; private MaterialState(final int State) { this.STATE = State; diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index f1052d9332..b1bcbe39ed 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -1,14 +1,9 @@ package gtPlusPlus.core.proxy; -import static gregtech.api.enums.Mods.PlayerAPI; - import java.util.ArrayList; import net.minecraft.client.Minecraft; -import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.entity.RenderFireball; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +17,6 @@ import net.minecraftforge.fluids.FluidStack; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; @@ -32,7 +26,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.Mods; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.Pair; @@ -44,20 +37,14 @@ import gtPlusPlus.core.client.renderer.RenderSickBlaze; import gtPlusPlus.core.client.renderer.RenderStaballoyConstruct; import gtPlusPlus.core.client.renderer.RenderToxinball; import gtPlusPlus.core.common.CommonProxy; -import gtPlusPlus.core.common.compat.COMPAT_PlayerAPI; import gtPlusPlus.core.entity.EntityPrimedMiningExplosive; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; -import gtPlusPlus.core.entity.projectile.EntityHydrofluoricAcidPotion; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; -import gtPlusPlus.core.entity.projectile.EntitySulfuricAcidPotion; -import gtPlusPlus.core.entity.projectile.EntityThrowableBomb; import gtPlusPlus.core.entity.projectile.EntityToxinballSmall; -import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; -import gtPlusPlus.core.util.minecraft.particles.EntityParticleFXMysterious; import gtPlusPlus.xmod.gregtech.common.render.GTPP_CapeRenderer; import gtPlusPlus.xmod.gregtech.common.render.GTPP_FlaskRenderer; import gtPlusPlus.xmod.gregtech.common.render.GTPP_Render_MachineBlock; @@ -94,17 +81,10 @@ public class ClientProxy extends CommonProxy implements Runnable { } // Do this weird things for textures. GTplusplus.loadTextures(); - // We boot up the sneak manager. - if (PlayerAPI.isModLoaded()) { - this.init_PlayerAPI_PRE(); - } } @Override public void init(final FMLInitializationEvent e) { - if (PlayerAPI.isModLoaded()) { - this.init_PlayerAPI_INIT(); - } /** * Custom Block Renderers @@ -137,14 +117,6 @@ public class ClientProxy extends CommonProxy implements Runnable { RenderingRegistry .registerEntityRenderingHandler(EntityStaballoyConstruct.class, new RenderStaballoyConstruct()); RenderingRegistry.registerEntityRenderingHandler(EntityToxinballSmall.class, new RenderToxinball(1F)); - RenderingRegistry.registerEntityRenderingHandler( - EntitySulfuricAcidPotion.class, - new RenderSnowball(ModItems.itemSulfuricPotion)); - RenderingRegistry.registerEntityRenderingHandler( - EntityHydrofluoricAcidPotion.class, - new RenderSnowball(ModItems.itemHydrofluoricPotion)); - RenderingRegistry - .registerEntityRenderingHandler(EntityThrowableBomb.class, new RenderSnowball(ModItems.itemBomb, 1)); RenderingRegistry.registerEntityRenderingHandler(EntityLightningAttack.class, new RenderFireball(1F)); /** @@ -168,36 +140,8 @@ public class ClientProxy extends CommonProxy implements Runnable { } @Override - public void generateMysteriousParticles(final Entity theEntity) { - final double motionX = theEntity.worldObj.rand.nextGaussian() * 0.02D; - final double motionY = theEntity.worldObj.rand.nextGaussian() * 0.02D; - final double motionZ = theEntity.worldObj.rand.nextGaussian() * 0.02D; - final EntityFX particleMysterious = new EntityParticleFXMysterious( - theEntity.worldObj, - (theEntity.posX + (theEntity.worldObj.rand.nextFloat() * theEntity.width * 2.0F)) - theEntity.width, - theEntity.posY + 0.5D + (theEntity.worldObj.rand.nextFloat() * theEntity.height), - (theEntity.posZ + (theEntity.worldObj.rand.nextFloat() * theEntity.width * 2.0F)) - theEntity.width, - motionX, - motionY, - motionZ); - Minecraft.getMinecraft().effectRenderer.addEffect(particleMysterious); - } - - @Override public void serverStarting(final FMLServerStartingEvent e) {} - @Optional.Method(modid = Mods.Names.PLAYER_API) - private void init_PlayerAPI_PRE() { - // Register player instance - COMPAT_PlayerAPI.clientProxy.initPre(); - } - - @Optional.Method(modid = Mods.Names.PLAYER_API) - private void init_PlayerAPI_INIT() { - // Register player instance - COMPAT_PlayerAPI.clientProxy.Init(); - } - public void onPreLoad() { /* * if (ConfigSwitches.enableCustomCapes){ String arr$[] = { "draknyte1", "fobius" }; int len$ = arr$.length; for @@ -227,7 +171,7 @@ public class ClientProxy extends CommonProxy implements Runnable { } public void hideUniversalCells() { - ArrayList<ItemStack> itemList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> itemList = new ArrayList<>(); for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { if (fluid == null) { continue; diff --git a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java index 6741399289..a10d2cd05b 100644 --- a/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java +++ b/src/main/java/gtPlusPlus/core/recipe/LOADER_Machine_Components.java @@ -3,7 +3,6 @@ package gtPlusPlus.core.recipe; import gregtech.api.enums.ItemList; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class LOADER_Machine_Components { @@ -101,29 +100,15 @@ public class LOADER_Machine_Components { CI.fluidRegulator_UV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32667, 1); // Thanks 0lafe - CI.electricMotor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1); - CI.electricPump_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32618, 1); - CI.electricPiston_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32648, 1); - CI.robotArm_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32658, 1); - CI.conveyorModule_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); - CI.emitter_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32688, 1); - CI.fieldGenerator_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32678, 1); - CI.sensor_MAX = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32698, 1); - - registerComponentsULV(); - } + CI.electricMotor_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32596, 1); + CI.electricPump_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32618, 1); + CI.electricPiston_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32648, 1); + CI.robotArm_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32658, 1); + CI.conveyorModule_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32638, 1); + CI.emitter_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32688, 1); + CI.fieldGenerator_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32678, 1); + CI.sensor_UHV = ItemUtils.simpleMetaStack("gregtech:gt.metaitem.01", 32698, 1); - private static boolean registerComponentsULV() { - - CI.electricMotor_ULV = GregtechItemList.Electric_Motor_ULV.get(1); - CI.electricPump_ULV = GregtechItemList.Electric_Pump_ULV.get(1); - CI.electricPiston_ULV = GregtechItemList.Electric_Piston_ULV.get(1); - CI.robotArm_ULV = GregtechItemList.Robot_Arm_ULV.get(1); - CI.conveyorModule_ULV = GregtechItemList.Conveyor_Module_ULV.get(1); - CI.emitter_ULV = GregtechItemList.Emitter_ULV.get(1); - CI.fieldGenerator_ULV = GregtechItemList.Field_Generator_ULV.get(1); - CI.sensor_ULV = GregtechItemList.Sensor_ULV.get(1); - return true; } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 601b02cb6c..6e555c049e 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -14,16 +14,13 @@ import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistillationRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sExtruderRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidHeaterRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFusionRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLaserEngraverRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sLatheRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMaceratorRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes; -import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; import static gregtech.api.util.GT_RecipeBuilder.BUCKETS; import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.INGOTS; @@ -60,7 +57,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.item.chemistry.IonParticles; -import gtPlusPlus.core.item.chemistry.RocketFuels; import gtPlusPlus.core.item.crafting.ItemDummyResearch; import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH; import gtPlusPlus.core.lib.CORE; @@ -88,7 +84,6 @@ public class RECIPES_GREGTECH { private static void execute() { electrolyzerRecipes(); assemblerRecipes(); - fluidCannerRecipes(); distilleryRecipes(); extractorRecipes(); fluidExtractorRecipes(); @@ -108,8 +103,6 @@ public class RECIPES_GREGTECH { breweryRecipes(); laserEngraverRecipes(); assemblyLineRecipes(); - latheRecipes(); - vacuumFreezerRecipes(); fluidHeaterRecipes(); chemplantRecipes(); alloySmelterRecipes(); @@ -270,24 +263,6 @@ public class RECIPES_GREGTECH { .duration(1 * SECONDS + 10 * TICKS).eut(TierEU.RECIPE_LV).addTo(sFluidHeaterRecipes); } - private static void vacuumFreezerRecipes() { - GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Molten.get(1)) - .itemOutputs(GregtechItemList.Bomb_Cast_Set.get(1)).duration(30 * SECONDS).eut(TierEU.RECIPE_MV) - .addTo(sVacuumRecipes); - } - - private static void latheRecipes() { - GT_Values.RA.stdBuilder().itemInputs(ALLOY.EGLIN_STEEL.getBlock(1)) - .itemOutputs(GregtechItemList.Bomb_Cast_Mold.get(1)).duration(15 * MINUTES).eut(TierEU.RECIPE_MV) - .addTo(sLatheRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Set.get(1)) - .itemOutputs( - GregtechItemList.Bomb_Cast_Broken.get(2), - ItemUtils.getSimpleStack(ModItems.itemBombCasing, 2)) - .duration(5 * MINUTES).eut(TierEU.RECIPE_LV).addTo(sLatheRecipes); - } - private static void fusionRecipes() { // Hypogen GT_Values.RA.stdBuilder() @@ -474,7 +449,7 @@ public class RECIPES_GREGTECH { CI.getTieredComponent(OrePrefixes.cableGt12, h - 1, 16), CI.getTieredComponent(OrePrefixes.screw, h, 16), CI.getTieredComponent(OrePrefixes.bolt, h - 2, 32), - CI.getFieldGenerator(h, 1)) + CI.getFieldGenerator(h - 1, 1)) .fluidInputs( CI.getTieredFluid(h, 144 * 4 * 8), CI.getTertiaryTieredFluid(h - 1, 144 * 4 * 8), @@ -536,15 +511,14 @@ public class RECIPES_GREGTECH { private static void laserEngraverRecipes() { // Laser Sensors and Emitters together - GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, }; - for (int i = 0; i < 10; i++) { + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV, + GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV, + GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV, + GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM, + GregtechItemList.TransmissionComponent_UV, GregtechItemList.TransmissionComponent_UHV, }; + for (int i = 1; i < aTransParts.length; i++) { GT_Values.RA.stdBuilder().itemInputs(CI.getEmitter(i, 2), CI.getSensor(i, 2)) - .itemOutputs(aTransParts[i].get(1)).duration(5 * SECONDS).eut(GT_Values.VP[i]) + .itemOutputs(aTransParts[i - 1].get(1)).duration(5 * SECONDS).eut(GT_Values.VP[i]) .addTo(sLaserEngraverRecipes); } @@ -792,24 +766,6 @@ public class RECIPES_GREGTECH { 491520); } - private static void fluidCannerRecipes() { - // Sulfuric Acid - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.glass_bottle)) - .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion)) - .fluidInputs(Materials.SulfuricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.itemSulfuricPotion)) - .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle)) - .fluidOutputs(Materials.SulfuricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); - - // Hydrofluoric Acid - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(Items.glass_bottle)) - .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion)) - .fluidInputs(Materials.HydrofluoricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); - GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(ModItems.itemHydrofluoricPotion)) - .itemOutputs(ItemUtils.getSimpleStack(Items.glass_bottle)) - .fluidOutputs(Materials.HydrofluoricAcid.getFluid(250)).duration(4).eut(1).addTo(sFluidCannerRecipes); - } - private static void dehydratorRecipes() { Logger.INFO("Loading Recipes for Chemical Dehydrator."); @@ -986,13 +942,6 @@ public class RECIPES_GREGTECH { GT_Values.RA.stdBuilder() .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 32L), - GregtechItemList.Bomb_Cast_Mold.get(0)) - .itemOutputs(GregtechItemList.Bomb_Cast.get(4)).fluidInputs(Materials.Water.getFluid(4000L)) - .duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( ItemUtils.getSimpleStack(CI.explosiveITNT, 2), ItemUtils.getSimpleStack(CI.explosiveTNT, 4), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 2L), @@ -1293,23 +1242,6 @@ public class RECIPES_GREGTECH { private static void chemicalReactorRecipes() { - // Bombs - GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(ModItems.itemBombCasing, 4), - ItemUtils.getSimpleStack(RocketFuels.Ammonium_Nitrate_Dust, 8)) - .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4)) - .fluidInputs(Materials.Fuel.getFluid(1000)).duration(5 * MINUTES).eut(TierEU.RECIPE_LV) - .addTo(UniversalChemical); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemUtils.getSimpleStack(ModItems.itemBombUnf, 4), - ItemUtils.getSimpleStack(ModItems.itemDetCable, 4)) - .itemOutputs(ItemUtils.getSimpleStack(ModItems.itemBomb, 4)) - .fluidInputs(FluidUtils.getFluidStack(RocketFuels.Kerosene, 100)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(UniversalChemical); - GT_Values.RA.stdBuilder() .itemInputs( CI.getNumberedAdvancedCircuit(21), @@ -1348,14 +1280,6 @@ public class RECIPES_GREGTECH { .fluidInputs(Materials.Nitrogen.getGas(4000)).fluidOutputs().duration(1 * MINUTES).eut(TierEU.RECIPE_IV) .metadata(COIL_HEAT, 4500).addTo(sBlastRecipes); - // Bomb Cast (Hot) - GT_Values.RA.stdBuilder() - .itemInputs( - GregtechItemList.Bomb_Cast.get(4), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Steel, 16L)) - .itemOutputs(GregtechItemList.Bomb_Cast_Molten.get(4)).fluidInputs(Materials.Oxygen.getGas(2000)) - .fluidOutputs().duration(4 * MINUTES).eut(TierEU.RECIPE_HV).metadata(COIL_HEAT, 2800) - .addTo(sBlastRecipes); } private static void compressorRecipes() { @@ -1377,10 +1301,6 @@ public class RECIPES_GREGTECH { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.MeatRaw, 9L)).duration(44 * SECONDS) .eut(4).addTo(sMaceratorRecipes); - GT_Values.RA.stdBuilder().itemInputs(GregtechItemList.Bomb_Cast_Broken.get(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Clay, 3L)).duration(20 * SECONDS) - .eut(2).addTo(sMaceratorRecipes); - if (ItemUtils.simpleMetaStack("chisel:limestone", 0, 1) != null) { GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("limestone", 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcite, 4L)) diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java index 99fd4cfb15..35009804df 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -49,8 +49,6 @@ public class RECIPES_General { static String RECIPE_BronzePlate = "plateBronze"; static String RECIPE_StainlessPlate = "plateStainlessSteel"; static ItemStack RECIPE_BasicCasingIC2; - static ItemStack OUTPUT_Workbench_Bronze; - static ItemStack OUTPUT_Workbench_Advanced; static ItemStack RECIPE_HydrogenDust; public static void loadRecipes() { @@ -61,8 +59,6 @@ public class RECIPES_General { RECIPE_CraftingTable = ItemUtils.getSimpleStack(Blocks.crafting_table); RECIPE_HydrogenDust = ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob); RECIPE_BasicCasingIC2 = ItemUtils.getItemStackFromFQRN("IC2:blockMachine", 1); - OUTPUT_Workbench_Bronze = GregtechItemList.GT4_Workbench_Bronze.get(1); - OUTPUT_Workbench_Advanced = GregtechItemList.GT4_Workbench_Advanced.get(1); OUTPUT_Blueprint = ItemUtils.getSimpleStack(ModItems.itemBlueprintBase, 2); run(); addCompressedObsidian(); @@ -83,31 +79,6 @@ public class RECIPES_General { NULL, OUTPUT_Blueprint); - // Bronze Workbench - RecipeUtils.addShapedRecipe( - RECIPE_BronzePlate, - RECIPE_CraftingTable, - RECIPE_BronzePlate, - RECIPE_BronzePlate, - RECIPE_BasicCasingIC2, - RECIPE_BronzePlate, - RECIPE_BronzePlate, - CI.getTieredCircuitOreDictName(0), - RECIPE_BronzePlate, - OUTPUT_Workbench_Bronze); - - RecipeUtils.addShapedRecipe( - RECIPE_StainlessPlate, - CI.getTieredCircuitOreDictName(3), - RECIPE_StainlessPlate, - RECIPE_StainlessPlate, - OUTPUT_Workbench_Bronze, - RECIPE_StainlessPlate, - RECIPE_StainlessPlate, - CI.getTieredCircuitOreDictName(3), - RECIPE_StainlessPlate, - OUTPUT_Workbench_Advanced); - // Rainforest oak Sapling if (RecipeUtils.addShapedRecipe( "stickWood", diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java index 29a09fc2b4..4929872caa 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java @@ -1,194 +1,10 @@ package gtPlusPlus.core.recipe; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.RecipeUtils; - public class RECIPES_MachineComponents { - // Wire - public static String wireTier0 = "wireGt01Lead"; - public static String wireTier1 = "wireGt01RedAlloy"; - public static String wireTier6 = "wireGt08NiobiumTitanium"; - public static String wireTier7 = "wireGt08Osmium"; - public static String wireTier8 = "wireGt08Naquadah"; - public static String wireTier9 = "wireGt08Superconductor"; - public static String wireTier10 = "wireGt16Superconductor"; - - // Cable - public static String cableTier0 = "cableGt01Lead"; - public static String cableTier1 = "cableGt01RedAlloy"; - public static String cableTier6 = "cableGt04Tungsten"; - public static String cableTier7 = "cableGt04NiobiumTitanium"; - public static String cableTier8 = "cableGt04Osmium"; - public static String cableTier9 = "cableGt04Naquadah"; - public static String cableTier10 = "wireGt08Superconductor"; - - // Plates - public static String plateTier0 = "plateWroughtIron"; - public static String plateTier7 = "plateChrome"; - public static String plateTier8 = "plateIridium"; - public static String plateTier9 = "plateOsmium"; - public static String plateTier10 = "plateNeutronium"; - - // rods - public static String rodTier0 = "stickWroughtIron"; - public static String rodTier1 = "stickPotin"; - public static String rodTier2 = "stickIronMagnetic"; - public static String rodTier7a = "stickChrome"; - public static String rodTier8a = "stickIridium"; - public static String rodTier9a = "stickOsmium"; - public static String rodTier10a = "stickNeutronium"; - public static String rodTier7b = "stickPlatinum"; - public static String rodTier8b = "stickChrome"; - public static String rodTier9b = "stickIridium"; - public static String rodTier10b = "stickOsmium"; - public static String rodTier7c = "stickTitanium"; - public static String rodTier8c = "stickTungstenSteel"; - public static String rodTier9c = "stickNaquadah"; - public static String rodTier10c = "stickOsmium"; - - // Screws - public static String screwTier0 = "screwPotin"; - public static String screwTier7 = "screwChrome"; - public static String screwTier8 = "screwIridium"; - public static String screwTier9 = "screwOsmium"; - public static String screwTier10 = "screwNeutronium"; - - // Rotors - public static String rotorTier0 = "rotorPotin"; - public static String rotorTier7 = "rotorChrome"; - public static String rotorTier8 = "rotorIridium"; - public static String rotorTier9 = "rotorOsmium"; - public static String rotorTier10 = "rotorNeutronium"; - // Fluid Pipe - public static String pipeTier0 = "pipeSmallLead"; public static String pipeTier7 = "pipeHugeSteel"; public static String pipeTier8 = "pipeHugeStainlessSteel"; public static String pipeTier9 = "pipeHugeTitanium"; - public static String pipeTier10 = "pipeHugeTungstenSteel"; - - // Rubber Ring/Plate - public static String itemRubberRing = "ringRubber"; - public static String plateRubber = "plateRubber"; - - // Circuits - public static String circuitTier0 = "circuitPrimitive"; - public static String circuitTier1 = "circuitBasic"; - public static String circuitTier6 = "circuitMaster"; - public static String circuitTier7 = "circuitUltimate"; - public static String circuitTier8 = "circuitSuperconductor"; - public static String circuitTier9 = "circuitInfinite"; - public static String circuitTier10 = "circuitQuantum"; - - // small gears - public static String smallGearTier0 = "gearGtSmallWroughtIron"; - public static String smallGearTier7 = "gearGtSmallChrome"; - public static String smallGearTier8 = "gearGtSmallIridium"; - public static String smallGearTier9 = "gearGtSmallOsmium"; - public static String smallGearTier10 = "gearGtSmallNeutronium"; - - public static final void loadRecipes() { - Logger.INFO("Loading Recipes for the Various Circuits and Machine components."); - onlyULVComponents(); - } - - private static void onlyULVComponents() { - RecipeUtils.addShapedGregtechRecipe( - cableTier1, - wireTier0, - rodTier0, - wireTier0, - rodTier2, - wireTier0, - rodTier0, - wireTier0, - cableTier1, - CI.electricMotor_ULV); - - RecipeUtils.addShapedGregtechRecipe( - cableTier0, - rotorTier0, - itemRubberRing, - CI.craftingToolScrewdriver, - pipeTier0, - CI.craftingToolWrench, - itemRubberRing, - CI.electricMotor_ULV, - cableTier0, - CI.electricPump_ULV); - - RecipeUtils.addShapedGregtechRecipe( - plateTier0, - plateTier0, - plateTier0, - cableTier0, - rodTier1, - rodTier1, - cableTier0, - CI.electricMotor_ULV, - smallGearTier0, - CI.electricPiston_ULV); - - RecipeUtils.addShapedGregtechRecipe( - cableTier0, - cableTier0, - cableTier0, - CI.electricMotor_ULV, - rodTier1, - CI.electricMotor_ULV, - CI.electricPiston_ULV, - circuitTier0, - rodTier1, - CI.robotArm_ULV); - - RecipeUtils.addShapedGregtechRecipe( - plateRubber, - plateRubber, - plateRubber, - CI.electricMotor_ULV, - cableTier0, - CI.electricMotor_ULV, - plateRubber, - plateRubber, - plateRubber, - CI.conveyorModule_ULV); - - RecipeUtils.addShapedGregtechRecipe( - rodTier2, - rodTier2, - circuitTier0, - cableTier0, - circuitTier1, - rodTier2, - circuitTier0, - cableTier0, - rodTier2, - CI.emitter_ULV); - - RecipeUtils.addShapedGregtechRecipe( - wireTier0, - circuitTier0, - wireTier0, - circuitTier0, - circuitTier1, - circuitTier0, - wireTier0, - circuitTier0, - wireTier0, - CI.fieldGenerator_ULV); - RecipeUtils.addShapedRecipe( - plateTier0, - null, - circuitTier1, - plateTier0, - rodTier2, - null, - circuitTier0, - plateTier0, - plateTier0, - CI.sensor_ULV); - } } diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index bd75847153..2016a6582c 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,6 +1,12 @@ package gtPlusPlus.core.recipe; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.COFHCore; +import static gregtech.api.enums.Mods.EternalSingularity; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.Railcraft; +import static gregtech.api.enums.Mods.RemoteIO; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -43,10 +49,6 @@ import gtPlusPlus.xmod.gregtech.common.helpers.VolumetricFlaskHelper; public class RECIPES_Machines { // Outputs - // static ItemStack RECIPE_BufferCore_ULV = new ItemStack(GregtechEnergyBuffer.itemBufferCore); - public static ItemStack RECIPE_SteamCondenser; - public static ItemStack RECIPE_IronBlastFurnace; - public static ItemStack RECIPE_IronPlatedBricks; public static ItemStack RECIPE_Buffer_ULV = GregtechItemList.Energy_Buffer_1by1_ULV.get(1); public static ItemStack RECIPE_Buffer_LV = GregtechItemList.Energy_Buffer_1by1_LV.get(1); public static ItemStack RECIPE_Buffer_MV = GregtechItemList.Energy_Buffer_1by1_MV.get(1); @@ -235,8 +237,6 @@ public class RECIPES_Machines { fakeMachineCasingCovers(); overflowValveCovers(); superBuses(); - roundRobinators(); - chunkloaders(); distillus(); algaeFarm(); chemPlant(); @@ -250,10 +250,8 @@ public class RECIPES_Machines { chiselBuses(); gt4FarmManager(); - gt4Redstone(); gt4Inventory(); - // multiGeneratorArray(); multiForgeHammer(); multiMolecularTransformer(); multiXlTurbines(); @@ -325,149 +323,15 @@ public class RECIPES_Machines { } } - private static void gt4Redstone() { - - RecipeUtils.addShapedRecipe( - "plateIron", - "plateGlass", - "plateIron", - "plateGlass", - ItemUtils.getSimpleStack(Blocks.redstone_lamp), - "plateGlass", - "plateIron", - "plateGlass", - "plateIron", - GregtechItemList.GT4_Redstone_Lamp.get(2)); - RecipeUtils.addShapedRecipe( - "plateAluminium", - "plateGlass", - "plateAluminium", - "plateGlass", - ItemUtils.getSimpleStack(Blocks.redstone_lamp), - "plateGlass", - "plateAluminium", - "plateGlass", - "plateAluminium", - GregtechItemList.GT4_Redstone_Lamp.get(8)); - - RecipeUtils.addShapedRecipe( - "plateIron", - "plateIron", - "plateIron", - ItemUtils.getSimpleStack(Items.comparator), - ItemList.Cover_Screen.get(1), - ItemUtils.getSimpleStack(Items.comparator), - "plateIron", - "plateIron", - "plateIron", - GregtechItemList.GT4_Redstone_Display.get(2)); - RecipeUtils.addShapedRecipe( - "plateAluminium", - "plateAluminium", - "plateAluminium", - ItemUtils.getSimpleStack(Items.comparator), - ItemList.Cover_Screen.get(1), - ItemUtils.getSimpleStack(Items.comparator), - "plateAluminium", - "plateAluminium", - "plateAluminium", - GregtechItemList.GT4_Redstone_Display.get(8)); - - RecipeUtils.addShapedRecipe( - "plateIron", - "plateIron", - "plateIron", - ItemUtils.getSimpleStack(Items.comparator), - ItemList.Cover_EnergyDetector.get(1), - ItemUtils.getSimpleStack(Items.comparator), - "plateIron", - "plateIron", - "plateIron", - GregtechItemList.GT4_Redstone_Scale.get(2)); - RecipeUtils.addShapedRecipe( - "plateAluminium", - "plateAluminium", - "plateAluminium", - ItemUtils.getSimpleStack(Items.comparator), - ItemList.Cover_EnergyDetector.get(1), - ItemUtils.getSimpleStack(Items.comparator), - "plateAluminium", - "plateAluminium", - "plateAluminium", - GregtechItemList.GT4_Redstone_Scale.get(8)); - - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getTieredMachineHull(1), ItemUtils.getSimpleStack(Blocks.stone_button, 16) }, - null, - GregtechItemList.GT4_Redstone_Button_Panel.get(1), - 800, - 4); - - RecipeUtils.addShapedRecipe( - "plateIron", - ItemUtils.getSimpleStack(Items.repeater), - "plateIron", - ItemUtils.getSimpleStack(Items.comparator), - CI.getTieredCircuitOreDictName(1), - ItemUtils.getSimpleStack(Items.comparator), - "plateIron", - ItemUtils.getSimpleStack(Items.repeater), - "plateIron", - GregtechItemList.GT4_Redstone_Circuit.get(1)); - RecipeUtils.addShapedRecipe( - "plateAluminium", - ItemUtils.getSimpleStack(Items.repeater), - "plateAluminium", - ItemUtils.getSimpleStack(Items.comparator), - CI.getTieredCircuitOreDictName(1), - ItemUtils.getSimpleStack(Items.comparator), - "plateAluminium", - ItemUtils.getSimpleStack(Items.repeater), - "plateAluminium", - GregtechItemList.GT4_Redstone_Circuit.get(2)); - } - private static void gt4Inventory() { - ItemList[] aEnergyHatches = new ItemList[] { ItemList.Hatch_Energy_LV, ItemList.Hatch_Energy_MV, - ItemList.Hatch_Energy_HV, ItemList.Hatch_Energy_EV, ItemList.Hatch_Energy_IV, ItemList.Hatch_Energy_LuV, - ItemList.Hatch_Energy_ZPM, ItemList.Hatch_Energy_UV }; - - ItemList[] aRegulators = new ItemList[] { ItemList.Automation_Regulator_LV, ItemList.Automation_Regulator_MV, - ItemList.Automation_Regulator_HV, ItemList.Automation_Regulator_EV, ItemList.Automation_Regulator_IV, - ItemList.Automation_Regulator_LuV, ItemList.Automation_Regulator_ZPM, - ItemList.Automation_Regulator_UV }; - - GregtechItemList[] aOutputInventoryManager = new GregtechItemList[] { - GregtechItemList.GT4_Electric_Inventory_Manager_LV, GregtechItemList.GT4_Electric_Inventory_Manager_MV, - GregtechItemList.GT4_Electric_Inventory_Manager_HV, GregtechItemList.GT4_Electric_Inventory_Manager_EV, - GregtechItemList.GT4_Electric_Inventory_Manager_IV, GregtechItemList.GT4_Electric_Inventory_Manager_LuV, - GregtechItemList.GT4_Electric_Inventory_Manager_ZPM, - GregtechItemList.GT4_Electric_Inventory_Manager_UV }; - - int aTier = 1; - for (int i = 0; i < 8; i++) { - RecipeUtils.addShapedRecipe( - CI.getTieredCircuitOreDictName(aTier), - aRegulators[i].get(1), - CI.getTieredCircuitOreDictName(aTier), - CI.getRobotArm(aTier, 1), - CI.getTieredMachineHull(aTier), - CI.getRobotArm(aTier, 1), - CI.getTieredCircuitOreDictName(aTier), - aEnergyHatches[i].get(1), - CI.getTieredCircuitOreDictName(aTier), - aOutputInventoryManager[i].get(1)); - aTier++; - } - GregtechItemList[] aOutputElectricCraftingTable = new GregtechItemList[] { GregtechItemList.GT4_Electric_Auto_Workbench_LV, GregtechItemList.GT4_Electric_Auto_Workbench_MV, GregtechItemList.GT4_Electric_Auto_Workbench_HV, GregtechItemList.GT4_Electric_Auto_Workbench_EV, GregtechItemList.GT4_Electric_Auto_Workbench_IV, GregtechItemList.GT4_Electric_Auto_Workbench_LuV, GregtechItemList.GT4_Electric_Auto_Workbench_ZPM, GregtechItemList.GT4_Electric_Auto_Workbench_UV }; - aTier = 1; + int aTier = 1; for (int i = 0; i < 8; i++) { RecipeUtils.addShapedRecipe( ItemUtils.getOrePrefixStack(OrePrefixes.plate, CI.tieredMaterials[aTier], 1), @@ -529,7 +393,7 @@ public class RECIPES_Machines { ALLOY.INCOLOY_MA956.getFluidStack(144 * 9 * (8)), ALLOY.KANTHAL.getFluidStack(144 * 1 * (4)), }, GregtechItemList.Controller_MolecularTransformer.get(1), 20 * 60 * 10 * (1), - (int) MaterialUtils.getVoltageForTier(6)); + MaterialUtils.getVoltageForTier(6)); CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedAdvancedCircuit(16), CI.getPlate(6, 4), CI.getScrew(6, 8), @@ -881,39 +745,16 @@ public class RECIPES_Machines { 5); } - private static void chunkloaders() { - - ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.GT_Chunkloader_HV.get(1L), - GregtechItemList.GT_Chunkloader_IV.get(1L), GregtechItemList.GT_Chunkloader_ZPM.get(1L), }; - - int aIndex = 0; - - for (int i = 3; i < 8; i++) { - if (i == 4 || i == 6) { - continue; - } - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getNumberedAdvancedCircuit(21), CI.getElectricPiston(i, 10), - CI.getFieldGenerator(i + 1, 6), CI.getPlate(i, 16), CI.getTransmissionComponent(i - 1, 8), - CI.getTieredComponent(OrePrefixes.cableGt08, i, 16) }, - ALLOY.EGLIN_STEEL.getFluidStack(i * (144 * 4)), - aOutputs[aIndex++].copy(), - 300 * 20, - MaterialUtils.getVoltageForTier(i)); - } - } - private static void overflowValveCovers() { - ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_ULV.get(1L), - GregtechItemList.Cover_Overflow_LV.get(1L), GregtechItemList.Cover_Overflow_MV.get(1L), - GregtechItemList.Cover_Overflow_HV.get(1L), GregtechItemList.Cover_Overflow_EV.get(1L), - GregtechItemList.Cover_Overflow_IV.get(1L), }; + ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_LV.get(1L), + GregtechItemList.Cover_Overflow_MV.get(1L), GregtechItemList.Cover_Overflow_HV.get(1L), + GregtechItemList.Cover_Overflow_EV.get(1L), GregtechItemList.Cover_Overflow_IV.get(1L), }; - for (int i = 0; i < 6; i++) { + for (int i = 1; i < aOutputs.length; i++) { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedBioCircuit(19), CI.getElectricPump(i, 2), CI.getElectricMotor(i, 2), CI.getPlate(i, 4) }, - Materials.SolderingAlloy.getFluid(i * (144 * 1)), + Materials.SolderingAlloy.getFluid(i * (144)), aOutputs[i].copy(), 20 * 20, MaterialUtils.getVoltageForTier(i)); @@ -925,7 +766,7 @@ public class RECIPES_Machines { GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV, GregtechItemList.GTPP_Casing_LV, GregtechItemList.GTPP_Casing_MV, GregtechItemList.GTPP_Casing_HV, GregtechItemList.GTPP_Casing_EV, GregtechItemList.GTPP_Casing_IV, GregtechItemList.GTPP_Casing_LuV, - GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_MAX }; + GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_UHV }; for (int i = 0; i < 10; i++) { CORE.RA.addSixSlotAssemblingRecipe( @@ -1045,61 +886,6 @@ public class RECIPES_Machines { 20 * 60 * 5, 500); - // Basic Steam Turbine - RecipeUtils.addShapedGregtechRecipe( - CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), - "circuitPrimitive", - CI.getTieredComponent(OrePrefixes.pipeSmall, 0, 1), - ALLOY.TUMBAGA.getRotor(1), - CI.machineCasing_ULV, - ALLOY.TUMBAGA.getRotor(1), - CI.getElectricMotor(0, 1), - "cableGt01RedAlloy", - CI.getElectricMotor(0, 1), - GregtechItemList.Generator_Steam_Turbine_ULV.get(1)); - - // Basic Gas Turbine - RecipeUtils.addShapedGregtechRecipe( - "circuitPrimitive", - ALLOY.TUMBAGA.getRotor(1), - "circuitPrimitive", - ALLOY.TUMBAGA.getRotor(1), - CI.machineCasing_ULV, - ALLOY.TUMBAGA.getRotor(1), - CI.getElectricMotor(0, 1), - "cableGt01RedAlloy", - CI.getElectricMotor(0, 1), - GregtechItemList.Generator_Gas_Turbine_ULV.get(1)); - - // Basic Combustion Turbine - RecipeUtils.addShapedGregtechRecipe( - CI.getElectricPiston(0, 1), - "circuitPrimitive", - CI.getElectricPiston(0, 1), - CI.getElectricMotor(0, 1), - CI.machineCasing_ULV, - CI.getElectricMotor(0, 1), - ALLOY.TUMBAGA.getGear(1), - "cableGt01RedAlloy", - ALLOY.TUMBAGA.getGear(1), - GregtechItemList.Generator_Diesel_ULV.get(1)); - - // Steam Condenser - if (CORE.ConfigSwitches.enableMachine_SteamConverter) { - RECIPE_SteamCondenser = GregtechItemList.Condensor_MAX.get(1); - RecipeUtils.addShapedGregtechRecipe( - pipeLargeCopper, - pipeHugeSteel, - pipeLargeCopper, - plateEnergeticAlloy, - CI.electricPump_HV, - plateEnergeticAlloy, - plateEnergeticAlloy, - pipeLargeCopper, - plateEnergeticAlloy, - RECIPE_SteamCondenser); - } - ItemStack aBronzeBricks = ItemUtils.simpleMetaStack(GregTech_API.sBlockCasings1, 10, 1); // Steam Macerator Multi RecipeUtils.addShapedGregtechRecipe( @@ -2004,18 +1790,6 @@ public class RECIPES_Machines { CI.getTieredCircuit(1), GregtechItemList.Pollution_Detector.get(1)); - // ULV - RecipeUtils.addShapedGregtechRecipe( - CI.component_Plate[0], - ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1), - CI.component_Plate[0], - CI.component_Plate[0], - CI.electricMotor_ULV, - CI.component_Plate[0], - CI.getTieredCircuit(0), - CI.machineHull_ULV, - CI.getTieredCircuit(0), - GregtechItemList.Pollution_Cleaner_ULV.get(1)); // LV RecipeUtils.addShapedGregtechRecipe( CI.component_Plate[1], @@ -2118,10 +1892,10 @@ public class RECIPES_Machines { ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 1, 1), CI.component_Plate[9], CI.component_Plate[9], - CI.electricMotor_MAX, + CI.electricMotor_UHV, CI.component_Plate[9], CI.getTieredCircuit(9), - CI.machineHull_MAX, + CI.machineHull_UHV, CI.getTieredCircuit(9), GregtechItemList.Pollution_Cleaner_MAX.get(1)); } @@ -2972,33 +2746,31 @@ public class RECIPES_Machines { private static void wirelessChargers() { - ItemStack[] aChargers = new ItemStack[] { null, GregtechItemList.Charger_LV.get(1), + ItemStack[] aChargers = new ItemStack[] { GregtechItemList.Charger_LV.get(1), GregtechItemList.Charger_MV.get(1), GregtechItemList.Charger_HV.get(1), GregtechItemList.Charger_EV.get(1), GregtechItemList.Charger_IV.get(1), GregtechItemList.Charger_LuV.get(1), GregtechItemList.Charger_ZPM.get(1), - GregtechItemList.Charger_UV.get(1), GregtechItemList.Charger_MAX.get(1) }; + GregtechItemList.Charger_UV.get(1), GregtechItemList.Charger_UHV.get(1) }; - for (int i = 0; i < 10; i++) { - if (i == 0) { - continue; - } - int aTier = (i + 1); - ItemStack[] aInputs = new ItemStack[] { CI.getTieredMachineHull(i, 1), CI.getTransmissionComponent(i, 2), - CI.getFieldGenerator(i, 1), CI.getTieredComponent(OrePrefixes.plate, aTier, 4), - CI.getTieredComponent(OrePrefixes.circuit, aTier, 2), }; + for (int tier = 1; tier < aChargers.length; tier++) { + + ItemStack[] aInputs = new ItemStack[] { CI.getTieredMachineHull(tier, 1), + CI.getTransmissionComponent(tier, 2), CI.getFieldGenerator(tier, 1), + CI.getTieredComponent(OrePrefixes.plate, tier, 4), + CI.getTieredComponent(OrePrefixes.circuit, tier, 2), }; CORE.RA.addSixSlotAssemblingRecipe( aInputs, - CI.getAlternativeTieredFluid(i, (144 * 2 * aTier)), // Input Fluid - aChargers[i], - 45 * 10 * 1 * (aTier), - MaterialUtils.getVoltageForTier(i)); + CI.getAlternativeTieredFluid(tier, (144 * 2 * tier)), // Input Fluid + aChargers[tier], + 45 * 10 * (tier), + MaterialUtils.getVoltageForTier(tier)); } } private static void largeArcFurnace() { int aCostMultiplier = 1; CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getTieredMachineHull(-1, 1 * aCostMultiplier), + new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(aCostMultiplier), CI.getTransmissionComponent(2, 2 * aCostMultiplier), CI.getElectricPiston(4, 2 * aCostMultiplier), CI.getTieredComponent(OrePrefixes.plate, 5, 4 * aCostMultiplier), @@ -3022,8 +2794,8 @@ public class RECIPES_Machines { private static void industrialVacuumFurnace() { CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getTieredMachineHull(-1, 1), CI.getHeatCoil(2), CI.getElectricPiston(3, 2), - CI.getTieredComponent(OrePrefixes.plate, 6, 4), + new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1), CI.getHeatCoil(2), + CI.getElectricPiston(3, 2), CI.getTieredComponent(OrePrefixes.plate, 6, 4), CI.getTieredComponent(OrePrefixes.gearGt, 6, 2), }, CI.getTertiaryTieredFluid(5, (144 * 2 * 4)), // Input Fluid GregtechItemList.Casing_Vacuum_Furnace.get(1), @@ -3246,19 +3018,17 @@ public class RECIPES_Machines { } private static void superBuses() { - GregtechItemList[] mSuperBusesInput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Input_ULV, - GregtechItemList.Hatch_SuperBus_Input_LV, GregtechItemList.Hatch_SuperBus_Input_MV, - GregtechItemList.Hatch_SuperBus_Input_HV, GregtechItemList.Hatch_SuperBus_Input_EV, - GregtechItemList.Hatch_SuperBus_Input_IV, GregtechItemList.Hatch_SuperBus_Input_LuV, - GregtechItemList.Hatch_SuperBus_Input_ZPM, GregtechItemList.Hatch_SuperBus_Input_UV, - GregtechItemList.Hatch_SuperBus_Input_MAX, }; - - GregtechItemList[] mSuperBusesOutput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Output_ULV, - GregtechItemList.Hatch_SuperBus_Output_LV, GregtechItemList.Hatch_SuperBus_Output_MV, - GregtechItemList.Hatch_SuperBus_Output_HV, GregtechItemList.Hatch_SuperBus_Output_EV, - GregtechItemList.Hatch_SuperBus_Output_IV, GregtechItemList.Hatch_SuperBus_Output_LuV, - GregtechItemList.Hatch_SuperBus_Output_ZPM, GregtechItemList.Hatch_SuperBus_Output_UV, - GregtechItemList.Hatch_SuperBus_Output_MAX, }; + GregtechItemList[] mSuperBusesInput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Input_LV, + GregtechItemList.Hatch_SuperBus_Input_MV, GregtechItemList.Hatch_SuperBus_Input_HV, + GregtechItemList.Hatch_SuperBus_Input_EV, GregtechItemList.Hatch_SuperBus_Input_IV, + GregtechItemList.Hatch_SuperBus_Input_LuV, GregtechItemList.Hatch_SuperBus_Input_ZPM, + GregtechItemList.Hatch_SuperBus_Input_UV, GregtechItemList.Hatch_SuperBus_Input_MAX, }; + + GregtechItemList[] mSuperBusesOutput = new GregtechItemList[] { GregtechItemList.Hatch_SuperBus_Output_LV, + GregtechItemList.Hatch_SuperBus_Output_MV, GregtechItemList.Hatch_SuperBus_Output_HV, + GregtechItemList.Hatch_SuperBus_Output_EV, GregtechItemList.Hatch_SuperBus_Output_IV, + GregtechItemList.Hatch_SuperBus_Output_LuV, GregtechItemList.Hatch_SuperBus_Output_ZPM, + GregtechItemList.Hatch_SuperBus_Output_UV, GregtechItemList.Hatch_SuperBus_Output_MAX, }; ItemStack[] mInputHatch = new ItemStack[] { ItemList.Hatch_Input_Bus_EV.get(1), ItemList.Hatch_Input_Bus_IV.get(1), ItemList.Hatch_Input_Bus_LuV.get(1), @@ -3274,126 +3044,45 @@ public class RECIPES_Machines { GregtechItemList.Hatch_SuperBus_Output_MV.get(1), GregtechItemList.Hatch_SuperBus_Output_HV.get(1), GregtechItemList.Hatch_SuperBus_Output_EV.get(1), }; - // Special Case recipes for ULV buses - { - int i = 0; - ItemStack[] aInputs1 = new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i], - CI.getElectricMotor(i, 2), CI.getConveyor(i, 5), CI.getBolt(i, 16), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) }; - Logger.INFO("[FIND] " + ItemUtils.getArrayStackNames(aInputs1)); - ItemStack[] aOutputs1 = new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i], - CI.getElectricPiston(i, 2), CI.getConveyor(i, 5), CI.getGear(i, 3), - CI.getTieredComponent(OrePrefixes.circuit, i, 2) }; - Logger.INFO("[FIND] " + ItemUtils.getArrayStackNames(aOutputs1)); - - FluidStack a1 = CI.getAlternativeTieredFluid(i, 144 * 8); - FluidStack a2 = CI.getTertiaryTieredFluid(i, 144 * 8); - - Logger.INFO("[FIND] Input Bus Fluid: " + ItemUtils.getFluidName(a1)); - Logger.INFO("[FIND] Output Bus Fluid: " + ItemUtils.getFluidName(a2)); - - CORE.RA.addSixSlotAssemblingRecipe( - aInputs1, - a1, - mSuperBusesInput[i].get(1), - 20 * 30 * 2 * i, - (int) GT_Values.V[i]); - - CORE.RA.addSixSlotAssemblingRecipe( - aOutputs1, - a2, - mSuperBusesOutput[i].get(1), - 20 * 30 * 2 * i, - (int) GT_Values.V[i]); - } - // Input Buses - for (int i = 1; i < 10; i++) { + for (int i = 1; i < mSuperBusesInput.length; i++) { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(17), mInputHatch[i], CI.getElectricMotor(i, 2), CI.getConveyor(i, 5), CI.getBolt(i, 16), CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, CI.getAlternativeTieredFluid(i, 144 * 8), - mSuperBusesInput[i].get(1), + mSuperBusesInput[i - 1].get(1), 20 * 30 * 2, (int) GT_Values.V[i]); } // Output Buses - for (int i = 1; i < 10; i++) { + for (int i = 1; i < mSuperBusesOutput.length; i++) { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(18), mOutputHatch[i], CI.getElectricPiston(i, 2), CI.getConveyor(i, 5), CI.getGear(i, 3), CI.getTieredComponent(OrePrefixes.circuit, i, 2) }, CI.getTertiaryTieredFluid(i, 144 * 8), - mSuperBusesOutput[i].get(1), + mSuperBusesOutput[i - 1].get(1), 20 * 30 * 2, (int) GT_Values.V[i]); } } private static void chiselBuses() { - ItemStack[] mSuperBusesInput = new ItemStack[] { ItemList.Hatch_Input_Bus_HV.get(1), - GregtechItemList.Hatch_SuperBus_Input_LV.get(1), GregtechItemList.Hatch_SuperBus_Input_MV.get(1), - GregtechItemList.Hatch_SuperBus_Input_HV.get(1), }; + ItemStack[] mSuperBusesInput = new ItemStack[] { GregtechItemList.Hatch_SuperBus_Input_LV.get(1), + GregtechItemList.Hatch_SuperBus_Input_MV.get(1), GregtechItemList.Hatch_SuperBus_Input_HV.get(1), }; - ItemStack[] mChiselBuses = new ItemStack[] { GregtechItemList.GT_MetaTileEntity_ChiselBus_I.get(1), - GregtechItemList.GT_MetaTileEntity_ChiselBus_II.get(1), - GregtechItemList.GT_MetaTileEntity_ChiselBus_III.get(1), - GregtechItemList.GT_MetaTileEntity_ChiselBus_IV.get(1), }; + ItemStack[] mChiselBuses = new ItemStack[] { GregtechItemList.GT_MetaTileEntity_ChiselBus_LV.get(1), + GregtechItemList.GT_MetaTileEntity_ChiselBus_MV.get(1), + GregtechItemList.GT_MetaTileEntity_ChiselBus_HV.get(1), }; - for (int i = 0; i < 4; i++) { + for (int i = 1; i < mChiselBuses.length; i++) { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(17), mSuperBusesInput[i], CI.getSensor(i, 1), CI.getRobotArm(i, 2), CI.getBolt(i, 16), ItemUtils.getSimpleStack(Blocks.chest) }, CI.getAlternativeTieredFluid(i, 144 * 2), - mChiselBuses[i], + mChiselBuses[i - 1], 20 * 30 * 2, (int) GT_Values.VP[i + 1]); } } - private static void roundRobinators() { - - RecipeUtils.addShapedGregtechRecipe( - ItemUtils.getSimpleStack(Blocks.hopper), - "circuitPrimitive", - ItemUtils.getSimpleStack(Blocks.hopper), - CI.craftingToolWrench, - CI.machineCasing_ULV, - CI.craftingToolScrewdriver, - ItemUtils.getSimpleStack(Blocks.hopper), - "circuitPrimitive", - ItemUtils.getSimpleStack(Blocks.hopper), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1)); - - ItemStack[] aRobinators = new ItemStack[] { ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 0, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 1, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 2, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 3, 1), - ItemUtils.simpleMetaStack(ModBlocks.blockRoundRobinator, 4, 1), }; - - for (int i = 0; i < 5; i++) { - if (i == 0) { - CORE.RA.addSixSlotAssemblingRecipe( - new ItemStack[] { CI.getNumberedCircuit(17), CI.getTieredMachineCasing(0), - ItemUtils.getSimpleStack(Blocks.hopper, 4), - CI.getTieredComponent(OrePrefixes.circuit, 0, 2) }, - GT_Values.NF, // Input Fluid - aRobinators[i], - 45 * 10 * 1, - 8); - continue; - } - int aTier = i + 1; - ItemStack[] aInputs = new ItemStack[] { aRobinators[i - 1], CI.getTieredMachineHull(aTier, 1), - CI.getConveyor(aTier, 2), CI.getElectricMotor(aTier, 2), - CI.getTieredComponent(OrePrefixes.plate, aTier, 4), - CI.getTieredComponent(OrePrefixes.circuit, i, 2), }; - - CORE.RA.addSixSlotAssemblingRecipe( - aInputs, - GT_Values.NF, // Input Fluid - aRobinators[i], - 45 * 10 * 1 * (i + 1), - MaterialUtils.getVoltageForTier(i)); - } - } } diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index 98c77865a3..5e19eaed59 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -48,7 +48,6 @@ public class CI { public static Object circuitTier9; // Machine Components - public static ItemStack electricMotor_ULV; public static ItemStack electricMotor_LV; public static ItemStack electricMotor_MV; public static ItemStack electricMotor_HV; @@ -57,8 +56,7 @@ public class CI { public static ItemStack electricMotor_LuV; public static ItemStack electricMotor_ZPM; public static ItemStack electricMotor_UV; - public static ItemStack electricMotor_MAX; - public static ItemStack electricPump_ULV; + public static ItemStack electricMotor_UHV; public static ItemStack electricPump_LV; public static ItemStack electricPump_MV; public static ItemStack electricPump_HV; @@ -67,8 +65,7 @@ public class CI { public static ItemStack electricPump_LuV; public static ItemStack electricPump_ZPM; public static ItemStack electricPump_UV; - public static ItemStack electricPump_MAX; - public static ItemStack electricPiston_ULV; + public static ItemStack electricPump_UHV; public static ItemStack electricPiston_LV; public static ItemStack electricPiston_MV; public static ItemStack electricPiston_HV; @@ -77,8 +74,7 @@ public class CI { public static ItemStack electricPiston_LuV; public static ItemStack electricPiston_ZPM; public static ItemStack electricPiston_UV; - public static ItemStack electricPiston_MAX; - public static ItemStack robotArm_ULV; + public static ItemStack electricPiston_UHV; public static ItemStack robotArm_LV; public static ItemStack robotArm_MV; public static ItemStack robotArm_HV; @@ -87,8 +83,7 @@ public class CI { public static ItemStack robotArm_LuV; public static ItemStack robotArm_ZPM; public static ItemStack robotArm_UV; - public static ItemStack robotArm_MAX; - public static ItemStack conveyorModule_ULV; + public static ItemStack robotArm_UHV; public static ItemStack conveyorModule_LV; public static ItemStack conveyorModule_MV; public static ItemStack conveyorModule_HV; @@ -97,8 +92,7 @@ public class CI { public static ItemStack conveyorModule_LuV; public static ItemStack conveyorModule_ZPM; public static ItemStack conveyorModule_UV; - public static ItemStack conveyorModule_MAX; - public static ItemStack emitter_ULV; + public static ItemStack conveyorModule_UHV; public static ItemStack emitter_LV; public static ItemStack emitter_MV; public static ItemStack emitter_HV; @@ -107,8 +101,7 @@ public class CI { public static ItemStack emitter_LuV; public static ItemStack emitter_ZPM; public static ItemStack emitter_UV; - public static ItemStack emitter_MAX; - public static ItemStack fieldGenerator_ULV; + public static ItemStack emitter_UHV; public static ItemStack fieldGenerator_LV; public static ItemStack fieldGenerator_MV; public static ItemStack fieldGenerator_HV; @@ -117,8 +110,7 @@ public class CI { public static ItemStack fieldGenerator_LuV; public static ItemStack fieldGenerator_ZPM; public static ItemStack fieldGenerator_UV; - public static ItemStack fieldGenerator_MAX; - public static ItemStack sensor_ULV; + public static ItemStack fieldGenerator_UHV; public static ItemStack sensor_LV; public static ItemStack sensor_MV; public static ItemStack sensor_HV; @@ -127,7 +119,7 @@ public class CI { public static ItemStack sensor_LuV; public static ItemStack sensor_ZPM; public static ItemStack sensor_UV; - public static ItemStack sensor_MAX; + public static ItemStack sensor_UHV; public static ItemStack fluidRegulator_LV; public static ItemStack fluidRegulator_MV; @@ -148,7 +140,7 @@ public class CI { public static ItemStack machineCasing_LuV; public static ItemStack machineCasing_ZPM; public static ItemStack machineCasing_UV; - public static ItemStack machineCasing_MAX; + public static ItemStack machineCasing_UHV; // Machine Hulls public static ItemStack machineHull_ULV; @@ -160,7 +152,7 @@ public class CI { public static ItemStack machineHull_LuV; public static ItemStack machineHull_ZPM; public static ItemStack machineHull_UV; - public static ItemStack machineHull_MAX; + public static ItemStack machineHull_UHV; // Gearbox Casings public static ItemStack gearboxCasing_Tier_1; @@ -175,12 +167,9 @@ public class CI { // Crafting Tools public static String craftingToolWrench = "craftingToolWrench"; public static String craftingToolHammer_Hard = "craftingToolHardHammer"; - public static String craftingToolHammer_Soft = "craftingToolSoftHammer"; public static String craftingToolScrewdriver = "craftingToolScrewdriver"; public static String craftingToolFile = "craftingToolFile"; public static String craftingToolMortar = "craftingToolMortar"; - public static String craftingToolKnife = "craftingToolKnife"; - public static String craftingToolCrowbar = "craftingToolCrowbar"; public static String craftingToolSaw = "craftingToolSaw"; public static String craftingToolWireCutter = "craftingToolWirecutter"; public static String craftingToolSolderingIron = "craftingToolSolderingIron"; @@ -192,7 +181,7 @@ public class CI { public static Materials[] tieredMaterials = new Materials[] { Materials.Iron, Materials.Steel, Materials.Aluminium, Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, Materials.Iridium, - Materials.Osmium, Materials.Neutronium };; + Materials.Osmium, Materials.Neutronium }; public static void preInit() { @@ -236,10 +225,6 @@ public class CI { return getTieredCircuitOreDictName(tier); } - public static ItemStack[] getAllCircuitsOfTier(int tier) { - return ItemUtils.getStackOfAllOreDictGroup(getTieredCircuitOreDictName(tier)); - } - public static String getTieredCircuitOreDictName(int tier) { if (tier == 0) { return "circuitPrimitive"; @@ -329,7 +314,7 @@ public class CI { return ItemList.Tool_DataStick.get(1); } - public static final ItemStack getTieredMachineHull(int tier) { + public static ItemStack getTieredMachineHull(int tier) { if (tier == 0) { return machineHull_ULV; } else if (tier == 1) { @@ -349,13 +334,13 @@ public class CI { } else if (tier == 8) { return machineHull_UV; } else if (tier == 9) { - return machineHull_MAX; + return machineHull_UHV; } else { return GregtechItemList.Casing_Multi_Use.get(1); } } - public static final ItemStack getTieredMachineCasing(int tier) { + public static ItemStack getTieredMachineCasing(int tier) { if (tier == 0) { if (machineCasing_ULV == null) { machineCasing_ULV = ItemList.Casing_ULV.get(1); @@ -378,7 +363,7 @@ public class CI { } else if (tier == 8) { return machineCasing_UV; } else if (tier == 9) { - return machineCasing_MAX; + return machineCasing_UHV; } else { return GregtechItemList.Casing_Multi_Use.get(1); } @@ -400,7 +385,7 @@ public class CI { machineCasing_LuV = ItemList.Casing_LuV.get(1); machineCasing_ZPM = ItemList.Casing_ZPM.get(1); machineCasing_UV = ItemList.Casing_UV.get(1); - machineCasing_MAX = ItemList.Casing_MAX.get(1); + machineCasing_UHV = ItemList.Casing_MAX.get(1); // Machine Hulls machineHull_ULV = ItemList.Hull_ULV.get(1); @@ -412,7 +397,7 @@ public class CI { machineHull_LuV = ItemList.Hull_LuV.get(1); machineHull_ZPM = ItemList.Hull_ZPM.get(1); machineHull_UV = ItemList.Hull_UV.get(1); - machineHull_MAX = ItemList.Hull_MAX.get(1); + machineHull_UHV = ItemList.Hull_MAX.get(1); // Gear box Casings gearboxCasing_Tier_1 = ItemList.Casing_Gearbox_Bronze.get(1); @@ -531,7 +516,7 @@ public class CI { public static ItemStack getTieredComponent(OrePrefixes aPrefix, int aTier, int aAmount) { aTier = Math.max(0, aTier); - Material m = null; + Material m; if (aPrefix == OrePrefixes.liquid) { int aMatID = (aTier == 0 || aTier == 2 || aTier == 5 || aTier == 8 ? 0 @@ -667,8 +652,7 @@ public class CI { // All Invalid? // Let's add a special error ingot. if (!ItemUtils.checkForInvalidItems(aReturn)) { - aReturn = ItemUtils - .getErrorStack(1, (aPrefix.toString() + m.getLocalizedName() + " x" + aAmount)); + aReturn = ItemUtils.getErrorStack(1, (aPrefix + m.getLocalizedName() + " x" + aAmount)); } } } @@ -679,10 +663,8 @@ public class CI { public static ItemStack getElectricMotor(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.electricMotor_ULV; - } else if (aTier == aLazyTier++) { aType = CI.electricMotor_LV; } else if (aTier == aLazyTier++) { aType = CI.electricMotor_MV; @@ -698,10 +680,10 @@ public class CI { aType = CI.electricMotor_ZPM; } else if (aTier == aLazyTier++) { aType = CI.electricMotor_UV; - } else if (aTier == aLazyTier++) { - aType = CI.electricMotor_MAX; + } else if (aTier == aLazyTier) { + aType = CI.electricMotor_UHV; } else { - aType = CI.electricMotor_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } @@ -727,20 +709,18 @@ public class CI { aType = CI.fluidRegulator_ZPM; } else if (aTier == aLazyTier++) { aType = CI.fluidRegulator_UV; - } else if (aTier == aLazyTier++) { + } else if (aTier == aLazyTier) { aType = CI.fluidRegulator_UV; } else { - aType = CI.fluidRegulator_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } public static ItemStack getElectricPiston(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.electricPiston_ULV; - } else if (aTier == aLazyTier++) { aType = CI.electricPiston_LV; } else if (aTier == aLazyTier++) { aType = CI.electricPiston_MV; @@ -756,20 +736,18 @@ public class CI { aType = CI.electricPiston_ZPM; } else if (aTier == aLazyTier++) { aType = CI.electricPiston_UV; - } else if (aTier == aLazyTier++) { - aType = CI.electricPiston_MAX; + } else if (aTier == aLazyTier) { + aType = CI.electricPiston_UHV; } else { - aType = CI.electricPiston_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } public static ItemStack getElectricPump(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.electricPump_ULV; - } else if (aTier == aLazyTier++) { aType = CI.electricPump_LV; } else if (aTier == aLazyTier++) { aType = CI.electricPump_MV; @@ -785,20 +763,18 @@ public class CI { aType = CI.electricPump_ZPM; } else if (aTier == aLazyTier++) { aType = CI.electricPump_UV; - } else if (aTier == aLazyTier++) { - aType = CI.electricPump_MAX; + } else if (aTier == aLazyTier) { + aType = CI.electricPump_UHV; } else { - aType = CI.electricPump_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } public static ItemStack getRobotArm(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.robotArm_ULV; - } else if (aTier == aLazyTier++) { aType = CI.robotArm_LV; } else if (aTier == aLazyTier++) { aType = CI.robotArm_MV; @@ -814,20 +790,18 @@ public class CI { aType = CI.robotArm_ZPM; } else if (aTier == aLazyTier++) { aType = CI.robotArm_UV; - } else if (aTier == aLazyTier++) { - aType = CI.robotArm_MAX; + } else if (aTier == aLazyTier) { + aType = CI.robotArm_UHV; } else { - aType = CI.robotArm_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } public static ItemStack getConveyor(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.conveyorModule_ULV; - } else if (aTier == aLazyTier++) { aType = CI.conveyorModule_LV; } else if (aTier == aLazyTier++) { aType = CI.conveyorModule_MV; @@ -843,20 +817,18 @@ public class CI { aType = CI.conveyorModule_ZPM; } else if (aTier == aLazyTier++) { aType = CI.conveyorModule_UV; - } else if (aTier == aLazyTier++) { - aType = CI.conveyorModule_MAX; + } else if (aTier == aLazyTier) { + aType = CI.conveyorModule_UHV; } else { - aType = CI.conveyorModule_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } public static ItemStack getEmitter(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.emitter_ULV; - } else if (aTier == aLazyTier++) { aType = CI.emitter_LV; } else if (aTier == aLazyTier++) { aType = CI.emitter_MV; @@ -872,20 +844,18 @@ public class CI { aType = CI.emitter_ZPM; } else if (aTier == aLazyTier++) { aType = CI.emitter_UV; - } else if (aTier == aLazyTier++) { - aType = CI.emitter_MAX; + } else if (aTier == aLazyTier) { + aType = CI.emitter_UHV; } else { - aType = CI.emitter_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } public static ItemStack getSensor(int aTier, int aSize) { ItemStack aType; - int aLazyTier = 0; + int aLazyTier = 1; if (aTier == aLazyTier++) { - aType = CI.sensor_ULV; - } else if (aTier == aLazyTier++) { aType = CI.sensor_LV; } else if (aTier == aLazyTier++) { aType = CI.sensor_MV; @@ -901,10 +871,10 @@ public class CI { aType = CI.sensor_ZPM; } else if (aTier == aLazyTier++) { aType = CI.sensor_UV; - } else if (aTier == aLazyTier++) { - aType = CI.sensor_MAX; + } else if (aTier == aLazyTier) { + aType = CI.sensor_UHV; } else { - aType = CI.sensor_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } @@ -913,8 +883,6 @@ public class CI { ItemStack aType; int aLazyTier = 0; if (aTier == aLazyTier++) { - aType = CI.fieldGenerator_ULV; - } else if (aTier == aLazyTier++) { aType = CI.fieldGenerator_LV; } else if (aTier == aLazyTier++) { aType = CI.fieldGenerator_MV; @@ -930,10 +898,10 @@ public class CI { aType = CI.fieldGenerator_ZPM; } else if (aTier == aLazyTier++) { aType = CI.fieldGenerator_UV; - } else if (aTier == aLazyTier++) { - aType = CI.fieldGenerator_MAX; + } else if (aTier == aLazyTier) { + aType = CI.fieldGenerator_UHV; } else { - aType = CI.fieldGenerator_LV; + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } @@ -959,10 +927,10 @@ public class CI { aType = CI.machineHull_ZPM; } else if (aTier == aLazyTier++) { aType = CI.machineHull_UV; - } else if (aTier == aLazyTier++) { - aType = CI.machineHull_MAX; + } else if (aTier == aLazyTier) { + aType = CI.machineHull_UHV; } else { - aType = GregtechItemList.Casing_Multi_Use.get(1, CI.machineHull_MV); + throw new IllegalArgumentException(); } return ItemUtils.getSimpleStack(aType, aSize); } @@ -986,7 +954,7 @@ public class CI { GregtechItemList[] aHulls = new GregtechItemList[] { GregtechItemList.GTPP_Casing_ULV, GregtechItemList.GTPP_Casing_LV, GregtechItemList.GTPP_Casing_MV, GregtechItemList.GTPP_Casing_HV, GregtechItemList.GTPP_Casing_EV, GregtechItemList.GTPP_Casing_IV, GregtechItemList.GTPP_Casing_LuV, - GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_MAX }; + GregtechItemList.GTPP_Casing_ZPM, GregtechItemList.GTPP_Casing_UV, GregtechItemList.GTPP_Casing_UHV }; return aHulls[aTier].get(aAmount); } @@ -995,12 +963,11 @@ public class CI { } public static ItemStack getTransmissionComponent(int aTier, int aAmount) { - GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, }; + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV, + GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV, + GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV, + GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM, + GregtechItemList.TransmissionComponent_UV, GregtechItemList.TransmissionComponent_UHV, }; return aTransParts[aTier].get(aAmount); } @@ -1019,46 +986,6 @@ public class CI { } /** - * Iron + Copper Catalyst - * - * @param aAmount - Stacksize - * @return - A Catalyst stack of given size - */ - public static ItemStack getRedCatalyst(int aAmount) { - return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 0, aAmount); - } - - /** - * Tungsten + Nickel Catalyst - * - * @param aAmount - Stacksize - * @return - A Catalyst stack of given size - */ - public static ItemStack getYellowCatalyst(int aAmount) { - return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 1, aAmount); - } - - /** - * Cobalt + Titanium Catalyst - * - * @param aAmount - Stacksize - * @return - A Catalyst stack of given size - */ - public static ItemStack getBlueCatalyst(int aAmount) { - return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 2, aAmount); - } - - /** - * Vanadium + Palladium Catalyst - * - * @param aAmount - Stacksize - * @return - A Catalyst stack of given size - */ - public static ItemStack getOrangeCatalyst(int aAmount) { - return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 3, aAmount); - } - - /** * Iridium + Ruthenium Catalyst * * @param aAmount - Stacksize @@ -1069,16 +996,6 @@ public class CI { } /** - * Aluminium + Nickel Catalyst - * - * @param aAmount - Stacksize - * @return - A Catalyst stack of given size - */ - public static ItemStack getBrownCatalyst(int aAmount) { - return ItemUtils.simpleMetaStack(GenericChem.mGenericChemItem1, 5, aAmount); - } - - /** * Platinum + Rhodium Catalyst * * @param aAmount - Stacksize diff --git a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java index 1cb6e5699c..56cf2fdbab 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java +++ b/src/main/java/gtPlusPlus/core/tileentities/ModTileEntities.java @@ -8,13 +8,11 @@ import gtPlusPlus.core.tileentities.general.TileEntityCircuitProgrammer; import gtPlusPlus.core.tileentities.general.TileEntityDecayablesChest; import gtPlusPlus.core.tileentities.general.TileEntityFishTrap; import gtPlusPlus.core.tileentities.general.TileEntityInfiniteFluid; -import gtPlusPlus.core.tileentities.general.TileEntityPlayerDoorBase; import gtPlusPlus.core.tileentities.general.TileEntityVolumetricFlaskSetter; import gtPlusPlus.core.tileentities.machines.TileEntityAdvPooCollector; import gtPlusPlus.core.tileentities.machines.TileEntityPestKiller; import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; import gtPlusPlus.core.tileentities.machines.TileEntityProjectTable; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; public class ModTileEntities { @@ -26,12 +24,10 @@ public class ModTileEntities { GameRegistry.registerTileEntity(TileEntityInfiniteFluid.class, "TileInfiniteFluid"); GameRegistry.registerTileEntity(TileEntityProjectTable.class, "TileProjectTable"); GameRegistry.registerTileEntity(TileEntityCircuitProgrammer.class, "TileCircuitProgrammer"); - GameRegistry.registerTileEntity(TileEntityPlayerDoorBase.class, "TilePlayerDoorBase"); GameRegistry.registerTileEntity(TileEntityDecayablesChest.class, "TileDecayablesChest"); GameRegistry.registerTileEntity(TileEntitySuperJukebox.class, "TileEntitySuperJukebox"); GameRegistry.registerTileEntity(TileEntitySuperLight.class, "TileEntitySuperLight"); GameRegistry.registerTileEntity(TileEntityPestKiller.class, "TileEntityPestKiller"); - GameRegistry.registerTileEntity(TileEntityRoundRobinator.class, "TileEntityRoundRobinator"); GameRegistry.registerTileEntity(TileEntityVolumetricFlaskSetter.class, "TileEntityVolumetricFlaskSetter"); } diff --git a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java index 762d5a4d61..56197098c6 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java +++ b/src/main/java/gtPlusPlus/core/tileentities/base/TileEntityBase.java @@ -473,7 +473,7 @@ public class TileEntityBase extends TileEntity implements ILazyCoverable, IGregT public boolean ignoreUnloadedChunks = true; public boolean isDead = false; - private final void clearNullMarkersFromTileEntityBuffer() { + private void clearNullMarkersFromTileEntityBuffer() { for (int i = 0; i < this.mBufferedTileEntities.length; ++i) { if (this.mBufferedTileEntities[i] == this) { this.mBufferedTileEntities[i] = null; diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java index a170f71af3..895c68029d 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityCircuitProgrammer.java @@ -65,7 +65,7 @@ public class TileEntityCircuitProgrammer extends TileEntity implements ISidedInv if (aInputs[25] != null) { hasOutput = true; } - AutoMap<Integer> aValidSlots = new AutoMap<Integer>(); + AutoMap<Integer> aValidSlots = new AutoMap<>(); int aSlotCount = 0; for (ItemStack i : aInputs) { if (i != null) { diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java index 5da2560cde..36df996eb0 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityDecayablesChest.java @@ -68,8 +68,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven if (inv == null) { continue; } - if (inv.getItem() instanceof DustDecayable) { - DustDecayable D = (DustDecayable) inv.getItem(); + if (inv.getItem() instanceof DustDecayable D) { tryUpdateDecayable(D, inv, this.worldObj); } } @@ -353,7 +352,7 @@ public class TileEntityDecayablesChest extends TileEntity implements ISidedInven this.checkForAdjacentChests(); } - private final int updateSlots() { + private int updateSlots() { // Have slots changed? if (cachedChestType == 0) { return 0; diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java deleted file mode 100644 index 86e5454b80..0000000000 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityPlayerDoorBase.java +++ /dev/null @@ -1,281 +0,0 @@ -package gtPlusPlus.core.tileentities.general; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockDoor; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.BlockPos; -import gtPlusPlus.core.util.minecraft.EntityUtils; - -public class TileEntityPlayerDoorBase extends TileEntity { - - public boolean mIsOpen = false; - private short mMeta = 0; - private long mTickCounter = 0; - private final Block mBlockType; - private BlockPos mNeighbourDoor; - - public TileEntityPlayerDoorBase(Block aBlock, int meta) { - mBlockType = aBlock; - } - - @Override - public void readFromNBT(NBTTagCompound aNBT) { - super.readFromNBT(aNBT); - this.mIsOpen = aNBT.getBoolean("mIsOpen"); - } - - @Override - public void writeToNBT(NBTTagCompound aNBT) { - super.writeToNBT(aNBT); - aNBT.setBoolean("mIsOpen", mIsOpen); - } - - public int getNeighbourState() { - - if (mNeighbourDoor != null) { - World aWorld = this.worldObj; - if (aWorld != null) { - TileEntity t = aWorld.getTileEntity(mNeighbourDoor.xPos, mNeighbourDoor.yPos, mNeighbourDoor.zPos); - // Custom Door - if (t != null) { - if (t instanceof TileEntityPlayerDoorBase) { - TileEntityPlayerDoorBase d = (TileEntityPlayerDoorBase) t; - if (d.mIsOpen) { - return 100; - } else { - return -100; - } - } else return -100; - } - // Vanilla Door - else { - Block aBlock = mNeighbourDoor.getBlockAtPos(); - BlockDoor aDoor = (aBlock instanceof BlockDoor ? (BlockDoor) aBlock : null); - if (aDoor != null) { - int i1 = aDoor.func_150012_g( - mNeighbourDoor.world, - mNeighbourDoor.xPos, - mNeighbourDoor.yPos, - mNeighbourDoor.zPos); - if ((i1 & 4) != 0) { - return 100; - } else { - return -100; - } - } - } - } - } - return 0; - } - - AutoMap<Entity> mNearbyEntityCache = new AutoMap<Entity>(); - - @Override - public void updateEntity() { - - if (this.getWorldObj().isRemote) { - return; - } - - // Look For Neighbours - if (mTickCounter % 100 == 0 || mTickCounter == 0) { - World aWorld = this.getWorldObj(); - BlockPos aThisPos = new BlockPos(xCoord, yCoord, zCoord, aWorld); - BlockPos[] aNeighbors = new BlockPos[4]; - aNeighbors[0] = aThisPos.getXNeg(); - aNeighbors[1] = aThisPos.getXPos(); - aNeighbors[2] = aThisPos.getZNeg(); - aNeighbors[3] = aThisPos.getZPos(); - boolean aFoundDoor = false; - for (BlockPos b : aNeighbors) { - Block aBlock = aWorld.getBlock(b.xPos, b.yPos, b.zPos); - BlockDoor aDoor = (aBlock instanceof BlockDoor ? (BlockDoor) aBlock : null); - if (aDoor != null) { - mNeighbourDoor = b; - aFoundDoor = true; - if (mMeta == 0) { - TileEntity t = aWorld.getTileEntity(b.xPos, b.yPos, b.zPos); - if (t != null) { - if (t instanceof TileEntityPlayerDoorBase) { - TileEntityPlayerDoorBase d = (TileEntityPlayerDoorBase) t; - if (d.mMeta != 0) { - // Logger.INFO("Found Door with Mode set other than 0, assuming slave role."); - mMeta = -1; - } else { - // Logger.INFO("Found door with no mode set, assuming we are master."); - mMeta = 1; - } - } else { - // Logger.INFO("Custom door from another mod, assuming slave role."); - mMeta = -1; - } - } else { - // Logger.INFO("No Tile Entity found, Door is probably vanilla, assuming slave role."); - mMeta = -1; - } - } - break; - } - } - if (mMeta < 1 && !aFoundDoor) { - // Logger.INFO("Found No Valid Doors around, setting this one to master mode."); - mMeta = 1; - } - } - - World aWorld = this.getWorldObj(); - Block aBlock = aWorld.getBlock(xCoord, yCoord, zCoord); - BlockPos aThisPos = new BlockPos(xCoord, yCoord, zCoord, this.worldObj); - - if (mTickCounter % 20 == 0) { - int x = 0, y = 0, z = 0; - x = this.xCoord; - y = this.yCoord; - z = this.zCoord; - // List aEntityList = aWorld.loadedEntityList; - List<Entity> aEntityList = new ArrayList<Entity>(); - Chunk aThisChunk = aWorld.getChunkFromBlockCoords(x, z); - for (List l : aThisChunk.entityLists) { - aEntityList.addAll(l); - } - for (Object o : aEntityList) { - if (o != null) { - if (o instanceof Entity) { - if (o instanceof EntityPlayer) { - continue; - } else { - Entity e = (Entity) o; - BlockPos p = EntityUtils.findBlockPosUnderEntity(e); - if (p != null) { - int newY = p.yPos + 1; - if (e.getDistance(xCoord, yCoord, zCoord) <= 2) { - mNearbyEntityCache.put(e); - } else if (aThisPos.distanceFrom(p.xPos, newY, p.zPos) <= 2) { - mNearbyEntityCache.put(e); - } - } - } - } - } - } - } - - if (mTickCounter % 4 == 0) { - for (Entity y : mNearbyEntityCache) { - if (y.getDistance(xCoord, yCoord, zCoord) > 2) { - mNearbyEntityCache.remove(y); - } - } - - boolean foundMonster = mNearbyEntityCache.size() > 0; - int aNeighbourDoorState = 0; - if (mNeighbourDoor != null) { - aNeighbourDoorState = getNeighbourState(); - } - BlockDoor aDoor = (aBlock instanceof BlockDoor ? (BlockDoor) aBlock : null); - boolean aPlayers = checkForPlayers(this.getWorldObj()); - - if (aDoor != null) { - // If neighbour state != 0 and we are in slave mode - if (aNeighbourDoorState != 0 && mMeta == -1) { - if (aNeighbourDoorState == 100) { - if (!mIsOpen && !foundMonster) { - // Logger.INFO("Opening Door (Slave)"); - aDoor.func_150014_a(aWorld, this.xCoord, this.yCoord, this.zCoord, true); - mIsOpen = true; - } - } else if (aNeighbourDoorState == -100 || foundMonster) { - if (mIsOpen) { - // Logger.INFO("Closing Door (Slave)"); - aDoor.func_150014_a(aWorld, this.xCoord, this.yCoord, this.zCoord, false); - mIsOpen = false; - } - } - // We are master, proceed - } else { - // No redstone found, allow automatic handling - if (aDoor != null && !hasRedstone()) { - // Found a nearby player - if (aPlayers) { - // If we are closed and there are no monsters nearby, open - if (!mIsOpen && !foundMonster) { - // Logger.INFO("Opening Door (Mstr)"); - aDoor.func_150014_a(aWorld, this.xCoord, this.yCoord, this.zCoord, true); - mIsOpen = true; - } else { - // Logger.INFO("Doing Nothing, Door is in correct state."); - } - // Did not find nearby player - } else { - // If we are open or there is a monster nearby, close. - if (mIsOpen || foundMonster) { - // Logger.INFO("Closing Door (Mstr)"); - aDoor.func_150014_a(aWorld, this.xCoord, this.yCoord, this.zCoord, false); - mIsOpen = false; - } else { - // Logger.INFO("Doing Nothing, Door is in correct state."); - } - } - } - } - } - } - super.updateEntity(); - mTickCounter++; - } - - @Override - public int getBlockMetadata() { - return this.mMeta; - } - - public boolean hasRedstone() { - World aWorld = this.worldObj; - if (aWorld != null && !aWorld.isRemote) { - return aWorld.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord) - || aWorld.isBlockIndirectlyGettingPowered(xCoord, yCoord + 1, zCoord); - } - return false; - } - - @Override - public Block getBlockType() { - return mBlockType; - } - - @Override - public boolean canUpdate() { - return true; - } - - private boolean checkForPlayers(World aWorld) { - int x = 0, y = 0, z = 0; - x = this.xCoord; - y = this.yCoord; - z = this.zCoord; - EntityPlayer aPlayer = aWorld.getClosestPlayer(x, y, z, 3.5D); - if (aPlayer != null) { - return true; - } - return false; - } - - private short getClosedMeta() { - return 0; - } - - private short getOpenMeta() { - return 1; - } -} diff --git a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java index 9e829e0c16..a7fb226411 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/tileentities/general/TileEntityVolumetricFlaskSetter.java @@ -87,25 +87,25 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide } private int getCapacityForSlot(int aSlot) { - switch (aSlot) { - case 0: // 16 - return 16; - case 1: // 36 - return 36; - case 2: // 144 - return 144; - case 3: // 432 - return 432; - case 4: // 576 - return 576; - case 5: // 720 - return 720; - case 6: // 864 - return 864; - case 7: // Custom - return getCustomValue(); - } - return 1000; + return switch (aSlot) { + case 0 -> // 16 + 16; + case 1 -> // 36 + 36; + case 2 -> // 144 + 144; + case 3 -> // 432 + 432; + case 4 -> // 576 + 576; + case 5 -> // 720 + 720; + case 6 -> // 864 + 864; + case 7 -> // Custom + getCustomValue(); + default -> 1000; + }; } public boolean addOutput() { @@ -126,7 +126,7 @@ public class TileEntityVolumetricFlaskSetter extends TileEntity implements ISide return false; } } - AutoMap<Integer> aValidSlots = new AutoMap<Integer>(); + AutoMap<Integer> aValidSlots = new AutoMap<>(); int aSlotCount = 0; for (ItemStack i : aInputs) { if (i != null) { diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java index c256f73b4c..d3add73de7 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityAdvPooCollector.java @@ -63,7 +63,7 @@ public class TileEntityAdvPooCollector extends TileEntityBaseFluidCollector { return false; } - private static AutoMap<Class> aEntityToDrain = new AutoMap<Class>(); + private static AutoMap<Class> aEntityToDrain = new AutoMap<>(); @Override public AutoMap<Class> aThingsToLookFor() { diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java index 54014103cd..ac78658403 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPestKiller.java @@ -52,7 +52,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, private boolean mNeedsUpdate = false; private String mCustomName; - private static final AutoMap<Class<?>> mEntityMap = new AutoMap<Class<?>>(); + private static final AutoMap<Class<?>> mEntityMap = new AutoMap<>(); static { mEntityMap.put(EntityBat.class); @@ -74,7 +74,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, return mTank; } - private final void setup() { + private void setup() { World w = this.worldObj; if (w != null) { Chunk c = w.getChunkFromBlockCoords(this.xCoord, this.zCoord); @@ -91,19 +91,19 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, int min = 0; int max = 0; switch (getTier()) { - case 1: + case 1 -> { min = -2; max = 3; - break; - case 2: + } + case 2 -> { min = -4; max = 5; - break; - default: - // code block + } + default -> {} + // code block } int aChunkCount = 0; - AutoMap<Entity> entities = new AutoMap<Entity>(); + AutoMap<Entity> entities = new AutoMap<>(); if (min != 0 && max != 0) { for (int x = min; x < max; x++) { for (int z = min; z < max; z++) { @@ -491,7 +491,7 @@ public class TileEntityPestKiller extends TileEntity implements ISidedInventory, this.mNeedsUpdate = true; } - private final void updateTick() { + private void updateTick() { if (mNeedsUpdate) { if (mUpdateTick == 0) { mUpdateTick = 4; // every 4 ticks it will send an update diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java index ceff9d8528..d0d4ee3661 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityPooCollector.java @@ -67,7 +67,7 @@ public class TileEntityPooCollector extends TileEntityBaseFluidCollector { return false; } - private static AutoMap<Class> aEntityToDrain = new AutoMap<Class>(); + private static AutoMap<Class> aEntityToDrain = new AutoMap<>(); @Override public AutoMap<Class> aThingsToLookFor() { diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java index 0229f89402..a287d8c33a 100644 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java +++ b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityProjectTable.java @@ -4,8 +4,6 @@ import java.util.List; import java.util.Vector; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -30,10 +28,6 @@ public class TileEntityProjectTable extends TileEntity public InventoryProjectMain inventoryGrid; public InventoryProjectOutput inventoryOutputs; - /** The crafting matrix inventory (3x3). */ - public InventoryCrafting craftMatrix; - - public IInventory craftResult; private Container_ProjectTable container; public TileEntityProjectTable() { diff --git a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java b/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java deleted file mode 100644 index 366251941b..0000000000 --- a/src/main/java/gtPlusPlus/core/tileentities/machines/TileEntityRoundRobinator.java +++ /dev/null @@ -1,687 +0,0 @@ -package gtPlusPlus.core.tileentities.machines; - -import java.util.EnumSet; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockChest; -import net.minecraft.command.IEntitySelector; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.inventory.ISidedInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.IHopper; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.tileentity.TileEntityChest; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.GTplusplus; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.handler.GuiHandler; -import gtPlusPlus.core.inventories.Inventory_RoundRobinator; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.sys.KeyboardUtils; - -public class TileEntityRoundRobinator extends TileEntity implements ISidedInventory, IHopper { - - private int tickCount = 0; - private final Inventory_RoundRobinator inventoryContents; - private String customName; - public int locationX; - public int locationY; - public int locationZ; - private int aData = 1111; - private int aTier = 1; - private int aTickRate = 100; - - public TileEntityRoundRobinator() { - this.inventoryContents = new Inventory_RoundRobinator(); - this.setTileLocation(); - } - - public boolean setTileLocation() { - if (this.hasWorldObj()) { - if (!this.getWorldObj().isRemote) { - this.locationX = this.xCoord; - this.locationY = this.yCoord; - this.locationZ = this.zCoord; - this.aTier = this.getWorldObj().getBlockMetadata(locationX, locationY, locationZ) + 1; - return true; - } - } - return false; - } - - // Rename to hasCircuitToConfigure - public final boolean hasInventoryContents() { - for (ItemStack i : this.aHopperInventory) { - if (i == null) { - continue; - } else { - return true; - } - } - return false; - } - - public Inventory_RoundRobinator getInventory() { - return this.inventoryContents; - } - - public int getTier() { - return this.aTier; - } - - public int getTickRate() { - return this.aTickRate; - } - - @Override - public void updateEntity() { - try { - // TODO - if (this.worldObj != null && !this.worldObj.isRemote) { - setTileLocation(); - aTickRate = (60 - (aTier * 10)); - if (this.getTier() == 1) { - // 20 s - aTickRate = 400; - } else if (this.getTier() == 2) { - // 5 - aTickRate = 100; - } else if (this.getTier() == 3) { - // 1 - aTickRate = 20; - } else if (this.getTier() == 4) { - // 1/5 - aTickRate = 10; - } else if (this.getTier() == 5) { - // 1/20 - aTickRate = 1; - } else { - aTickRate = 999999; - } - - if (tickCount % getTickRate() == 0) { - if (hasInventoryContents()) { - Logger.WARNING("Trying to move items. " + aTickRate); - this.tryProcessItems(); - } - } - this.tickCount++; - } - } catch (final Throwable t) { - t.printStackTrace(); - } - } - - public boolean anyPlayerInRange() { - return this.worldObj.getClosestPlayer(this.xCoord + 0.5D, this.yCoord + 0.5D, this.zCoord + 0.5D, 32) != null; - } - - public NBTTagCompound getTag(final NBTTagCompound nbt, final String tag) { - if (!nbt.hasKey(tag)) { - nbt.setTag(tag, new NBTTagCompound()); - } - return nbt.getCompoundTag(tag); - } - - @Override - public void writeToNBT(final NBTTagCompound nbt) { - super.writeToNBT(nbt); - if (this.hasCustomInventoryName()) { - nbt.setString("CustomName", this.getCustomName()); - } - nbt.setInteger("aCurrentMode", aData); - this.writeToNBT2(nbt); - } - - @Override - public void readFromNBT(final NBTTagCompound nbt) { - super.readFromNBT(nbt); - if (nbt.hasKey("CustomName", 8)) { - this.setCustomName(nbt.getString("CustomName")); - } - aData = nbt.getInteger("aCurrentMode"); - this.readFromNBT2(nbt); - } - - @Override - public int getInventoryStackLimit() { - return 64; - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer entityplayer) { - return this.getInventory().isUseableByPlayer(entityplayer); - } - - @Override - public void openInventory() { - this.worldObj.addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, 1); - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType()); - // this.getInventory().openInventory(); - } - - @Override - public void closeInventory() { - this.worldObj.addBlockEvent(this.xCoord, this.yCoord, this.zCoord, this.getBlockType(), 1, 1); - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); - this.worldObj.notifyBlocksOfNeighborChange(this.xCoord, this.yCoord - 1, this.zCoord, this.getBlockType()); - // this.getInventory().closeInventory(); - } - - @Override - public boolean isItemValidForSlot(final int slot, final ItemStack itemstack) { - return true; - } - - @Override - public int[] getAccessibleSlotsFromSide(final int aSide) { - return new int[] { 0, 1, 2, 3, 4 }; - } - - @Override - public boolean canInsertItem(final int aSlot, final ItemStack aStack, final int aSide) { - return aSide < 2; - } - - @Override - public boolean canExtractItem(final int aSlot, final ItemStack aStack, final int aSide) { - return false; - } - - public String getCustomName() { - return this.customName; - } - - public void setCustomName(final String customName) { - this.customName = customName; - } - - @Override - public String getInventoryName() { - return this.hasCustomInventoryName() ? this.customName : "container.roundrobinator"; - } - - @Override - public boolean hasCustomInventoryName() { - return (this.customName != null) && !this.customName.equals(""); - } - - @Override - public Packet getDescriptionPacket() { - final NBTTagCompound tag = new NBTTagCompound(); - this.writeToNBT(tag); - return new S35PacketUpdateTileEntity(this.xCoord, this.yCoord, this.zCoord, this.blockMetadata, tag); - } - - @Override - public void onDataPacket(final NetworkManager net, final S35PacketUpdateTileEntity pkt) { - final NBTTagCompound tag = pkt.func_148857_g(); - this.readFromNBT(tag); - } - - public boolean onRightClick(ForgeDirection side, EntityPlayer player, int x, int y, int z) { - if (player != null && player.getHeldItem() == null) { - if (!player.isSneaking() && !KeyboardUtils.isShiftKeyDown()) { - player.openGui(GTplusplus.instance, GuiHandler.GUI16, player.getEntityWorld(), x, y, z); - } else { - String InventoryContents = ItemUtils.getArrayStackNames(this.aHopperInventory); - PlayerUtils.messagePlayer(player, "Contents: " + InventoryContents + " | " + getDataString()); - } - return true; - } else { - return false; - } - } - - public boolean onScrewdriverRightClick(ForgeDirection side, EntityPlayer player, int x, int y, int z) { - try { - if (side.offsetY != 0) { - // Top/Bottom - } else { - if (toggleSide(side)) { - PlayerUtils.messagePlayer(player, "Enabling side " + side + "."); - } else { - PlayerUtils.messagePlayer(player, "Disabling side " + side + "."); - } - PlayerUtils.messagePlayer(player, "Mode String: " + aData + ""); - } - return true; - } catch (Throwable t) { - t.printStackTrace(); - return false; - } - } - - public int getDataString() { - return aData; - } - - public boolean[] getActiveSides() { - this.markDirty(); - String s = String.valueOf(aData); - if (s == null || s.length() != 4) { - s = "1111"; - } - boolean[] aActiveSides = new boolean[4]; - for (int i = 0; i < 4; i++) { - char ch = s.charAt(i); - if (ch == '1') { - aActiveSides[i] = true; - } else { - aActiveSides[i] = false; - } - } - return aActiveSides; - } - - /** - * Toggle active state of side - * - * @param side - Forge Direction / Side - * @return - True if the side is now Active, false if now disabled. - */ - public boolean toggleSide(ForgeDirection side) { - setSideActive(!getSideActive(side), side); - return getSideActive(side); - } - - public void setSideActive(boolean aActive, ForgeDirection side) { - try { - if (side.offsetY != 0) {} else { - if (aData < 1111) { - aData = 1111; - } else if (aData > 2222) { - aData = 2222; - } - String s = String.valueOf(aData); - StringBuilder aDataString = new StringBuilder(s); - int aIndex = side.ordinal() - 2; - if (aActive) { - aDataString.setCharAt(aIndex, '1'); - } else { - aDataString.setCharAt(aIndex, '2'); - } - aData = Integer.valueOf(aDataString.toString()); - this.markDirty(); - } - } catch (Throwable t) { - t.printStackTrace(); - } - } - - public boolean getSideActive(ForgeDirection side) { - this.markDirty(); - try { - if (side.offsetY != 0) { - return false; - } else { - if (aData < 1111) { - aData = 1111; - } else if (aData > 2222) { - aData = 2222; - } - String s = String.valueOf(aData); - int aIndex = side.ordinal() - 2; - char ch = s.charAt(aIndex); - if (ch == '1') { - return true; - } else { - return false; - } - } - } catch (Throwable t) { - t.printStackTrace(); - return false; - } - } - - @Override - public double getXPos() { - return this.locationX; - } - - @Override - public double getYPos() { - return this.locationY; - } - - @Override - public double getZPos() { - return this.locationZ; - } - - // TODO - - /* - * Hopper Code - */ - - private ItemStack[] aHopperInventory = new ItemStack[5]; - - @Override - public int getSizeInventory() { - return this.aHopperInventory.length; - } - - @Override - public ItemStack getStackInSlot(int aSlot) { - return this.aHopperInventory[aSlot]; - } - - /** - * Removes from an inventory slot (first arg) up to a specified number (second arg) of items and returns them in a - * new stack. - */ - @Override - public ItemStack decrStackSize(int aSlot, int aMinimumSizeOfExistingStack) { - if (this.aHopperInventory[aSlot] != null) { - ItemStack itemstack; - - if (this.aHopperInventory[aSlot].stackSize <= aMinimumSizeOfExistingStack) { - itemstack = this.aHopperInventory[aSlot]; - this.aHopperInventory[aSlot] = null; - return itemstack; - } else { - itemstack = this.aHopperInventory[aSlot].splitStack(aMinimumSizeOfExistingStack); - - if (this.aHopperInventory[aSlot].stackSize == 0) { - this.aHopperInventory[aSlot] = null; - } - - return itemstack; - } - } else { - return null; - } - } - - /** - * When some containers are closed they call this on each slot, then drop whatever it returns as an EntityItem - - * like when you close a workbench GUI. - */ - @Override - public ItemStack getStackInSlotOnClosing(int aSlot) { - if (this.aHopperInventory[aSlot] != null) { - ItemStack itemstack = this.aHopperInventory[aSlot]; - this.aHopperInventory[aSlot] = null; - return itemstack; - } else { - return null; - } - } - - /** - * Sets the given item stack to the specified slot in the inventory (can be crafting or armor sections). - */ - @Override - public void setInventorySlotContents(int aSlot, ItemStack aStack) { - this.aHopperInventory[aSlot] = aStack; - - if (aStack != null && aStack.stackSize > this.getInventoryStackLimit()) { - aStack.stackSize = this.getInventoryStackLimit(); - } - } - - public boolean tryProcessItems() { - if (this.worldObj != null && !this.worldObj.isRemote) { - boolean didSomething = false; - if (!this.isEmpty()) { - Logger.WARNING("Has Items, Trying to push to all active directions."); - didSomething = this.tryPushItemsIntoNeighbours(); - } - if (didSomething) { - this.markDirty(); - return true; - } - } - return false; - } - - /** - * Is Empty - * - * @return - */ - private boolean isEmpty() { - ItemStack[] aitemstack = this.aHopperInventory; - int i = aitemstack.length; - - for (int j = 0; j < i; ++j) { - ItemStack itemstack = aitemstack[j]; - - if (itemstack != null) { - return false; - } - } - - return true; - } - - private static final EnumSet<ForgeDirection> VALID_SIDES = EnumSet - .of(ForgeDirection.NORTH, ForgeDirection.SOUTH, ForgeDirection.WEST, ForgeDirection.EAST); - - private boolean tryPushItemsIntoNeighbours() { - - boolean aDidPush = false; - - for (final ForgeDirection side : VALID_SIDES) { - final int ordinalSide = side.ordinal(); - if (!this.getSideActive(side)) { - Logger.WARNING("Not pushing on side " + side); - continue; - } - - Logger.WARNING("Pushing on side " + side); - IInventory iinventory = this.getInventoryFromFacing(side); - - if (iinventory == null) { - Logger.WARNING("No inventory found."); - continue; - } else { - final ForgeDirection oppositeSide = side.getOpposite(); - - // int i = Facing.oppositeSide[u]; - Logger.WARNING("Using Opposite direction: " + oppositeSide); - - if (this.isInventoryFull(iinventory, oppositeSide.ordinal())) { - Logger.WARNING("Target is full, skipping."); - continue; - } else { - Logger.WARNING("Target has space, let's move a single item."); - for (int j = 0; j < this.getSizeInventory(); ++j) { - if (this.getStackInSlot(j) != null) { - ItemStack itemstack = this.getStackInSlot(j).copy(); - ItemStack itemstack1 = setStackInNeighbour( - iinventory, - this.decrStackSize(j, 1), - ordinalSide); - if (itemstack1 == null || itemstack1.stackSize == 0) { - iinventory.markDirty(); - aDidPush = true; - continue; - } - this.setInventorySlotContents(j, itemstack); - } - } - } - } - } - - return aDidPush; - } - - private boolean isInventoryFull(IInventory aInv, int ordinalSide) { - if (aInv instanceof ISidedInventory && ordinalSide > -1) { - ISidedInventory isidedinventory = (ISidedInventory) aInv; - int[] aint = isidedinventory.getAccessibleSlotsFromSide(ordinalSide); - - for (int l = 0; l < aint.length; ++l) { - ItemStack itemstack1 = isidedinventory.getStackInSlot(aint[l]); - - if (itemstack1 == null || itemstack1.stackSize != itemstack1.getMaxStackSize()) { - return false; - } - } - } else { - int j = aInv.getSizeInventory(); - - for (int k = 0; k < j; ++k) { - ItemStack itemstack = aInv.getStackInSlot(k); - - if (itemstack == null || itemstack.stackSize != itemstack.getMaxStackSize()) { - return false; - } - } - } - return true; - } - - public static ItemStack setStackInNeighbour(IInventory aNeighbour, ItemStack aStack, int ordinalSide) { - if (aNeighbour instanceof ISidedInventory && ordinalSide > -1) { - ISidedInventory isidedinventory = (ISidedInventory) aNeighbour; - int[] aint = isidedinventory.getAccessibleSlotsFromSide(ordinalSide); - - for (int l = 0; l < aint.length && aStack != null && aStack.stackSize > 0; ++l) { - aStack = tryMoveStack(aNeighbour, aStack, aint[l], ordinalSide); - } - } else { - int j = aNeighbour.getSizeInventory(); - - for (int k = 0; k < j && aStack != null && aStack.stackSize > 0; ++k) { - aStack = tryMoveStack(aNeighbour, aStack, k, ordinalSide); - } - } - - if (aStack != null && aStack.stackSize == 0) { - aStack = null; - } - - return aStack; - } - - private static boolean canInsertItemIntoNeighbour(IInventory aNeighbour, ItemStack aStack, int aSlot, int aSide) { - return !aNeighbour.isItemValidForSlot(aSlot, aStack) ? false - : !(aNeighbour instanceof ISidedInventory) - || ((ISidedInventory) aNeighbour).canInsertItem(aSlot, aStack, aSide); - } - - private static ItemStack tryMoveStack(IInventory aNeighbour, ItemStack aStack, int aSlot, int aSide) { - ItemStack itemstack1 = aNeighbour.getStackInSlot(aSlot); - if (canInsertItemIntoNeighbour(aNeighbour, aStack, aSlot, aSide)) { - boolean aDidSomething = false; - if (itemstack1 == null) { - // Forge: BUGFIX: Again, make things respect max stack sizes. - int max = Math.min(aStack.getMaxStackSize(), aNeighbour.getInventoryStackLimit()); - if (max >= aStack.stackSize) { - aNeighbour.setInventorySlotContents(aSlot, aStack); - aStack = null; - } else { - aNeighbour.setInventorySlotContents(aSlot, aStack.splitStack(max)); - } - aDidSomething = true; - } else if (areItemStacksEqual(itemstack1, aStack)) { - // Forge: BUGFIX: Again, make things respect max stack sizes. - int max = Math.min(aStack.getMaxStackSize(), aNeighbour.getInventoryStackLimit()); - if (max > itemstack1.stackSize) { - int l = Math.min(aStack.stackSize, max - itemstack1.stackSize); - aStack.stackSize -= l; - itemstack1.stackSize += l; - aDidSomething = l > 0; - } - } - if (aDidSomething) { - aNeighbour.markDirty(); - } - } - return aStack; - } - - private IInventory getInventoryFromFacing(ForgeDirection side) { - return tryFindInvetoryAtXYZ( - this.getWorldObj(), - this.xCoord + side.offsetX, - this.yCoord + side.offsetY, - this.zCoord + side.offsetZ); - } - - public static IInventory tryFindInvetoryAtXYZ(World aWorld, double aX, double aY, double aZ) { - IInventory iinventory = null; - int sX = MathHelper.floor_double(aX); - int sY = MathHelper.floor_double(aY); - int sZ = MathHelper.floor_double(aZ); - TileEntity tileentity = aWorld.getTileEntity(sX, sY, sZ); - - if (tileentity != null && tileentity instanceof IInventory) { - iinventory = (IInventory) tileentity; - - if (iinventory instanceof TileEntityChest) { - Block block = aWorld.getBlock(sX, sY, sZ); - - if (block instanceof BlockChest) { - iinventory = ((BlockChest) block).func_149951_m(aWorld, sX, sY, sZ); - } - } - } - - if (iinventory == null) { - List list = aWorld.getEntitiesWithinAABBExcludingEntity( - (Entity) null, - AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1.0D, aY + 1.0D, aZ + 1.0D), - IEntitySelector.selectInventories); - - if (list != null && list.size() > 0) { - iinventory = (IInventory) list.get(aWorld.rand.nextInt(list.size())); - } - } - - return iinventory; - } - - private static boolean areItemStacksEqual(ItemStack aStack, ItemStack aStack2) { - return aStack.getItem() != aStack2.getItem() ? false - : (aStack.getItemDamage() != aStack2.getItemDamage() ? false - : (aStack.stackSize > aStack.getMaxStackSize() ? false - : ItemStack.areItemStackTagsEqual(aStack, aStack2))); - } - - public void readFromNBT2(NBTTagCompound p_145839_1_) { - super.readFromNBT(p_145839_1_); - NBTTagList nbttaglist = p_145839_1_.getTagList("Items", 10); - this.aHopperInventory = new ItemStack[this.getSizeInventory()]; - for (int i = 0; i < nbttaglist.tagCount(); ++i) { - NBTTagCompound nbttagcompound1 = nbttaglist.getCompoundTagAt(i); - byte b0 = nbttagcompound1.getByte("Slot"); - if (b0 >= 0 && b0 < this.aHopperInventory.length) { - this.aHopperInventory[b0] = ItemStack.loadItemStackFromNBT(nbttagcompound1); - } - } - } - - public void writeToNBT2(NBTTagCompound aNBT) { - super.writeToNBT(aNBT); - NBTTagList nbttaglist = new NBTTagList(); - for (int i = 0; i < this.aHopperInventory.length; ++i) { - if (this.aHopperInventory[i] != null) { - NBTTagCompound nbttagcompound1 = new NBTTagCompound(); - nbttagcompound1.setByte("Slot", (byte) i); - this.aHopperInventory[i].writeToNBT(nbttagcompound1); - nbttaglist.appendTag(nbttagcompound1); - } - } - aNBT.setTag("Items", nbttaglist); - } -} diff --git a/src/main/java/gtPlusPlus/core/util/Utils.java b/src/main/java/gtPlusPlus/core/util/Utils.java index 04c70beae6..df37479533 100644 --- a/src/main/java/gtPlusPlus/core/util/Utils.java +++ b/src/main/java/gtPlusPlus/core/util/Utils.java @@ -1,21 +1,15 @@ package gtPlusPlus.core.util; import java.awt.Color; -import java.awt.Graphics; import java.io.File; import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; +import java.util.Collections; import java.util.HashMap; -import java.util.List; +import java.util.HashSet; import java.util.Map; -import java.util.Timer; -import java.util.TimerTask; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.item.Item.ToolMaterial; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -23,31 +17,24 @@ import net.minecraft.nbt.NBTTagString; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; import net.minecraft.util.IChatComponent; -import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.EnumUtils; import cpw.mods.fml.common.FMLCommonHandler; import gregtech.api.GregTech_API; -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Utility; -import gtPlusPlus.GTplusplus; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.NBTUtils; @@ -57,24 +44,14 @@ import ic2.core.item.resources.ItemCell; public class Utils { - public static final int WILDCARD_VALUE = Short.MAX_VALUE; - - public static final boolean isServer() { + public static boolean isServer() { return FMLCommonHandler.instance().getEffectiveSide().isServer(); } - public static final boolean isClient() { + public static boolean isClient() { return FMLCommonHandler.instance().getEffectiveSide().isClient(); } - static class ShortTimerTask extends TimerTask { - - @Override - public void run() { - Logger.WARNING("Timer expired."); - } - } - public static TC_AspectStack getTcAspectStack(final TC_Aspects aspect, final long size) { return getTcAspectStack(aspect.name(), (int) size); } @@ -91,7 +68,7 @@ public class Utils { TC_AspectStack returnValue = null; - if (aspect.toUpperCase().equals("COGNITIO")) { + if (aspect.equalsIgnoreCase("COGNITIO")) { // Adds in Compat for older GT Versions which Misspell aspects. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "COGNITIO")) { @@ -106,7 +83,7 @@ public class Utils { } catch (final NoSuchFieldError r) { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } - } else if (aspect.toUpperCase().equals("EXANIMUS")) { + } else if (aspect.equalsIgnoreCase("EXANIMUS")) { // Adds in Compat for older GT Versions which Misspell aspects. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "EXANIMUS")) { @@ -122,7 +99,7 @@ public class Utils { Logger.INFO("Invalid Thaumcraft Aspects - Report this issue to Alkalus"); } - } else if (aspect.toUpperCase().equals("PRAECANTATIO")) { + } else if (aspect.equalsIgnoreCase("PRAECANTATIO")) { // Adds in Compat for older GT Versions which Misspell aspects. try { if (EnumUtils.isValidEnum(TC_Aspects.class, "PRAECANTATIO")) { @@ -145,35 +122,12 @@ public class Utils { return returnValue; } - public static boolean containsMatch(final boolean strict, final ItemStack[] inputs, final ItemStack... targets) { - for (final ItemStack input : inputs) { - for (final ItemStack target : targets) { - if (itemMatches(target, input, strict)) { - return true; - } - } - } - return false; - } - - public static boolean itemMatches(final ItemStack target, final ItemStack input, final boolean strict) { - if ((input == null) || (target == null)) { - return false; - } - return ((target.getItem() == input.getItem()) && (((target.getItemDamage() == WILDCARD_VALUE) && !strict) - || (target.getItemDamage() == input.getItemDamage()))); - } - // Register an event to both busses. public static void registerEvent(Object o) { MinecraftForge.EVENT_BUS.register(o); FMLCommonHandler.instance().bus().register(o); } - public static void paintBox(final Graphics g, final int MinA, final int MinB, final int MaxA, final int MaxB) { - g.drawRect(MinA, MinB, MaxA, MaxB); - } - // Send a message to all players on the server public static void sendServerMessage(final String translationKey) { sendServerMessage(new ChatComponentText(translationKey)); @@ -201,158 +155,13 @@ public class Utils { return FluidRegistry.getFluidStack("ic2steam", (int) aAmount); } - /* - * public static void recipeBuilderBlock(ItemStack slot_1, ItemStack slot_2, ItemStack slot_3, ItemStack slot_4, - * ItemStack slot_5, ItemStack slot_6, ItemStack slot_7, ItemStack slot_8, ItemStack slot_9, Block resultBlock){ - * GameRegistry.addRecipe(new ItemStack(resultBlock), new Object[] {"ABC", "DEF", "GHI", - * 'A',slot_1,'B',slot_2,'C',slot_3, 'D',slot_4,'E',slot_5,'F',slot_6, 'G',slot_7,'H',slot_8,'I',slot_9 }); } - */ - - public static String checkCorrectMiningToolForBlock(final Block currentBlock, final World currentWorld) { - String correctTool = ""; - if (!currentWorld.isRemote) { - try { - correctTool = currentBlock.getHarvestTool(0); - Logger.WARNING(correctTool); - - } catch (final NullPointerException e) { - - } - } - - return correctTool; - } - - /** - * - * @param colourStr e.g. "#FFFFFF" - * @return String - formatted "rgb(0,0,0)" - */ - public static String hex2RgbFormatted(final String hexString) { - final Color c = new Color( - Integer.valueOf(hexString.substring(1, 3), 16), - Integer.valueOf(hexString.substring(3, 5), 16), - Integer.valueOf(hexString.substring(5, 7), 16)); - - final StringBuffer sb = new StringBuffer(); - sb.append("rgb("); - sb.append(c.getRed()); - sb.append(","); - sb.append(c.getGreen()); - sb.append(","); - sb.append(c.getBlue()); - sb.append(")"); - return sb.toString(); - } - - /** - * - * @param colourStr e.g. "#FFFFFF" - * @return - */ - public static Color hex2Rgb(final String colorStr) { - return new Color( - Integer.valueOf(colorStr.substring(1, 3), 16), - Integer.valueOf(colorStr.substring(3, 5), 16), - Integer.valueOf(colorStr.substring(5, 7), 16)); - } - - /** - * - * @param colourInt e.g. 0XFFFFFF - * @return Colour - */ - public static Color hex2Rgb(final int colourInt) { - return Color.decode(String.valueOf(colourInt)); - } - - /** - * - * @param colourInt e.g. 0XFFFFFF - * @return short[] - */ - public static short[] hex2RgbShort(final int colourInt) { - final Color rgb = Color.decode(String.valueOf(colourInt)); - final short[] rgba = { (short) rgb.getRed(), (short) rgb.getGreen(), (short) rgb.getBlue(), - (short) rgb.getAlpha() }; - return rgba; - } - - public static Timer ShortTimer(final int seconds) { - Timer timer; - timer = new Timer(); - timer.schedule(new ShortTimerTask(), seconds * 1000); - return timer; - } - - public static String byteToHex(final byte b) { - final int i = b & 0xFF; - return Integer.toHexString(i); - } - - public static Object[] convertListToArray(final List<Object> sourceList) { - final Object[] targetArray = sourceList.toArray(new Object[sourceList.size()]); - return targetArray; - } - - public static List<Object> convertArrayToFixedSizeList(final Object[] sourceArray) { - final List<Object> targetList = Arrays.asList(sourceArray); - return targetList; - } - - public static List<Object> convertArrayToList(final Object[] sourceArray) { - final List<Object> targetList = new ArrayList<>(Arrays.asList(sourceArray)); - return targetList; - } - - public static List<Object> convertArrayListToList(final ArrayList<Object> sourceArray) { - final List<Object> targetList = new ArrayList<Object>(Arrays.asList(sourceArray)); - return targetList; - } - - public static void spawnCustomParticle(final Entity entity) { - GTplusplus.proxy.generateMysteriousParticles(entity); - } - - public static void spawnFX(final World world, final int x, final int y, final int z, final String particleName, - Object particleName2) { - if (!world.isRemote) { - if ((particleName2 == null) || particleName2.equals("")) { - particleName2 = particleName; - } - final int l = MathUtils.randInt(0, 4); - final double d0 = x + 0.5F; - final double d1 = y + 0.7F; - final double d2 = z + 0.5F; - final double d3 = 0.2199999988079071D; - final double d4 = 0.27000001072883606D; - - if (l == 1) { - world.spawnParticle(particleName, d0 - d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); - } else if (l == 2) { - world.spawnParticle((String) particleName2, d0 + d4, d1 + d3, d2, 0.0D, 0.0D, 0.0D); - } else if (l == 3) { - world.spawnParticle(particleName, d0, d1 + d3, d2 - d4, 0.0D, 0.0D, 0.0D); - } else if (l == 4) { - world.spawnParticle((String) particleName2, d0, d1 + d3, d2 + d4, 0.0D, 0.0D, 0.0D); - } else { - world.spawnParticle(particleName, d0, d1, d2, 0.0D, 0.0D, 0.0D); - if (particleName2 != null) { - world.spawnParticle((String) particleName2, d0, d1, d2, 0.0D, 0.0D, 0.0D); - } - } - } - } - public static int rgbtoHexValue(final int r, final int g, final int b) { if ((r > 255) || (g > 255) || (b > 255) || (r < 0) || (g < 0) || (b < 0)) { return 0; } final Color c = new Color(r, g, b); String temp = Integer.toHexString(c.getRGB() & 0xFFFFFF).toUpperCase(); - temp = Utils.appenedHexNotationToString(String.valueOf(temp)); - // Logger.WARNING("Made " + temp + " - Hopefully it's not a mess."); - // Logger.WARNING("It will decode into " + Integer.decode(temp) + "."); + temp = Utils.appenedHexNotationToString(temp); return Integer.decode(temp); } @@ -365,41 +174,7 @@ public class Utils { sb.append('0'); } sb.append(originalString); - final String paddedString = sb.toString(); - return paddedString; - } - - public static String padWithZerosRight(final int value, final int length) { - String originalString = String.valueOf(value); - final StringBuilder sb = new StringBuilder(); - while ((sb.length() + originalString.length()) < length) { - sb.append('0'); - } - // sb.append(originalString); - if (sb.length() > 0) originalString = (originalString + sb.toString()); - final String paddedString = sb.toString(); - return originalString; - } - - /* - * Original Code by Chandana Napagoda - https://cnapagoda.blogspot.com.au/2011/03/java-hex-color-code-generator. - * html - */ - public static Map<Integer, String> hexColourGenerator(final int colorCount) { - final int maxColorValue = 16777215; - // this is decimal value of the "FFFFFF" - final int devidedvalue = maxColorValue / colorCount; - int countValue = 0; - final HashMap<Integer, String> hexColorMap = new HashMap<>(); - for (int a = 0; (a < colorCount) && (maxColorValue >= countValue); a++) { - if (a != 0) { - countValue += devidedvalue; - hexColorMap.put(a, Integer.toHexString(0x10000 | countValue).substring(1).toUpperCase()); - } else { - hexColorMap.put(a, Integer.toHexString(0x10000 | countValue).substring(1).toUpperCase()); - } - } - return hexColorMap; + return sb.toString(); } /* @@ -425,17 +200,15 @@ public class Utils { if (((String) hexAsStringOrInt).length() != 6) { final String temp = padWithZerosLefts((String) hexAsStringOrInt, 6); - result = temp; } result = hexChar + hexAsStringOrInt; return result; - } else if (hexAsStringOrInt.getClass() == Integer.class || hexAsStringOrInt.getClass() == int.class) { + } else if (hexAsStringOrInt.getClass() == Integer.class) { String aa = String.valueOf(hexAsStringOrInt); if (aa.length() != 6) { - final String temp = padWithZerosLefts(aa, 6); - result = temp; + result = padWithZerosLefts(aa, 6); } else { - result = hexChar + String.valueOf(hexAsStringOrInt); + result = hexChar + hexAsStringOrInt; } return result; } else { @@ -443,28 +216,6 @@ public class Utils { } } - public static Integer appenedHexNotationToInteger(final int hexAsStringOrInt) { - final String hexChar = "0x"; - String result; - Logger.WARNING(String.valueOf(hexAsStringOrInt)); - result = hexChar + String.valueOf(hexAsStringOrInt); - return Integer.getInteger(result); - } - - public static boolean doesEntryExistAlreadyInOreDictionary(final String OreDictName) { - if (OreDictionary.getOres(OreDictName).size() != 0) { - return true; - } - return false; - } - - public static boolean invertBoolean(final boolean booleans) { - if (booleans == true) { - return false; - } - return true; - } - public static File getMcDir() { if (Utils.isClient()) { if (Minecraft.getMinecraft() != null) { @@ -504,44 +255,46 @@ public class Utils { return null; } - public static String sanitizeString(final String input, final char[] aDontRemove) { + public static String sanitizeString(final String input, final char[] dontRemove) { + + // List of characters to remove + final HashSet<Character> toRemoveSet = new HashSet<>(); + Collections.addAll( + toRemoveSet, + ' ', + '-', + '_', + '~', + '?', + '!', + '@', + '#', + '$', + '%', + '^', + '&', + '*', + '(', + ')', + '{', + '}', + '[', + ']'); + + // Remove characters from the toRemoveSet if they are in dontRemove + for (char e : dontRemove) { + toRemoveSet.remove(e); + } - String output; - AutoMap<String> aToRemoveMap = new AutoMap<String>(); - - aToRemoveMap.put(" "); - aToRemoveMap.put("-"); - aToRemoveMap.put("_"); - aToRemoveMap.put("~"); - aToRemoveMap.put("?"); - aToRemoveMap.put("!"); - aToRemoveMap.put("@"); - aToRemoveMap.put("#"); - aToRemoveMap.put("$"); - aToRemoveMap.put("%"); - aToRemoveMap.put("^"); - aToRemoveMap.put("&"); - aToRemoveMap.put("*"); - aToRemoveMap.put("("); - aToRemoveMap.put(")"); - aToRemoveMap.put("{"); - aToRemoveMap.put("}"); - aToRemoveMap.put("["); - aToRemoveMap.put("]"); - aToRemoveMap.put(" "); - - for (String s : aToRemoveMap) { - for (char e : aDontRemove) { - if (s.charAt(0) == e) { - aToRemoveMap.remove("s"); - } + // Construct a sanitized string + StringBuilder sanitized = new StringBuilder(); + for (char c : input.toCharArray()) { + if (!toRemoveSet.contains(c)) { + sanitized.append(c); } } - output = input; - for (String A : aToRemoveMap) { - output = output.replace(A, ""); - } - return output; + + return sanitized.toString(); } public static String sanitizeString(final String input) { @@ -582,174 +335,86 @@ public class Utils { return output; } - public static String[] parseVersion(final String version) { - return parseVersion(version, "//."); - } - - public static String[] parseVersion(final String version, final String delimiter) { - final String[] versionArray = version.split(delimiter); - return versionArray; - } - - public static Versioning compareModVersion(final String currentVersion, final String expectedVersion) { - return compareModVersion(currentVersion, expectedVersion, "//."); - } - - public static Versioning compareModVersion(final String currentVersion, final String expectedVersion, - final String delimiter) { - final String[] a = parseVersion(currentVersion, delimiter); - final String[] b = parseVersion(expectedVersion, delimiter); - final int[] c = new int[a.length]; - final int[] d = new int[b.length]; - for (int r = 0; r < a.length; r++) { - c[r] = Integer.parseInt(a[r]); - } - for (int r = 0; r < b.length; r++) { - d[r] = Integer.parseInt(b[r]); - } - final Versioning[] e = new Versioning[MathUtils.returnLargestNumber(c.length, d.length)]; - for (int r = 0; r < e.length; r++) { - - if (c[r] > d[r]) { - e[r] = Versioning.NEWER; - } else if (c[r] < d[r]) { - e[r] = Versioning.OLDER; - } else if (c[r] == d[r]) { - e[r] = Versioning.EQUAL; - } - } - - for (int r = 0; r < e.length; r++) { - if (e[0] == Versioning.NEWER) { - return Versioning.NEWER; - } else if (e[0] == Versioning.OLDER) { - return Versioning.OLDER; - } else { - if (e[r] == Versioning.OLDER) {} - - return Versioning.NEWER; - } - } - - return null; - } - - public static ToolMaterial generateToolMaterialFromGT(final Materials gtMaterial) { - final String name = Utils.sanitizeString(gtMaterial.mDefaultLocalName); - final int harvestLevel = gtMaterial.mToolQuality; - final int durability = gtMaterial.mDurability; - final float damage = gtMaterial.mToolQuality; - final int efficiency = (int) gtMaterial.mToolSpeed; - final int enchantability = gtMaterial.mEnchantmentToolsLevel; - final ToolMaterial temp = EnumHelper - .addToolMaterial(name, harvestLevel, durability, efficiency, damage, enchantability); - return temp; - } - - public enum Versioning { - - EQUAL(0), - NEWER(1), - OLDER(-1); - - private final int versioningInfo; - - Versioning(final int versionStatus) { - this.versioningInfo = versionStatus; - } - - public int getTexture() { - return this.versioningInfo; - } - } - public static String addBookTitleLocalization(final String aTitle) { - return GT_LanguageManager.addStringLocalization( - new StringBuilder().append("Book.").append(aTitle).append(".Name").toString(), - aTitle, - !GregTech_API.sPostloadFinished); + return GT_LanguageManager + .addStringLocalization("Book." + aTitle + ".Name", aTitle, !GregTech_API.sPostloadFinished); } public static String[] addBookPagesLocalization(final String aTitle, final String[] aPages) { String[] aLocalizationPages = new String[aPages.length]; for (byte i = 0; i < aPages.length; i = (byte) (i + 1)) { aLocalizationPages[i] = GT_LanguageManager.addStringLocalization( - new StringBuilder().append("Book.").append(aTitle).append(".Page") - .append((i < 10) ? new StringBuilder().append("0").append(i).toString() : Byte.valueOf(i)) - .toString(), + "Book." + aTitle + ".Page" + ((i < 10) ? "0" + i : Byte.valueOf(i)), aPages[i], !GregTech_API.sPostloadFinished); } return aLocalizationPages; } - public static ItemStack getWrittenBook(final ItemStack aBook, final int aID, final String aMapping, - final String aTitle, final String aAuthor, final String[] aPages) { - if (GT_Utility.isStringInvalid(aMapping)) { + public static ItemStack getWrittenBook(ItemStack book, int ID, String mapping, String title, String author, + String[] pages) { + + if (GT_Utility.isStringInvalid(mapping)) { return null; } - ItemStack rStack = CORE.sBookList.get(aMapping); - if (rStack != null) { - return GT_Utility.copyAmount(1L, new Object[] { rStack }); + + ItemStack stack = CORE.sBookList.get(mapping); + if (stack != null) { + return GT_Utility.copyAmount(1L, stack); } - if ((GT_Utility.isStringInvalid(aTitle)) || (GT_Utility.isStringInvalid(aAuthor)) || (aPages.length <= 0)) { + + if (GT_Utility.isStringInvalid(title) || GT_Utility.isStringInvalid(author) || pages.length <= 0) { return null; } - final int vMeta = aID; - rStack = (aBook == null ? new ItemStack(ModItems.itemCustomBook, 1, vMeta) : aBook); - final NBTTagCompound tNBT = new NBTTagCompound(); - String localizationTitle = addBookTitleLocalization(aTitle); - tNBT.setString("title", localizationTitle); - tNBT.setString("author", aAuthor); - final NBTTagList tNBTList = new NBTTagList(); - final String[] aLocalizationPages = addBookPagesLocalization(aTitle, aPages); - for (byte i = 0; i < aPages.length; i = (byte) (i + 1)) { - aPages[i] = aLocalizationPages[i].replaceAll("<BR>", "\n"); + + stack = (book == null) ? new ItemStack(ModItems.itemCustomBook, 1, ID) : book; + + NBTTagCompound NBT = new NBTTagCompound(); + String localizationTitle = addBookTitleLocalization(title); + NBT.setString("title", localizationTitle); + NBT.setString("author", author); + + NBTTagList NBTList = new NBTTagList(); + String[] localizationPages = addBookPagesLocalization(title, pages); + + for (byte i = 0; i < pages.length; i++) { + pages[i] = localizationPages[i].replaceAll("<BR>", "\n"); if (i < 48) { - if (aPages[i].length() < 256) { - tNBTList.appendTag(new NBTTagString(aPages[i])); + if (pages[i].length() < 256) { + NBTList.appendTag(new NBTTagString(pages[i])); } else { - Logger.INFO("WARNING: String for written Book too long! -> " + aPages[i]); - GT_Log.err.println( - new StringBuilder().append("WARNING: String for written Book too long! -> ") - .append(aPages[i])); + Logger.INFO("WARNING: String for written Book too long! -> " + pages[i]); + GT_Log.err.println("WARNING: String for written Book too long! -> " + pages[i]); } } else { - Logger.INFO("WARNING: Too much Pages for written Book! -> " + aTitle); - GT_Log.err.println( - new StringBuilder().append("WARNING: Too much Pages for written Book! -> ").append(aTitle)); + Logger.INFO("WARNING: Too much Pages for written Book! -> " + title); + GT_Log.err.println("WARNING: Too much Pages for written Book! -> " + title); break; } } - tNBTList.appendTag( - new NBTTagString( - new StringBuilder().append("Credits to ").append(aAuthor) - .append(" for writing this Book. This was Book Nr. ").append(aID) - .append(" at its creation. Gotta get 'em all!").toString())); - tNBT.setTag("pages", tNBTList); - rStack.setTagCompound(tNBT); - GT_Log.out.println( - new StringBuilder().append("GT++_Mod: Added Book to Book++ List - Mapping: '").append(aMapping) - .append("' - Name: '").append(aTitle).append("' - Author: '").append(aAuthor).append("'")); - NBTUtils.createIntegerTagCompound(rStack, "stats", "mMeta", vMeta); - CORE.sBookList.put(aMapping, rStack); - Logger.INFO("Creating book: " + aTitle + " by " + aAuthor + ". Using Meta " + vMeta + "."); - return GT_Utility.copy(new Object[] { rStack }); - } - public static long getMillisSince(long aStartTime, long aCurrentTime) { - return (aCurrentTime - aStartTime); - } + String credits = String.format( + "Credits to %s for writing this Book. This was Book Nr. %d at its creation. Gotta get 'em all!", + author, + ID); + NBTList.appendTag(new NBTTagString(credits)); + NBT.setTag("pages", NBTList); - public static byte getTier(long l) { - byte i = -1; - do { - ++i; - if (i >= GT_Values.V.length) { - return i; - } - } while (l > GT_Values.V[i]); - i = (byte) MathUtils.getValueWithinRange(i, 0, 15); - return i; + stack.setTagCompound(NBT); + + String logMessage = String.format( + "GT++_Mod: Added Book to Book++ List - Mapping: '%s' - Name: '%s' - Author: '%s'", + mapping, + title, + author); + GT_Log.out.println(logMessage); + + NBTUtils.createIntegerTagCompound(stack, "stats", "mMeta", ID); + CORE.sBookList.put(mapping, stack); + + Logger.INFO(String.format("Creating book: %s by %s. Using Meta %d.", title, author, ID)); + + return GT_Utility.copy(stack); } + } diff --git a/src/main/java/gtPlusPlus/core/util/data/AES.java b/src/main/java/gtPlusPlus/core/util/data/AES.java index 8f9580c760..aeafea7606 100644 --- a/src/main/java/gtPlusPlus/core/util/data/AES.java +++ b/src/main/java/gtPlusPlus/core/util/data/AES.java @@ -13,7 +13,7 @@ import javax.crypto.spec.SecretKeySpec; public class AES { - private final String secret;; + private final String secret; private final SecretKeySpec secretKey; @@ -33,12 +33,12 @@ public class AES { secretKey = generateKey(key); } - private static final String getHashedString(String aString) { + private static String getHashedString(String aString) { return toHexString(getSHA(aString)); } - private static final byte[] getSHA(String input) { + private static byte[] getSHA(String input) { MessageDigest md; @@ -56,7 +56,7 @@ public class AES { return new byte[] {}; } - private static final String toHexString(byte[] hash) { + private static String toHexString(byte[] hash) { BigInteger number = new BigInteger(1, hash); @@ -70,7 +70,7 @@ public class AES { return hexString.toString(); } - private final byte[] getBytes(String aKey) { + private byte[] getBytes(String aKey) { byte[] aKeyData; @@ -98,42 +98,21 @@ public class AES { return aKeyData; - } catch (NoSuchAlgorithmException e) { + } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { e.printStackTrace(); - } catch (UnsupportedEncodingException e) { - - e.printStackTrace(); } } return new byte[] {}; } - private final SecretKeySpec generateKey(byte[] aKey) { + private SecretKeySpec generateKey(byte[] aKey) { return new SecretKeySpec(aKey, "AES"); } - public String encode(String strToEncrypt) { - - try { - - Cipher cipher = Cipher.getInstance("AES/ECB/PKCS5Padding"); - - cipher.init(Cipher.ENCRYPT_MODE, secretKey); - - return Base64.getEncoder().encodeToString(cipher.doFinal(strToEncrypt.getBytes("UTF-8"))); - - } catch (Exception e) { - - System.out.println("Error while encrypting: " + e.toString()); - } - - return null; - } - public String decode(String strToDecrypt) { try { @@ -144,7 +123,7 @@ public class AES { return new String(cipher.doFinal(Base64.getDecoder().decode(strToDecrypt))); - } catch (Exception e) { + } catch (Exception ignored) { } diff --git a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java index 57c75640a6..d5ab990917 100644 --- a/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/ArrayUtils.java @@ -3,15 +3,10 @@ package gtPlusPlus.core.util.data; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; import net.minecraft.item.ItemStack; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; - public class ArrayUtils { public static <V> V[] insertElementAtIndex(V[] aArray, int aIndex, V aObjectToInsert) { @@ -27,60 +22,17 @@ public class ArrayUtils { } public static Object[] removeNulls(final Object[] v) { - List<Object> list = new ArrayList<Object>(Arrays.asList(v)); + List<Object> list = new ArrayList<>(Arrays.asList(v)); list.removeAll(Collections.singleton((Object) null)); return list.toArray(new Object[list.size()]); } public static ItemStack[] removeNulls(final ItemStack[] v) { - List<ItemStack> list = new ArrayList<ItemStack>(Arrays.asList(v)); + List<ItemStack> list = new ArrayList<>(Arrays.asList(v)); list.removeAll(Collections.singleton((ItemStack) null)); return list.toArray(new ItemStack[list.size()]); } - @SuppressWarnings("unchecked") - public static <T> Set<T> combineSetData(Set<T> S, Set<T> J) { - Set<T> mData = new HashSet<T>(); - T[] array1 = (T[]) S.toArray(); - Collections.addAll(mData, array1); - T[] array2 = (T[]) J.toArray(); - Collections.addAll(mData, array2); - return mData; - } - - public static <A> AutoMap<A> mergeTwoMaps(AutoMap<A> a, AutoMap<A> b) { - AutoMap<A> c = new AutoMap<A>(); - for (A g : a.values()) { - c.put(g); - } - for (A g : b.values()) { - c.put(g); - } - return c; - } - - public static <T> T[][] rotateArrayClockwise(T[][] mat) { - Logger.INFO("Rotating Array 90' Clockwise"); - try { - final int M = mat.length; - final int N = mat[0].length; - Logger.INFO("Dimension X: " + M); - Logger.INFO("Dimension Z: " + N); - @SuppressWarnings("unchecked") - T[][] ret = (T[][]) new Object[N][M]; - for (int r = 0; r < M; r++) { - for (int c = 0; c < N; c++) { - ret[c][M - 1 - r] = mat[r][c]; - } - } - Logger.INFO("Returning Rotated Array"); - return ret; - } catch (Throwable t) { - t.printStackTrace(); - return null; - } - } - public static String toString(Object[] aArray, String string) { return org.apache.commons.lang3.ArrayUtils.toString(aArray, string); } @@ -89,12 +41,4 @@ public class ArrayUtils { return org.apache.commons.lang3.ArrayUtils.toString(aArray); } - public static <T> Object[] getArrayFromArrayList(ArrayList<T> aArrayList) { - Object[] aGenericArray = new Object[aArrayList.size()]; - int aIndex = 0; - for (T object : aArrayList) { - aGenericArray[aIndex++] = object; - } - return aGenericArray; - } } diff --git a/src/main/java/gtPlusPlus/core/util/data/FileUtils.java b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java index cec639a76c..b2e5d04375 100644 --- a/src/main/java/gtPlusPlus/core/util/data/FileUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/FileUtils.java @@ -74,7 +74,7 @@ public class FileUtils { } } - public static boolean appendListToFile(File file, List<String> content) { + public static void appendListToFile(File file, List<String> content) { try { long oldSize; long newSize; @@ -88,11 +88,9 @@ public class FileUtils { e.printStackTrace(); } newSize = Files.size(p); - return newSize > oldSize; } } - } catch (IOException e) {} - return false; + } catch (IOException ignored) {} } /** @@ -108,7 +106,7 @@ public class FileUtils { try { return org.apache.commons.io.FileUtils.readLines(file, utf8); } catch (IOException e) { - return new ArrayList<String>(); + return new ArrayList<>(); } } } diff --git a/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java index 00170d2f16..237b97e5b0 100644 --- a/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/LocaleUtils.java @@ -20,7 +20,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class LocaleUtils { - public static boolean generateFakeLocaleFile() { + public static void generateFakeLocaleFile() { for (ModContainer modcontainer : Loader.instance().getModList()) { if (modcontainer.getModId().toLowerCase().equals(GTPlusPlus.ID)) { String S = "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"; @@ -28,18 +28,16 @@ public class LocaleUtils { dumpItemsAndBlocksForModContainer(modcontainer); } } - return true; } - public static boolean dumpItemsAndBlocksForModContainer(ModContainer mod) { + public static void dumpItemsAndBlocksForModContainer(ModContainer mod) { writeToFile("Dumping Items from " + mod.getModId() + "."); for (Object C : GameData.getItemRegistry()) { try { if (C != null) { - if (C instanceof Item) { - Item R = (Item) C; + if (C instanceof Item R) { ItemStack IS = ItemUtils.getSimpleStack(R); String modid = ItemUtils.getModId(IS); if (modid.equals(GTPlusPlus.ID) || modid.equals(GTPlusPlusEverglades.ID)) { @@ -49,7 +47,7 @@ public class LocaleUtils { } } - } catch (Throwable T) {} + } catch (Throwable ignored) {} } writeToFile("Dumping Blocks from " + mod.getModId() + "."); for (Object B : GameData.getBlockRegistry()) { @@ -57,8 +55,7 @@ public class LocaleUtils { try { if (B != null) { - if (B instanceof Block) { - Block R = (Block) B; + if (B instanceof Block R) { ItemStack IS = ItemUtils.getSimpleStack(R); String modid = ItemUtils.getModId(IS); if (modid.equals(GTPlusPlus.ID) || modid.equals(GTPlusPlusEverglades.ID)) { @@ -68,10 +65,9 @@ public class LocaleUtils { } } - } catch (Throwable T) {} + } catch (Throwable ignored) {} } - return true; } public static void writeToFile(String S) { @@ -82,6 +78,6 @@ public class LocaleUtils { writer.write(S); writer.newLine(); writer.close(); - } catch (IOException e) {} + } catch (IOException ignored) {} } } diff --git a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java index 76cd82b096..91bbdc2eda 100644 --- a/src/main/java/gtPlusPlus/core/util/data/StringUtils.java +++ b/src/main/java/gtPlusPlus/core/util/data/StringUtils.java @@ -80,41 +80,6 @@ public class StringUtils { return false; } - // Can call this Enum for formatting. - public static enum TextUtils { - - blue('1'), - green('2'), - teal('3'), - maroon('4'), - purple('5'), - orange('6'), - lightGray('7'), - darkGray('8'), - lightBlue('9'), - black('0'), - lime('a'), - aqua('b'), - red('c'), - pink('d'), - yellow('e'), - white('f'); - - private char colourValue; - - private TextUtils(final char value) { - this.colourValue = value; - } - - public String colour() { - return getFormatter() + this.colourValue; - } - - private String getFormatter() { - return "\u00A7"; // Returns §. - } - } - public static String firstLetterCaps(String data) { String firstLetter = data.substring(0, 1).toUpperCase(); String restLetters = data.substring(1).toLowerCase(); @@ -125,13 +90,13 @@ public class StringUtils { if (parameterTypes == null || parameterTypes.length == 0) { return "empty/null"; } else { - String aData = ""; + StringBuilder aData = new StringBuilder(); for (V y : parameterTypes) { if (y != null) { - aData += ", " + y.toString(); + aData.append(", ").append(y); } } - return aData; + return aData.toString(); } } @@ -142,7 +107,7 @@ public class StringUtils { * @return - Is this a special character? */ public static boolean isSpecialCharacter(char aChar) { - if (aChar == '"' || aChar == '.' + return aChar == '"' || aChar == '.' || aChar == '$' || aChar == '|' || aChar == '(' @@ -155,14 +120,11 @@ public class StringUtils { || aChar == '?' || aChar == '*' || aChar == '+' - || aChar == '\\') { - return true; - } - return false; + || aChar == '\\'; } public static boolean isEscaped(String aString) { - return aString.substring(0, 1).equals("\\"); + return aString.charAt(0) == '\\'; } public static String splitAndUppercase(String aInput, String aDelim) { @@ -185,7 +147,7 @@ public class StringUtils { if (aSplit == null || aSplit.length == 0) { return aInput; } else { - AutoMap<String> aTemp = new AutoMap<String>(); + AutoMap<String> aTemp = new AutoMap<>(); for (String s : aSplit) { Logger.INFO("Found: " + s); s = s.replace(".", ""); @@ -195,35 +157,16 @@ public class StringUtils { aTemp.put(s); } Logger.INFO("Rebuilding"); - String aReturn = ""; + StringBuilder aReturn = new StringBuilder(); for (String s : aTemp) { - aReturn += s; + aReturn.append(s); Logger.INFO("Step: " + aReturn); } - return aReturn; - } - } - - public static int characterCount(String aString, char aChar) { - return characterCount(aString, "" + aChar); - } - - public static int characterCount(String aString, String aChar) { - int aLength = aString.length(); - int aFound = 0; - if (aLength == 0 || !aString.contains(aChar)) { - return 0; - } else { - for (int index = 0; index < aLength; index++) { - if (aString.substring(index, index + 1).equals(aChar)) { - aFound++; - } - } - return aFound; + return aReturn.toString(); } } public static long uppercaseCount(String aString) { - return aString.chars().filter((c) -> Character.isUpperCase(c)).count(); + return aString.chars().filter(Character::isUpperCase).count(); } } diff --git a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java index 5a04502ae8..f73a1e3384 100644 --- a/src/main/java/gtPlusPlus/core/util/math/MathUtils.java +++ b/src/main/java/gtPlusPlus/core/util/math/MathUtils.java @@ -7,7 +7,6 @@ import java.util.Random; import gregtech.api.enums.GT_Values; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -37,10 +36,6 @@ public class MathUtils { return rand.nextInt((max - min) + 1) + min; } - public static double getChanceOfXOverYRuns(final double x, final double y) { - return (1 - Math.pow((1 - x), y)); - } - /** * Returns a psuedo-random number between min and max, inclusive. The difference between min and max can be at most * Long.MAX_VALUE - 1. @@ -146,7 +141,6 @@ public class MathUtils { /** * Returns a double. The returned number is d rounded to the nearest d.01. Supports Doubles. * - * @param current Current value. * @return double Rounded value. */ public static double decimalRounding(final double d) { @@ -157,7 +151,6 @@ public class MathUtils { /** * Returns a double. The returned number is d rounded to the nearest d.5. Supports Doubles. * - * @param current Current value. * @return double Rounded value. */ public static double decimalRoundingToWholes(final double d) { @@ -168,31 +161,16 @@ public class MathUtils { /** * Returns a integer. The returned number is d rounded to the nearest flat integer. Supports Doubles as input. * - * @param current Current value. * @return integer Rounded value. */ public static int roundToClosestInt(final double d) { return (int) (Math.round(d * 2) / 2.0); } - public static int roundToClosestMultiple(final double number, final int multiple) { - int result = multiple; - if ((number % multiple) == 0) { - return (int) number; - } - // If not already multiple of given number - if ((number % multiple) != 0) { - final int division = (int) ((number / multiple) + 1); - result = division * multiple; - } - return result; - } - // Smooth Rounding Function /** * Returns a long. The returned number is d rounded to the nearest flat long. Supports Doubles as input. * - * @param current Current value. * @return long Rounded value. */ public static long roundToClosestLong(final double d) { @@ -200,20 +178,6 @@ public class MathUtils { } /** - * Returns a boolean. The returned boolean is wether or not X evenly fits in to Y. Supports ints. - * - * @param x Value A. - * @param y Value B. Must be greater than min. - * @return boolean Whether or not it divides evenly. - */ - public static boolean divideXintoY(final int x, final int y) { - if ((x % y) == 0) { - return true; - } - return false; - } - - /** * Returns a boolean. The returned boolean is based on the odd/eveness of the input. Supports ints. * * @param x Value A. @@ -238,29 +202,6 @@ public class MathUtils { } /** - * Returns a hexInteger. The returned number is the hex value of the input. Supports ints. - * - * @param input Current value. - * @return hexInteger. - */ - public static int getHexNumberFromInt(final int input) { - final String result = Integer.toHexString(input); - final int resultINT = Integer.getInteger(result); - return resultINT; - } - - /** - * Returns a hexInteger. The returned value is between min and max. Supports ints. - * - * @param min Minimum value. - * @param max Maximium value. Must be greater than min. - * @return hexInteger between min and max, inclusive. - */ - public static int generateRandomHexValue(final int min, final int max) { - return getHexNumberFromInt(randInt(min, max)); - } - - /** * Returns a random hex value. The returned value is between 000000-ffffff. * * @return hexInteger between min and max, inclusive. @@ -278,8 +219,6 @@ public class MathUtils { Logger.WARNING("Operating with " + temp); temp = Utils.appenedHexNotationToString(String.valueOf(temp)); - // Logger.WARNING("Made "+temp+" - Hopefully it's not a mess."); - // Logger.WARNING("It will decode into "+Integer.decode(temp)+"."); return Integer.decode(temp); } @@ -316,21 +255,11 @@ public class MathUtils { return result; } - public static final int getRgbAsHex(final short[] RGBA) { + public static int getRgbAsHex(final short[] RGBA) { final int returnValue = Utils.rgbtoHexValue(RGBA[0], RGBA[1], RGBA[2]); return (returnValue == 0) ? 0 : returnValue; } - public static final int returnLargestNumber(final int a, final int b) { - if (a > b) { - return a; - } else if (a == b) { - return a; - } else { - return b; - } - } - public static byte safeByte(long number) { return number > Byte.MAX_VALUE ? Byte.MAX_VALUE : (byte) number; } @@ -389,15 +318,6 @@ public class MathUtils { return getIntAverage(aNewSet); } - public static float getFloatAverage(AutoMap<Float> aDataSet) { - float[] aNewSet = new float[aDataSet.size()]; - for (int u = 0; u < aDataSet.size(); u++) { - float b = getSafeFloat(aDataSet.get(u)); - aNewSet[u] = b; - } - return getFloatAverage(aNewSet); - } - public static long getLongAverage(AutoMap<Long> aDataSet) { long[] aNewSet = new long[aDataSet.size()]; for (int u = 0; u < aDataSet.size(); u++) { @@ -407,17 +327,8 @@ public class MathUtils { return getLongAverage(aNewSet); } - public static double getDoubleAverage(AutoMap<Double> aDataSet) { - double[] aNewSet = new double[aDataSet.size()]; - for (int u = 0; u < aDataSet.size(); u++) { - double b = getSafeDouble(aDataSet.get(u)); - aNewSet[u] = b; - } - return getDoubleAverage(aNewSet); - } - public static byte getByteAverage(byte[] aDataSet) { - if (aDataSet.length <= 0) { + if (aDataSet.length == 0) { return 0; } int divisor = aDataSet.length; @@ -430,7 +341,7 @@ public class MathUtils { } public static short getShortAverage(short[] aDataSet) { - if (aDataSet.length <= 0) { + if (aDataSet.length == 0) { return 0; } int divisor = aDataSet.length; @@ -446,7 +357,7 @@ public class MathUtils { } public static int getIntAverage(int[] aDataSet) { - if (aDataSet.length <= 0) { + if (aDataSet.length == 0) { return 0; } int divisor = aDataSet.length; @@ -458,21 +369,8 @@ public class MathUtils { return result; } - public static float getFloatAverage(float[] aDataSet) { - if (aDataSet.length <= 0) { - return 0; - } - int divisor = aDataSet.length; - float total = 0; - for (float i : aDataSet) { - total += i; - } - float result = (total / divisor); - return result; - } - public static long getLongAverage(long[] aDataSet) { - if (aDataSet.length <= 0) { + if (aDataSet.length == 0) { return 0; } int divisor = aDataSet.length; @@ -480,21 +378,7 @@ public class MathUtils { for (long i : aDataSet) { total += i; } - long result = (total / divisor); - return result; - } - - public static double getDoubleAverage(double[] aDataSet) { - if (aDataSet.length <= 0) { - return 0; - } - int divisor = aDataSet.length; - double total = 0; - for (double i : aDataSet) { - total += i; - } - double result = (total / divisor); - return result; + return (total / divisor); } public static int howManyPlaces(int aValueForGen) { @@ -529,37 +413,37 @@ public class MathUtils { if ((aNumberType.getClass() == byte.class) || (aNumberType instanceof Byte)) { if (a1 >= Byte.MIN_VALUE && a1 <= Byte.MAX_VALUE) { - String s = "" + a1; + String s = String.valueOf(a1); Byte s1 = Byte.valueOf(s); return (V) s1; } } else if ((aNumberType.getClass() == short.class) || (aNumberType instanceof Short)) { if (a1 >= Short.MIN_VALUE && a1 <= Short.MAX_VALUE) { - String s = "" + a1; + String s = String.valueOf(a1); Short s1 = Short.valueOf(s); return (V) s1; } } else if ((aNumberType.getClass() == int.class) || (aNumberType instanceof Integer)) { if (a1 >= Integer.MIN_VALUE && a1 <= Integer.MAX_VALUE) { - String s = "" + a1; + String s = String.valueOf(a1); Integer s1 = Integer.valueOf(s); return (V) s1; } } else if ((aNumberType.getClass() == long.class) || (aNumberType instanceof Long)) { if (a1 >= Long.MIN_VALUE && a1 <= Long.MAX_VALUE) { - String s = "" + a1; + String s = String.valueOf(a1); Long s1 = Long.valueOf(s); return (V) s1; } } else if ((aNumberType.getClass() == float.class) || (aNumberType instanceof Float)) { if (a2 >= Float.MIN_VALUE && a2 <= Float.MAX_VALUE) { - String s = "" + a1; + String s = String.valueOf(a1); Float s1 = Float.valueOf(s); return (V) s1; } } else if ((aNumberType.getClass() == double.class) || (aNumberType instanceof Double)) { if (a2 >= Double.MIN_VALUE && a2 <= Double.MAX_VALUE) { - String s = "" + a1; + String s = String.valueOf(a1); Double s1 = Double.valueOf(s); return (V) s1; } @@ -571,37 +455,22 @@ public class MathUtils { public static byte getSafeByte(Byte b) { Byte a = safeCast(b); - return a.byteValue(); + return a; } public static short getSafeShort(Short b) { Short a = safeCast(b); - return a.shortValue(); + return a; } public static int getSafeInt(Integer b) { Integer a = safeCast(b); - return a.intValue(); + return a; } public static long getSafeLong(Long b) { Long a = safeCast(b); - return a.longValue(); - } - - public static float getSafeFloat(Float b) { - Float a = safeCast(b); - return a.floatValue(); - } - - public static double getSafeDouble(Double b) { - Double a = safeCast(b); - return a.doubleValue(); - } - - public static long safeCast_IntToLong(int o) { - long i = o; - return i; + return a; } public static int safeCast_LongToInt(long o) { @@ -613,34 +482,6 @@ public class MathUtils { } } - public static short safeCast_IntToShort(int o) { - if (o > Short.MAX_VALUE) { - return Short.MAX_VALUE; - } else { - short i = (short) o; - return i; - } - } - - public static int safeCast_ShortToInt(short o) { - int i = (int) o; - return i; - } - - public static byte safeCast_ShortToByte(short o) { - if (o > Byte.MAX_VALUE) { - return Byte.MAX_VALUE; - } else { - byte i = (byte) o; - return i; - } - } - - public static short safeCast_ByteToshort(byte o) { - short i = (short) o; - return i; - } - /** * Balances a number within a range. * @@ -654,54 +495,6 @@ public class MathUtils { } /** - * Balances a number within a range. - * - * @param aInput - The number to balance - * @param aMin - The minimum bounds - * @param aMax - The maximum bounds - * @return - A Number which will be between the bounds, or a boundary value. - */ - public static Number balance(Number aInput, Number aMin, Number aMax) { - return max(min(aInput, aMax), aMin); - } - - /** - * Balances a number within a range. - * - * @param aInput - The number to balance - * @param aMin - The minimum bounds - * @param aMax - The maximum bounds - * @return - An Integer which will be between the bounds, or a boundary value. - */ - public static int balanceInt(Number aInput, Number aMin, Number aMax) { - return MathUtils - .safeCast_LongToInt((long) balance(max(min(aInput, aMax), aMin), Integer.MIN_VALUE, Integer.MAX_VALUE)); - } - - /** - * Balances a number within a range. - * - * @param aInput - The number to balance - * @param aMin - The minimum bounds - * @param aMax - The maximum bounds - * @return - A Long which will be between the bounds, or a boundary value. - */ - public static long balanceLong(Number aInput, Number aMin, Number aMax) { - return (long) balance(max(min(aInput, aMax), aMin), Long.MIN_VALUE, Long.MAX_VALUE); - } - - public static int getValueWithinRange(int i, int aMin, int aMax) { - int aAmount = Math.max(Math.min(i, aMax), aMin); - return aAmount; - } - - public static Pair<Integer, Integer> splitLongIntoIntegers(long aLong) { - int aIntMaxInLong = (int) Math.min(Integer.MAX_VALUE, Math.floor(aLong / Integer.MAX_VALUE)); - int aRemainder = (int) (aLong - (aIntMaxInLong * Integer.MAX_VALUE)); - return new Pair<Integer, Integer>(aIntMaxInLong, aRemainder); - } - - /** * Returns the smaller of two {@code Number}s. That is, the result the argument closer to the value of * {@link Long#MIN_VALUE}. If the arguments have the same value, the result is that same value. * @@ -725,17 +518,6 @@ public class MathUtils { return (a.longValue() >= b.longValue()) ? a : b; } - public static long combineTwoIntegersToLong(int a, int b) { - long val = (((long) a) << 32) | (b & 0xffffffffL); - return val; - } - - public static int[] splitLongIntoTwoIntegers(long aNum) { - int a = (int) (aNum >> 32); - int b = (int) aNum; - return new int[] { a, b }; - } - public static String formatNumbers(long aNumber) { return sNumberFormat.format(aNumber); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java index e3219369e8..9ee99fb132 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EnchantingUtils.java @@ -7,68 +7,6 @@ import gtPlusPlus.api.objects.Logger; public class EnchantingUtils { - public static final int XP_PER_BOTTLE = 8; - public static final int RATIO = 20; - public static final int LIQUID_PER_XP_BOTTLE = 160; - public static final double RATIO_MOB_ESSENCE_TO_LIQUID_XP = 13.32; - - public static int liquidToXpRatio(final int liquid) { - return liquid / RATIO; - } - - public static int xpToLiquidRatio(final int xp) { - return xp * RATIO; - } - - public static FluidStack getEssenceFromLiquidXp(final int xpAmount) { - if (xpAmount <= 0) { - return null; - } - return getMobEssence((int) (xpAmount * RATIO_MOB_ESSENCE_TO_LIQUID_XP)); - } - - public static FluidStack getLiquidXpFromEssence(final int essenceAmount) { - if (essenceAmount <= 0) { - return null; - } - return getLiquidXP((int) (essenceAmount / RATIO_MOB_ESSENCE_TO_LIQUID_XP)); - } - - public static int getLiquidForLevel(final int level) { - final int xp = getExperienceForLevel(level); - return xpToLiquidRatio(xp); - } - - public static int getLevelForLiquid(final int liquid) { - final int xp = liquidToXpRatio(liquid); - return getLevelForExperience(xp); - } - - public static int getExperienceForLevel(final int level) { - if (level == 0) { - return 0; - } - if ((level > 0) && (level < 16)) { - return level * 17; - } - if ((level > 15) && (level < 31)) { - return (int) (((1.5 * Math.pow(level, 2.0)) - (29.5 * level)) + 360.0); - } - return (int) (((3.5 * Math.pow(level, 2.0)) - (151.5 * level)) + 2220.0); - } - - public static int getXpToNextLevel(final int level) { - final int levelXP = getLevelForExperience(level); - final int nextXP = getExperienceForLevel(level + 1); - return nextXP - levelXP; - } - - public static int getLevelForExperience(final int experience) { - int i; - for (i = 0; getExperienceForLevel(i) <= experience; ++i) {} - return i - 1; - } - // Xp Fluids public static FluidStack getMobEssence(final int amount) { Logger.WARNING("Trying to get a fluid stack of Mob Essence."); @@ -87,4 +25,5 @@ public class EnchantingUtils { return null; } } + } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java index e2922ee642..d236b8fbd7 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/EntityUtils.java @@ -1,17 +1,8 @@ package gtPlusPlus.core.util.minecraft; -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; - -import net.minecraft.block.Block; import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.EnumCreatureAttribute; -import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; @@ -19,15 +10,10 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase; -import cpw.mods.fml.common.registry.EntityRegistry; import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.AABB; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.handler.events.EntityDeathHandler; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import ic2.core.IC2Potion; import ic2.core.item.armor.ItemArmorHazmat; @@ -39,31 +25,10 @@ public class EntityUtils { } } - public static boolean isEntityOnFire(final Entity aEntity) { - Field aIsOnFire = ReflectionUtils.getField(Entity.class, "fire"); - if (aIsOnFire != null) { - int aFireTime = (int) ReflectionUtils.getFieldValue(aIsOnFire, aEntity); - return aFireTime > 0; - } - return false; - } - public static boolean isEntityImmuneToFire(Entity aEntity) { return aEntity.isImmuneToFire(); } - public static int getFacingDirection(final Entity entity) { - final int d = MathHelper.floor_double((entity.rotationYaw * 4.0F) / 360 + 0.50) & 3; - return d; - } - - public static Block findBlockUnderEntity(final Entity parEntity) { - final int blockX = MathHelper.floor_double(parEntity.posX); - final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY) - 1; - final int blockZ = MathHelper.floor_double(parEntity.posZ); - return parEntity.worldObj.getBlock(blockX, blockY, blockZ); - } - public static BlockPos findBlockPosUnderEntity(final Entity parEntity) { final int blockX = MathHelper.floor_double(parEntity.posX); final int blockY = MathHelper.floor_double(parEntity.boundingBox.minY) - 1; @@ -78,46 +43,29 @@ public class EntityUtils { return new BlockPos(blockX, blockY, blockZ, parEntity.worldObj); } - // TODO - public static void registerEntityToBiomeSpawns(final Class<EntityLiving> classy, final EnumCreatureType EntityType, - final BiomeGenBase baseBiomeGen) { - EntityRegistry.addSpawn(classy, 6, 1, 5, EntityType, baseBiomeGen); // change the values to vary the spawn - // rarity, biome, etc. - } - - public static boolean applyRadiationDamageToEntity(final int stackSize, final int radiationLevel, final World world, - final Entity entityHolding) { + public static void applyRadiationDamageToEntity(final int stackSize, final int radiationLevel, final World world, + final Entity entityHolding) { if (!world.isRemote) { - if ((radiationLevel > 0) && (entityHolding instanceof EntityLivingBase)) { - final EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; + if ((radiationLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { if (!ItemArmorHazmat.hasCompleteHazmat(entityLiving) && !GT_Utility.isWearingFullRadioHazmat(entityLiving)) { - int duration; if (entityLiving.getActivePotionEffect(IC2Potion.radiation) != null) { - // Utils.LOG_INFO("t"); - duration = (radiationLevel * 5) - + entityLiving.getActivePotionEffect(IC2Potion.radiation).getDuration(); - } else { - // Utils.LOG_INFO("f"); - duration = radiationLevel * 30; + entityLiving.getActivePotionEffect(IC2Potion.radiation); } - // IC2Potion.radiation.applyTo(entityLiving, duration, damage * 15); applyRadioactivity(entityLiving, radiationLevel, stackSize); } } } - return true; } - return false; } - public static boolean applyRadioactivity(EntityLivingBase aEntity, int aLevel, int aAmountOfItems) { + public static void applyRadioactivity(EntityLivingBase aEntity, int aLevel, int aAmountOfItems) { if (aLevel > 0 && aEntity != null && aEntity.getCreatureAttribute() != EnumCreatureAttribute.UNDEAD && aEntity.getCreatureAttribute() != EnumCreatureAttribute.ARTHROPOD && !ItemArmorHazmat.hasCompleteHazmat(aEntity)) { - PotionEffect tEffect = null; + PotionEffect tEffect; aEntity.addPotionEffect( new PotionEffect( Potion.moveSlowdown.id, @@ -166,113 +114,25 @@ public class EntityUtils { ((tEffect = aEntity.getActivePotionEffect(Potion.potionTypes[24])) == null ? 0 : tEffect.getDuration())), Math.max(0, (5 * aLevel) / 7))); - return true; } - return false; } - public static boolean applyHeatDamageToEntity(final int heatLevel, final World world, final Entity entityHolding) { + public static void applyHeatDamageToEntity(final int heatLevel, final World world, final Entity entityHolding) { if (!world.isRemote) { - if ((heatLevel > 0) && (entityHolding instanceof EntityLivingBase)) { - final EntityLivingBase entityLiving = (EntityLivingBase) entityHolding; + if ((heatLevel > 0) && (entityHolding instanceof final EntityLivingBase entityLiving)) { if (!((EntityPlayer) entityHolding).capabilities.isCreativeMode) { if (!GT_Utility.isWearingFullHeatHazmat(entityLiving)) { - return GT_Utility.applyHeatDamage(entityLiving, heatLevel); + GT_Utility.applyHeatDamage(entityLiving, heatLevel); } } } } - return false; - } - - /** - * Static Version of the method used in {@code doFireDamage(entity, int)} to save memory. - */ - private static volatile Method dealFireDamage = null; - - /** - * Reflective Call to do Fire Damage to an entity (Does not set entity on fire though) - */ - public static synchronized boolean doFireDamage(Entity entity, int amount) { - if (dealFireDamage == null) { - dealFireDamage = ReflectionUtils.getMethod(Entity.class, "dealFireDamage", int.class); - } else { - try { - dealFireDamage.invoke(entity, amount); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - } - return false; } public static void doDamage(Entity entity, DamageSource dmg, int i) { entity.attackEntityFrom(dmg, i); } - public static boolean isTileEntityRegistered(Class aTileClass, String aTileName) { - Field aRegistry = ReflectionUtils - .getField(ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "nameToClassMap"); - Field aRegistry2 = ReflectionUtils - .getField(ReflectionUtils.getClass("net.minecraft.tileentity.TileEntity"), "classToNameMap"); - try { - Object o = aRegistry.get(null); - if (o != null) { - Map nameToClassMap = (Map) o; - if (!nameToClassMap.containsKey(aTileName)) { - o = aRegistry2.get(null); - if (o != null) { - Map classToNameMap = (Map) o; - if (!classToNameMap.containsKey(aTileClass)) { - return false; - } else { - return true; - } - } - } else { - return true; - } - } - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - } - return false; - } - - public static double getDistance(Entity p1, Entity p2) { - return Math - .sqrt(Math.pow(p1.posX - p2.posX, 2) + Math.pow(p1.posY - p2.posY, 2) + Math.pow(p1.posZ - p2.posZ, 2)); - } - - public static AutoMap<Entity> getEntitiesWithinBoundingBoxExcluding(Entity aExclusion, AABB aBoundingBox) { - if (aExclusion == null) { - return new AutoMap<Entity>(); - } else { - List<Entity> aEntities = aBoundingBox.world() - .getEntitiesWithinAABBExcludingEntity(aExclusion, aBoundingBox.get()); - return new AutoMap<Entity>(aEntities); - } - } - - public static AutoMap<Entity> getEntitiesWithinBoundingBox(Class aEntityType, AABB aBoundingBox) { - if (aEntityType == null) { - return new AutoMap<Entity>(); - } else { - List<Entity> aEntities = aBoundingBox.world().getEntitiesWithinAABB(aEntityType, aBoundingBox.get()); - return new AutoMap<Entity>(aEntities); - } - } - - /** - * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. Simplified function with - * static Max drop size of 1. - * - * @param aMobClass - The Base Class you want to drop this item. - * @param aStack - The ItemStack, stack size is not respected. - * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok) - */ - public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aChance) { - registerDropsForMob(aMobClass, aStack, 1, aChance); - } - /** * Provides the ability to provide custom drops upon the death of EntityLivingBase objects. * @@ -281,7 +141,7 @@ public class EntityUtils { * @param aMaxAmount - The maximum size of the ItemStack which drops. * @param aChance - Chance out of 10000, where 100 is 1%. (1 = 0.01% - this is ok) */ - public static void registerDropsForMob(Class aMobClass, ItemStack aStack, int aMaxAmount, int aChance) { + public static void registerDropsForMob(Class<?> aMobClass, ItemStack aStack, int aMaxAmount, int aChance) { EntityDeathHandler.registerDropsForMob(aMobClass, aStack, aMaxAmount, aChance); } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java index 1b06ea58e0..170a741eed 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/FluidUtils.java @@ -3,7 +3,6 @@ package gtPlusPlus.core.util.minecraft; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import java.util.HashMap; @@ -32,7 +31,7 @@ import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; public class FluidUtils { - private static HashMap<String, Fluid> sFluidCache = new HashMap<String, Fluid>(); + private static HashMap<String, Fluid> sFluidCache = new HashMap<>(); public static FluidStack getWater(final int amount) { return FluidUtils.getFluidStack("water", amount); @@ -54,38 +53,14 @@ public class FluidUtils { return FluidUtils.getFluidStack("ic2pahoehoelava", amount); } - public static FluidStack getMilk(final int amount) { - return FluidUtils.getFluidStack("milk", amount); - } - - public static FluidStack getColdCoolant(final int amount) { - return FluidUtils.getFluidStack("ic2coolant", amount); - } - - public static FluidStack getHotCoolant(final int amount) { - return FluidUtils.getFluidStack("ic2hotcoolant", amount); - } - public static FluidStack getSteam(final int amount) { return FluidUtils.getFluidStack("steam", amount); } - public static FluidStack getIC2Steam(final int amount) { - return FluidUtils.getFluidStack("ic2steam", amount); - } - public static FluidStack getSuperHeatedSteam(final int amount) { return FluidUtils.getFluidStack("ic2superheatedsteam", amount); } - public static FluidStack getUUA(final int amount) { - return FluidUtils.getFluidStack("uuamplifier", amount); - } - - public static FluidStack getUUM(final int amount) { - return FluidUtils.getFluidStack("ic2uumatter", amount); - } - public static FluidStack getHydrofluoricAcid(int amount) { return FluidUtils.getFluidStack("hydrofluoricacid", amount); } @@ -142,26 +117,6 @@ public class FluidUtils { return new FluidStack(aFluid, aAmount); } - public static FluidStack[] getFluidStackArray(final String fluidName, final int amount) { - Logger.WARNING("Trying to get a fluid stack of " + fluidName); - try { - final FluidStack[] singleFluid = { getFluidStack(fluidName, amount) }; - return singleFluid; - } catch (final Throwable e) { - return null; - } - } - - public static FluidStack[] getFluidStackArray(final FluidStack fluidName, final int amount) { - Logger.WARNING("Trying to get a fluid stack of " + fluidName); - try { - final FluidStack[] singleFluid = { getFluidStack(fluidName, amount) }; - return singleFluid; - } catch (final Throwable e) { - return null; - } - } - public static Fluid addGtFluid(final String aName, final String aLocalized, final GT_Materials aMaterial, final int aState, final long aTemperatureK, final ItemStack aFullContainer, final ItemStack aEmptyContainer, final int aFluidAmount) { @@ -507,35 +462,7 @@ public class FluidUtils { return amount(aStacksize, container(aStack, aCheckIFluidContainerItems)); } - public static final Fluid generateFluid(final String unlocalizedName, final String localizedName, - final int MeltingPoint, final short[] RGBA, boolean aGenerateCell) { - FluidStack aFStack = (FluidUtils.getFluidStack("molten" + "." + unlocalizedName.toLowerCase(), 1)); - if (aFStack == null) { - Logger.WARNING("Generating our own fluid."); - final Fluid gtFluid = FluidUtils.addGTFluid( - unlocalizedName, - "Molten " + localizedName, - RGBA, - 4, - MeltingPoint, - null, - ItemUtils.getEmptyCell(), - 1000, - aGenerateCell); - - return gtFluid; - } else { - Logger.INFO("FLUID GENERATION FAILED FOR " + localizedName + ", ALREADY EXISTS"); - return aFStack.getFluid(); - } - } - - public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, - final int MeltingPoint, final short[] RGBA, final boolean aGenerateCell) { - return generateFluidNonMolten(unlocalizedName, localizedName, MeltingPoint, RGBA, null, null, 0, aGenerateCell); - } - - public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, + public static Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, final ItemStack dustStack, final ItemStack dustStack2) { return generateFluidNonMolten( unlocalizedName, @@ -548,7 +475,7 @@ public class FluidUtils { true); } - public static final Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, + public static Fluid generateFluidNonMolten(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, final ItemStack dustStack, final ItemStack dustStack2, final boolean aGenerateCell) { return generateFluidNonMolten( @@ -602,12 +529,12 @@ public class FluidUtils { } } - public static final Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, + public static Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA) { return generateFluidNoPrefix(unlocalizedName, localizedName, MeltingPoint, RGBA, true); } - public static final Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, + public static Fluid generateFluidNoPrefix(final String unlocalizedName, final String localizedName, final int MeltingPoint, final short[] RGBA, final boolean aGenerateCell) { Fluid gtFluid; if (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null) { @@ -628,8 +555,8 @@ public class FluidUtils { return gtFluid; } - public static final Fluid generateGas(final String unlocalizedName, final String localizedName, - final int MeltingPoint, final short[] RGBA, final boolean aGenerateCell) { + public static Fluid generateGas(final String unlocalizedName, final String localizedName, final int MeltingPoint, + final short[] RGBA, final boolean aGenerateCell) { Fluid gtFluid; if (FluidUtils.getFluidStack(unlocalizedName.toLowerCase(), 1) == null) { Logger.WARNING("Generating our own gas."); @@ -653,10 +580,6 @@ public class FluidUtils { return EnchantingUtils.getMobEssence(amount); } - public static FluidStack getLiquidXP(final int amount) { - return EnchantingUtils.getLiquidXP(amount); - } - public static boolean doesFluidExist(String aFluidName) { FluidStack aFStack1 = (FluidUtils.getFluidStack("molten" + "." + aFluidName.toLowerCase(), 1)); FluidStack aFStack2 = (FluidUtils.getFluidStack("fluid" + "." + aFluidName.toLowerCase(), 1)); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java index c4a0cf411a..2090f749b3 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/InventoryUtils.java @@ -10,11 +10,6 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.data.AutoMap; - public class InventoryUtils { private static final Random mRandom = new Random(); @@ -22,10 +17,9 @@ public class InventoryUtils { public static void dropInventoryItems(World world, int x, int y, int z, Block block) { TileEntity tileentity = world.getTileEntity(x, y, z); - if (tileentity != null && tileentity instanceof IInventory + if (tileentity != null && tileentity instanceof IInventory aTileInv && ((IInventory) tileentity).getSizeInventory() > 0) { - IInventory aTileInv = (IInventory) tileentity; int aMinSlot = 0; int aMaxSlot = aTileInv.getSizeInventory() - 1; @@ -69,36 +63,4 @@ public class InventoryUtils { } } - public static void sortInventoryItems(MetaTileEntity aTile) { - sortInventoryItems(aTile.getBaseMetaTileEntity()); - } - - public static void sortInventoryItems(IGregTechTileEntity aBaseMetaTileEntity) { - IInventory mInv = aBaseMetaTileEntity.getIInventory( - aBaseMetaTileEntity.getXCoord(), - aBaseMetaTileEntity.getYCoord(), - aBaseMetaTileEntity.getZCoord()); - AutoMap<ItemStack> aInvContents = new AutoMap<ItemStack>(); - int aSize = mInv.getSizeInventory(); - for (int slot = 0; slot < aSize; slot++) { - aInvContents.put(mInv.getStackInSlot(slot)); - } - ItemStack[] mInventory = aInvContents.toArray(); - for (int i = 0; i < mInventory.length; i++) { - for (int j = i + 1; j < mInventory.length; j++) { - if (mInventory[j] != null - && (mInventory[i] == null || GT_Utility.areStacksEqual(mInventory[i], mInventory[j]))) { - GT_Utility.moveStackFromSlotAToSlotB( - aBaseMetaTileEntity, - aBaseMetaTileEntity, - j, - i, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - } - } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java index 17a563df93..b07ca24990 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ItemUtils.java @@ -1,6 +1,9 @@ package gtPlusPlus.core.util.minecraft; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.GTPlusPlus; +import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Minecraft; import java.util.ArrayList; import java.util.HashMap; @@ -8,8 +11,6 @@ import java.util.List; import java.util.Map; import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.enchantment.EnchantmentData; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -34,11 +35,8 @@ import gregtech.common.items.GT_MetaGenerated_Tool_01; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.base.BasicSpawnEgg; import gtPlusPlus.core.item.base.dusts.BaseItemDustUnique; -import gtPlusPlus.core.item.base.plates.BaseItemPlate_OLD; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.lib.CORE; @@ -120,19 +118,16 @@ public class ItemUtils { try { Item em = null; final Item em1 = getItemFromFQRN(FQRN); - // Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null) { em = em1; } + if (em != null) { final ItemStack metaStack = new ItemStack(em, 1, meta); GT_OreDictUnificator.registerOre(oreDictName, metaStack); - /* - * ItemStack itemStackWithMeta = new ItemStack(em,1,meta); GT_OreDictUnificator.registerOre(oreDictName, - * new ItemStack(itemStackWithMeta.getItem())); - */ } } catch (final NullPointerException e) { Logger.ERROR(itemName + " not found. [NULL]"); @@ -160,7 +155,7 @@ public class ItemUtils { try { Item em = null; final Item em1 = getItemFromFQRN(FQRN); - // Utils.LOG_WARNING("Found: "+em1.getUnlocalizedName()+":"+meta); + if (em1 != null) { if (null == em) { em = em1; @@ -242,15 +237,6 @@ public class ItemUtils { return temp; } - public static ItemStack getCorrectStacktype(final Object item_Input, final int stackSize) { - if (item_Input instanceof String) { - return getItemStackOfAmountFromOreDictNoBroken((String) item_Input, stackSize); - } else if (item_Input instanceof ItemStack) { - return (ItemStack) item_Input; - } - return null; - } - public static Item getItemFromFQRN(final String fqrn) // fqrn = fully qualified resource name { final String[] fqrnSplit = fqrn.split(":"); @@ -282,14 +268,6 @@ public class ItemUtils { return null; } - public static void generateSpawnEgg(final String entityModID, final String parSpawnName, final int colourEgg, - final int colourOverlay) { - final Item itemSpawnEgg = new BasicSpawnEgg(entityModID, parSpawnName, colourEgg, colourOverlay) - .setUnlocalizedName("spawn_egg_" + parSpawnName.toLowerCase()) - .setTextureName(GTPlusPlus.ID + ":spawn_egg"); - GameRegistry.registerItem(itemSpawnEgg, "spawnEgg" + parSpawnName); - } - public static ItemStack[] validItemsForOreDict(final String oredictName) { final List<?> validNames = MaterialUtils.oreDictValuesForEntry(oredictName); final ItemStack[] inputs = new ItemStack[validNames.size()]; @@ -476,35 +454,6 @@ public class ItemUtils { return output; } - public static Item generateSpecialUsePlate(final String internalName, final String displayName, final short[] rgb, - final int radioactivity) { - return generateSpecialUsePlate( - internalName, - displayName, - Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), - radioactivity); - } - - public static Item generateSpecialUsePlate(final String internalName, final String displayName, - final String mFormula, final short[] rgb, final int radioactivity) { - return generateSpecialUsePlate( - internalName, - displayName, - mFormula, - Utils.rgbtoHexValue(rgb[0], rgb[1], rgb[2]), - radioactivity); - } - - public static Item generateSpecialUsePlate(final String internalName, final String displayName, final int rgb, - final int radioactivity) { - return new BaseItemPlate_OLD(internalName, displayName, rgb, radioactivity); - } - - public static Item generateSpecialUsePlate(final String internalName, final String displayName, - final String mFormula, final int rgb, final int radioactivity) { - return new BaseItemPlate_OLD(internalName, displayName, mFormula, rgb, radioactivity); - } - public static Item[] generateSpecialUseDusts(final Material material, final boolean onlyLargeDust) { return generateSpecialUseDusts(material, onlyLargeDust, false); } @@ -573,44 +522,6 @@ public class ItemUtils { return sRadiation; } - public static String getArrayStackNames(ArrayList<?> aStack) { - Object aType = aStack.get(0); - if (aType instanceof FluidStack) { - FluidStack[] aItems = new FluidStack[aStack.size()]; - for (int i = 0; i < aItems.length; i++) { - aItems[i] = (FluidStack) aStack.get(i); - } - return getArrayStackNames(aItems); - } - if (aType instanceof ItemStack) { - ItemStack[] aItems = new ItemStack[aStack.size()]; - for (int i = 0; i < aItems.length; i++) { - aItems[i] = (ItemStack) aStack.get(i); - } - return getArrayStackNames(aItems); - } - return ""; - } - - public static String getArrayStackNames(final AutoMap<?> aStack) { - Object aType = aStack.get(0); - if (aType instanceof FluidStack) { - FluidStack[] aItems = new FluidStack[aStack.size()]; - for (int i = 0; i < aItems.length; i++) { - aItems[i] = (FluidStack) aStack.get(i); - } - return getArrayStackNames(aItems); - } - if (aType instanceof ItemStack) { - ItemStack[] aItems = new ItemStack[aStack.size()]; - for (int i = 0; i < aItems.length; i++) { - aItems[i] = (ItemStack) aStack.get(i); - } - return getArrayStackNames(aItems); - } - return ""; - } - public static String getArrayStackNames(final FluidStack[] aStack) { String itemNames = "Fluid Array: "; for (final FluidStack alph : aStack) { @@ -641,60 +552,11 @@ public class ItemUtils { return itemNames; } - public static String[] getArrayStackNamesAsArray(final ItemStack[] aStack) { - final String[] itemNames = aStack == null ? new String[] {} : new String[aStack.length]; - if (aStack != null) { - Logger.INFO("" + aStack.length); - } - - if (aStack == null || aStack.length < 1) { - return itemNames; - } - - int arpos = 0; - for (final ItemStack alph : aStack) { - if (alph == null) { - continue; - } - try { - itemNames[arpos] = alph.getDisplayName(); - arpos++; - } catch (Throwable t) { - t.printStackTrace(); - } - } - return itemNames; - } - - public static String getFluidArrayStackNames(final FluidStack[] aStack) { - String itemNames = "Fluid Array: "; - for (final FluidStack alph : aStack) { - final String temp = itemNames; - itemNames = temp + ", " + alph.getFluid().getName() + " x" + alph.amount; - } - return itemNames; - } - public static ItemStack getGregtechCircuit(final int Meta) { return ItemUtils.getItemStackWithMeta(true, "gregtech:gt.integrated_circuit", "Gregtech Circuit", Meta, 0); } - public static ItemStack[] getBlockDrops(final ArrayList<ItemStack> blockDrops) { - if (blockDrops == null) { - return null; - } - if (blockDrops.isEmpty()) { - return null; - } - final ItemStack[] outputs = new ItemStack[blockDrops.size()]; - short forCounter = 0; - for (final ItemStack I : blockDrops) { - outputs[forCounter++] = I; - } - return outputs; - } - - private static Map<Item, String> mModidCache = new HashMap<Item, String>(); + private static final Map<Item, String> mModidCache = new HashMap<>(); private static String getModId(final Item item) { if (mModidCache.containsKey(item)) { @@ -734,10 +596,10 @@ public class ItemUtils { final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); if (!oreDictList.isEmpty()) { ItemStack returnvalue; - for (int xrc = 0; xrc < oreDictList.size(); xrc++) { - final String modid = getModId(oreDictList.get(xrc).getItem()); + for (ItemStack itemStack : oreDictList) { + final String modid = getModId(itemStack.getItem()); if (modid != null && (modid.equals(GregTech.ID) || modid.equals(GTPlusPlus.ID))) { - returnvalue = oreDictList.get(xrc).copy(); + returnvalue = itemStack.copy(); returnvalue.stackSize = amount; return returnvalue; } @@ -751,10 +613,10 @@ public class ItemUtils { final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); if (!oreDictList.isEmpty()) { ItemStack returnvalue; - for (int xrc = 0; xrc < oreDictList.size(); xrc++) { - final String modid = getModId(oreDictList.get(xrc).getItem()); + for (ItemStack itemStack : oreDictList) { + final String modid = getModId(itemStack.getItem()); if (modid != null && !modid.equals("tconstruct")) { - returnvalue = oreDictList.get(xrc).copy(); + returnvalue = itemStack.copy(); returnvalue.stackSize = amount; return returnvalue; } @@ -797,9 +659,7 @@ public class ItemUtils { public static ItemStack getErrorStack(int mAmount, String aName) { ItemStack g = getSimpleStack(ModItems.AAA_Broken, 1); if (aName != null) { - // NBTUtils.setString(g, "Lore", EnumChatFormatting.RED+aName); NBTUtils.setBookTitle(g, EnumChatFormatting.RED + aName); - // NBTUtils.setBookTitle(g, EnumChatFormatting.YELLOW+"Maybe Alkalus should know about this"); } return g; } @@ -820,13 +680,7 @@ public class ItemUtils { } public static boolean registerFuel(ItemStack aBurnable, int burn) { - return CORE.burnables.add(new Pair<Integer, ItemStack>(burn, aBurnable)); - } - - public static String getLocalizedNameOfBlock(BlockPos pos) { - Block block = pos.world.getBlock(pos.xPos, pos.yPos, pos.zPos); - int metaData = pos.world.getBlockMetadata(pos.xPos, pos.yPos, pos.zPos); - return LangUtils.getLocalizedNameOfBlock(block, metaData); + return CORE.burnables.add(new Pair<>(burn, aBurnable)); } public static boolean checkForInvalidItems(ItemStack mInput) { @@ -909,61 +763,9 @@ public class ItemUtils { } } - /* - * for (int o = 0; o < aInputInventory.getSizeInventory(); o++) { aTemp.setInventorySlotContents(o, g[o]); } - */ return aTemp; } - public static ItemStack[] organiseInventory(ItemStack[] aInputs) { - - // Update Slots - int aInvSize = aInputs.length; - ItemStack[] newArray = new ItemStack[aInvSize]; - - // Try merge stacks - for (int i = 0; i < aInvSize; i++) { - for (int i2 = 0; i2 < aInvSize; i2++) { - if (i != i2) { - ItemStack[] t1 = new ItemStack[] { aInputs[i], aInputs[i2] }; - if (t1[0] == null || t1[1] == null) { - continue; - } else if (!GT_Utility.areStacksEqual(t1[0], t1[1])) { - continue; - } - // Try Merge - else { - - if (GT_Utility.areStacksEqual(t1[0], t1[1])) { - while ((t1[0].stackSize < 64 && t1[1].stackSize > 0)) { - t1[0].stackSize++; - t1[1].stackSize--; - if (t1[1].stackSize <= 0) { - t1[1] = null; - break; - } - if (t1[0].stackSize == 64) { - break; - } - } - newArray[i] = t1[1]; - newArray[i2] = t1[0]; - } - } - } - } - } - - ItemStack[] newArray2 = new ItemStack[aInvSize]; - - // Move nulls to end - int count2 = 0; - for (int i = 0; i < aInvSize; i++) if (newArray[i] != null) newArray2[count2++] = newArray[i]; - while (count2 < aInvSize) newArray2[count2++] = null; - - return newArray2; - } - public static String getFluidName(FluidStack aFluid) { return aFluid != null ? aFluid.getFluid().getLocalizedName(aFluid) : "NULL"; } @@ -985,7 +787,7 @@ public class ItemUtils { } } } - } catch (Throwable t) { + } catch (Throwable ignored) { } if (aDisplay == null || aDisplay.length() <= 0) { @@ -1028,23 +830,6 @@ public class ItemUtils { return false; } - public static boolean isToolWrench(ItemStack aWrench) { - if (isItemGregtechTool(aWrench) && (aWrench.getItemDamage() == 16 || aWrench.getItemDamage() == 120 - || aWrench.getItemDamage() == 122 - || aWrench.getItemDamage() == 124 - || aWrench.getItemDamage() == 7734)) { - return true; - } - return false; - } - - public static boolean isToolMallet(ItemStack aMallet) { - if (isItemGregtechTool(aMallet) && (aMallet.getItemDamage() == 14)) { - return true; - } - return false; - } - public static boolean isToolScrewdriver(ItemStack aScrewdriver) { if (isItemGregtechTool(aScrewdriver) && (aScrewdriver.getItemDamage() == 22 || aScrewdriver.getItemDamage() == 150)) { @@ -1053,38 +838,10 @@ public class ItemUtils { return false; } - public static boolean isToolCrowbar(ItemStack aCrowbar) { - if (isItemGregtechTool(aCrowbar) && (aCrowbar.getItemDamage() == 20)) { - return true; - } - return false; - } - - public static boolean isToolWirecutters(ItemStack aWirecutters) { - if (isItemGregtechTool(aWirecutters) && (aWirecutters.getItemDamage() == 26)) { - return true; - } - return false; - } - - public static boolean isToolHammer(ItemStack aHammer) { - if (isItemGregtechTool(aHammer) && (aHammer.getItemDamage() == 12 || aHammer.getItemDamage() == 7734)) { - return true; - } - return false; - } - - public static boolean isToolSolderingIron(ItemStack aSoldering) { - if (isItemGregtechTool(aSoldering) && (aSoldering.getItemDamage() == 160)) { - return true; - } - return false; - } - public static ItemStack[] cleanItemStackArray(ItemStack[] input) { int aArraySize = input.length; ItemStack[] aOutput = new ItemStack[aArraySize]; - AutoMap<ItemStack> aCleanedItems = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aCleanedItems = new AutoMap<>(); for (ItemStack checkStack : input) { if (ItemUtils.checkForInvalidItems(checkStack)) { aCleanedItems.put(checkStack); @@ -1099,15 +856,6 @@ public class ItemUtils { return aOutput; } - public static ItemStack getEnchantedBook(Enchantment aEnch, int aLevel) { - return enchantItem(new ItemStack(Items.enchanted_book), aEnch, aLevel); - } - - public static ItemStack enchantItem(ItemStack aStack, Enchantment aEnch, int aLevel) { - Items.enchanted_book.addEnchantment(aStack, new EnchantmentData(aEnch, aLevel)); - return aStack; - } - public static boolean doesOreDictHaveEntryFor(String string) { return OreDictUtils.containsValidEntries(string); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java index eabaf46866..b72d3bddfe 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/LangUtils.java @@ -6,7 +6,6 @@ import java.util.Map; import java.util.Properties; import net.minecraft.block.Block; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; @@ -17,16 +16,12 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class LangUtils { - public static boolean rewriteEntryForLanguageRegistry(String aKey, String aNewValue) { - return rewriteEntryForLanguageRegistry("en_US", aKey, aNewValue); - } - @SuppressWarnings("unchecked") - public static boolean rewriteEntryForLanguageRegistry(String aLang, String aKey, String aNewValue) { + public static void rewriteEntryForLanguageRegistry(String aLang, String aKey, String aNewValue) { LanguageRegistry aInstance = LanguageRegistry.instance(); Field aModLanguageData = ReflectionUtils.getField(LanguageRegistry.class, "modLanguageData"); if (aModLanguageData != null) { - Map<String, Properties> aProps = new HashMap<String, Properties>(); + Map<String, Properties> aProps = new HashMap<>(); Object aInstanceProps; try { aInstanceProps = aModLanguageData.get(aInstance); @@ -45,17 +40,16 @@ public class LangUtils { ReflectionUtils.setField(aInstance, aModLanguageData, aProps); } } - } catch (IllegalArgumentException | IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException ignored) { } } - return false; } /** * Quick Block Name Lookup that is friendly to servers and locale. */ - private static final Map<String, String> mLocaleCache = new HashMap<String, String>(); + private static final Map<String, String> mLocaleCache = new HashMap<>(); public static String getLocalizedNameOfBlock(Block aBlock, int aMeta) { if (aBlock != null) { @@ -64,20 +58,10 @@ public class LangUtils { return "Bad Block Name"; } - public static String getLocalizedNameOfItem(Item aItem, int aMeta) { - if (aItem != null) { - return getLocalizedNameOfItemStack(ItemUtils.simpleMetaStack(aItem, aMeta, 1)); - } - return "Bad Item Name"; - } - public static String getLocalizedNameOfItemStack(ItemStack aStack) { String aUnlocalized; if (aStack != null) { aUnlocalized = ItemUtils.getUnlocalizedItemName(aStack) + "." + aStack.getItemDamage() + ".name"; - if (aUnlocalized == null || aUnlocalized.length() <= 0) { - return "Bad Locale Data"; - } String mCacheKey = aUnlocalized; if (mLocaleCache.containsKey(mCacheKey)) { // Recache the key if it's invalid. @@ -86,7 +70,7 @@ public class LangUtils { mLocaleCache.remove(mCacheKey); String mNew; try { - mNew = ("" + StatCollector + mNew = (StatCollector .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name")) .trim(); if (aStack.hasTagCompound()) { @@ -113,7 +97,7 @@ public class LangUtils { Logger.INFO("Cached New Value. TranslatedName: " + unlocalizedName); if (blockName.toLowerCase().contains(".name") || blockName.toLowerCase().contains("|")) { try { - blockName = ("" + StatCollector + blockName = (StatCollector .translateToLocal(aStack.getItem().getUnlocalizedNameInefficiently(aStack) + ".name")) .trim(); if (aStack.hasTagCompound()) { diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java index 36c630051b..11c883e67e 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MaterialUtils.java @@ -9,7 +9,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import gregtech.api.enums.Dyes; import gregtech.api.enums.Element; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; @@ -33,25 +32,16 @@ import gtPlusPlus.core.util.math.MathUtils; public class MaterialUtils { - public static short firstID = 791; - - @SuppressWarnings({ "rawtypes", "unused" }) - private static Class[][] commonTypes = { { Materials.class, int.class, TextureSet.class, float.class, int.class, - int.class, int.class, int.class, int.class, int.class, int.class, String.class, int.class, int.class, - int.class, int.class, boolean.class, boolean.class, int.class, int.class, int.class, Dyes.class, int.class, - List.class, List.class } }; - public static List<?> oreDictValuesForEntry(final String oredictName) { List<?> oredictItemNames; if (OreDictionary.doesOreNameExist(oredictName)) { - final List<ItemStack> oredictItems = OreDictionary.getOres(oredictName); - oredictItemNames = oredictItems; + oredictItemNames = OreDictionary.getOres(oredictName); return oredictItemNames; } return null; } - private static Map<String, Material> mGeneratedMaterialMap = new HashMap(); + private static final Map<String, Material> mGeneratedMaterialMap = new HashMap<>(); public static Material generateMaterialFromGtENUM(final Materials material) { return generateMaterialFromGtENUM(material, null, null); @@ -80,7 +70,7 @@ public class MaterialUtils { final long protons = material.getProtons(); final long neutrons = material.getNeutrons(); final boolean blastFurnace = material.mBlastFurnaceRequired; - Integer radioactivity = 0; + int radioactivity = 0; if (material.isRadioactive()) { ItemStack aDustStack = ItemUtils.getOrePrefixStack(OrePrefixes.dust, material, 1); radioactivity = aDustStack != null ? GT_Utility.getRadioactivityLevel(aDustStack) : 0; @@ -89,7 +79,7 @@ public class MaterialUtils { radioactivity = (int) Math.min(Math.max((aProtons / 30), 1), 9); } } - Logger.MATERIALS("[Debug] Calculated Radiation level to be " + radioactivity.intValue() + "."); + Logger.MATERIALS("[Debug] Calculated Radiation level to be " + radioactivity + "."); TextureSet iconSet = null; if (aCustomTextures == null) { if (material.isRadioactive()) { @@ -147,15 +137,13 @@ public class MaterialUtils { } if (name.toLowerCase().contains("infused")) { - final String tempname = name.substring(7, name.length()); + final String tempname = name.substring(7); name = "Infused " + tempname; } if (hasValidRGBA(rgba) || (element == Element.H) || ((material == Materials.InfusedAir) || (material == Materials.InfusedFire) || (material == Materials.InfusedEarth) || (material == Materials.InfusedWater))) { - // ModItems.itemBaseDecidust = UtilsItems.generateDecidust(material); - // ModItems.itemBaseCentidust = UtilsItems.generateCentidust(material); Material M = new Material( name, materialState, @@ -216,61 +204,31 @@ public class MaterialUtils { } public static int getTierOfMaterial(final double aMeltingPoint) { - return aMeltingPoint < 1000 ? 0 : (MathUtils.roundToClosestInt(aMeltingPoint / 1000f)); - - /* - * if ((aMeltingPoint >= 0) && (aMeltingPoint <= 1000)){ return 1; } else if((aMeltingPoint >= 1001) && - * (aMeltingPoint <= 2000)){ return 2; } else if((aMeltingPoint >= 2001) && (aMeltingPoint <= 3000)){ return 3; - * } else if((aMeltingPoint >= 3001) && (aMeltingPoint <= 4000)){ return 4; } else if((aMeltingPoint >= 4001) && - * (aMeltingPoint <= 5000)){ return 5; } else if((aMeltingPoint >= 5001) && (aMeltingPoint <= 6000)){ return 6; - * } else if((aMeltingPoint >= 6001) && (aMeltingPoint <= 7000)){ return 7; } else if((aMeltingPoint >= 7001) && - * (aMeltingPoint <= 8000)){ return 8; } else if((aMeltingPoint >= 8001) && (aMeltingPoint <= 9000)){ return 9; - * } else if((aMeltingPoint >= 9001) && (aMeltingPoint <= 9999)){ return 10; } else { return 0; } - */ } public static int getVoltageForTier(int aTier) { // aTier += 1; - Probably some logic to this, idk. - switch (aTier) { - case 0: - return 16; - case 1: - return 30; - case 2: - return 120; - case 3: - return 480; - case 4: - return 1920; - case 5: - return 7680; - case 6: - return 30720; - case 7: - return 122880; - case 8: - return 491520; - case 9: - return 1966080; - case 10: - return 7864320; - case 11: - return 31457280; - case 12: - return 125829120; - case 13: - return 503316480; - case 14: - return 2013265920; - default: - return Integer.MAX_VALUE; - } + return switch (aTier) { + case 0 -> 16; + case 1 -> 30; + case 2 -> 120; + case 3 -> 480; + case 4 -> 1920; + case 5 -> 7680; + case 6 -> 30720; + case 7 -> 122880; + case 8 -> 491520; + case 9 -> 1966080; + case 10 -> 7864320; + case 11 -> 31457280; + case 12 -> 125829120; + case 13 -> 503316480; + case 14 -> 2013265920; + default -> Integer.MAX_VALUE; + }; - /* - * else { int newTier = aTier - 1; return (int) ((4*(Math.pow(4, newTier)))*7.5); } - */ } private static Materials getMaterialByName(String materialName) { @@ -291,7 +249,7 @@ public class MaterialUtils { } public static TextureSet getMostCommonTextureSet(List<Material> list) { - TypeCounter<TextureSet> aCounter = new TypeCounter<TextureSet>(TextureSet.class); + TypeCounter<TextureSet> aCounter = new TypeCounter<>(TextureSet.class); for (Material m : list) { TextureSet t = m.getTextureSet(); if (t == null) { @@ -335,19 +293,10 @@ public class MaterialUtils { public static AutoMap<Material> getCompoundMaterialsRecursively(Material aMat) { return getCompoundMaterialsRecursively_Speiger(aMat); - /* - * AutoMap<Material> aDataSet = new AutoMap<Material>(); final int HARD_LIMIT = 1000; int mLoopCounter = 0; if - * (aMat.getComposites().size() > 0) { try { List<Material> xList = Lists.newLinkedList(); for (MaterialStack kj - * : aMat.getComposites()) { xList.add(kj.getStackMaterial()); } if (xList.isEmpty()) { aDataSet.put(aMat); - * return aDataSet; } ListIterator<Material> listIterator = xList.listIterator(); while(listIterator.hasNext()){ - * Material e = listIterator.next(); listIterator.remove(); if (mLoopCounter > HARD_LIMIT) { break; } if - * (e.getComposites().isEmpty()) { aDataSet.put(e); } else { for (MaterialStack x : e.getComposites()) { - * listIterator.add(x.getStackMaterial()); } } mLoopCounter++; }} catch (Throwable t) { aDataSet.put(aMat); - * t.printStackTrace(); } } if (aDataSet.isEmpty()) { aDataSet.put(aMat); return aDataSet; } return aDataSet; - */ } + } public static AutoMap<Material> getCompoundMaterialsRecursively_Speiger(Material toSearch) { - AutoMap<Material> resultList = new AutoMap<Material>(); + AutoMap<Material> resultList = new AutoMap<>(); if (toSearch.getComposites().isEmpty()) { resultList.put(toSearch); return resultList; @@ -356,7 +305,7 @@ public class MaterialUtils { // Could be a Deque but i dont use the interface // enough to use it as default. - LinkedList<Material> toCheck = new LinkedList<Material>(); + LinkedList<Material> toCheck = new LinkedList<>(); toCheck.add(toSearch); int processed = 0; @@ -388,32 +337,26 @@ public class MaterialUtils { } else { aGC = new BaseItemComponent(aMaterial, aType); } - if (aGC != null) { - String aFormattedLangName = aType.getName(); + String aFormattedLangName = aType.getName(); - if (!aFormattedLangName.startsWith(" ")) { - if (aFormattedLangName.contains("@")) { - String[] aSplit = aFormattedLangName.split("@"); - aFormattedLangName = aSplit[0] + " " + aMaterial.getLocalizedName() + " " + aSplit[1]; - } - } - - if (aFormattedLangName.equals(aType.getName())) { - aFormattedLangName = aMaterial.getLocalizedName() + aFormattedLangName; + if (!aFormattedLangName.startsWith(" ")) { + if (aFormattedLangName.contains("@")) { + String[] aSplit = aFormattedLangName.split("@"); + aFormattedLangName = aSplit[0] + " " + aMaterial.getLocalizedName() + " " + aSplit[1]; } + } - Logger.MATERIALS("[Lang] " + aGC.getUnlocalizedName() + ".name=" + aFormattedLangName); - aMaterial.registerComponentForMaterial(aType, ItemUtils.getSimpleStack(aGC)); + if (aFormattedLangName.equals(aType.getName())) { + aFormattedLangName = aMaterial.getLocalizedName() + aFormattedLangName; } - } - public static void generateSpecialDustAndAssignToAMaterial(Material aMaterial) { - generateSpecialDustAndAssignToAMaterial(aMaterial, true); + Logger.MATERIALS("[Lang] " + aGC.getUnlocalizedName() + ".name=" + aFormattedLangName); + aMaterial.registerComponentForMaterial(aType, ItemUtils.getSimpleStack(aGC)); } public static void generateSpecialDustAndAssignToAMaterial(Material aMaterial, boolean generateMixerRecipes) { - Item[] aDusts = ItemUtils.generateSpecialUseDusts(aMaterial, false, Utils.invertBoolean(generateMixerRecipes)); - if (aDusts != null && aDusts.length > 0) { + Item[] aDusts = ItemUtils.generateSpecialUseDusts(aMaterial, false, !generateMixerRecipes); + if (aDusts.length > 0) { aMaterial.registerComponentForMaterial(OrePrefixes.dust, ItemUtils.getSimpleStack(aDusts[0])); aMaterial.registerComponentForMaterial(OrePrefixes.dustSmall, ItemUtils.getSimpleStack(aDusts[1])); aMaterial.registerComponentForMaterial(OrePrefixes.dustTiny, ItemUtils.getSimpleStack(aDusts[2])); @@ -421,10 +364,7 @@ public class MaterialUtils { } public static boolean isNullGregtechMaterial(Materials aGregtechMaterial) { - if (aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL) - || aGregtechMaterial.mName.equals(Materials._NULL.mName)) { - return true; - } - return false; + return aGregtechMaterial == Materials._NULL || aGregtechMaterial.equals(Materials._NULL) + || aGregtechMaterial.mName.equals(Materials._NULL.mName); } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java index 22469c0387..1e8049a8af 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/MiningUtils.java @@ -13,48 +13,12 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class MiningUtils { - public static Boolean canPickaxeBlock(final Block currentBlock, final World currentWorld) { - String correctTool = ""; - if (!currentWorld.isRemote) { - try { - correctTool = currentBlock.getHarvestTool(0); - // Utils.LOG_WARNING(correctTool); - if (correctTool.equals("pickaxe")) { - return true; - } - } catch (final NullPointerException e) { - return false; - } - } - return false; - } - - private static void removeBlockAndDropAsItem(final World world, final int X, final int Y, final int Z) { - try { - final Block block = world.getBlock(X, Y, Z); - if (canPickaxeBlock(block, world)) { - if ((block != Blocks.bedrock) && (block.getBlockHardness(world, X, Y, Z) != -1) - && (block.getBlockHardness(world, X, Y, Z) <= 100) - && (block != Blocks.water) - && (block != Blocks.lava)) { - block.dropBlockAsItem(world, X, Y, Z, world.getBlockMetadata(X, Y, Z), 0); - world.setBlockToAir(X, Y, Z); - - } else { - Logger.WARNING("Incorrect Tool for mining this block."); - } - } - } catch (final NullPointerException e) { - - } - } - public static boolean getBlockType(final Block block, final World world, final int[] xyz, final int miningLevel) { final String LIQUID = "liquid"; final String BLOCK = "block"; final String ORE = "ore"; final String AIR = "air"; - String blockClass = ""; + String blockClass; if (world.isRemote) { return false; @@ -89,22 +53,22 @@ public class MiningUtils { blockClass = block.getClass().toString().toLowerCase(); Logger.WARNING(blockClass); if (blockClass.toLowerCase().contains(LIQUID)) { - Logger.WARNING(block.toString() + " is a Liquid."); + Logger.WARNING(block + " is a Liquid."); return false; } else if (blockClass.toLowerCase().contains(ORE)) { - Logger.WARNING(block.toString() + " is an Ore."); + Logger.WARNING(block + " is an Ore."); return true; } else if (block.getHarvestLevel(world.getBlockMetadata(xyz[0], xyz[1], xyz[2])) >= miningLevel) { - Logger.WARNING(block.toString() + " is minable."); + Logger.WARNING(block + " is minable."); return true; } else if (blockClass.toLowerCase().contains(AIR)) { - Logger.WARNING(block.toString() + " is Air."); + Logger.WARNING(block + " is Air."); return false; } else if (blockClass.toLowerCase().contains(BLOCK)) { - Logger.WARNING(block.toString() + " is a block of some kind."); + Logger.WARNING(block + " is a block of some kind."); return false; } else { - Logger.WARNING(block.toString() + " is mystery."); + Logger.WARNING(block + " is mystery."); return false; } } catch (final NullPointerException e) { @@ -116,25 +80,9 @@ public class MiningUtils { public static int mMarsID = -99; public static int mCometsID = -99; - public static AutoMap<GT_Worldgen_GT_Ore_Layer> getOresForDim(int dim) { - if (dim == -1) { - return Ores_Nether; - } else if (dim == 1) { - return Ores_End; - } else if (dim == mMoonID) { - return Ores_Moon; - } else if (dim == mMarsID) { - return Ores_Mars; - } else if (dim == mCometsID) { - return Ores_Comets; - } else { - return Ores_Overworld; - } - } - public static void iterateAllOreTypes() { - HashMap<String, Integer> M = new HashMap<String, Integer>(); - String aTextWorldGen = null; + HashMap<String, Integer> M = new HashMap<>(); + String aTextWorldGen; if (MiningUtils.findAndMapOreTypesFromGT()) { int mapKey = 0; for (AutoMap<GT_Worldgen_GT_Ore_Layer> g : MiningUtils.mOreMaps) { @@ -147,10 +95,8 @@ public class MiningUtils { aTextWorldGen = h.mWorldGenName; } - // if (M.containsKey(h.aTextWorldgen + h.mWorldGenName)) { M.put(aTextWorldGen + h.mWorldGenName, mapKey); Logger.INFO("Found Vein type: " + aTextWorldGen + h.mWorldGenName + " in map with key: " + mapKey); - // } } mapKey++; } @@ -158,13 +104,13 @@ public class MiningUtils { } public static AutoMap<GT_Worldgen_GT_Ore_Layer>[] mOreMaps = new AutoMap[7]; - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Overworld = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Nether = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_End = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Moon = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Mars = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Comets = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); - private static AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Misc = new AutoMap<GT_Worldgen_GT_Ore_Layer>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Overworld = new AutoMap<>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Nether = new AutoMap<>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_End = new AutoMap<>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Moon = new AutoMap<>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Mars = new AutoMap<>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Comets = new AutoMap<>(); + private static final AutoMap<GT_Worldgen_GT_Ore_Layer> Ores_Misc = new AutoMap<>(); public static boolean findAndMapOreTypesFromGT() { // Gets Moon ID @@ -177,7 +123,7 @@ public class MiningUtils { ReflectionUtils.getClass("micdoodle8.mods.galacticraft.core.util.ConfigManagerCore"), "idDimensionMoon").getInt(null); } - } catch (IllegalArgumentException | IllegalAccessException e) {} + } catch (IllegalArgumentException | IllegalAccessException ignored) {} // Gets Mars ID try { @@ -187,7 +133,7 @@ public class MiningUtils { ReflectionUtils.getClass("micdoodle8.mods.galacticraft.planets.mars.ConfigManagerMars"), "dimensionIDMars").getInt(null); } - } catch (IllegalArgumentException | IllegalAccessException e) {} + } catch (IllegalArgumentException | IllegalAccessException ignored) {} // Get Comets ID try { @@ -198,7 +144,7 @@ public class MiningUtils { .getClass("micdoodle8.mods.galacticraft.planets.asteroids.ConfigManagerAsteroids"), "dimensionIDAsteroids").getInt(null); } - } catch (IllegalArgumentException | IllegalAccessException e) {} + } catch (IllegalArgumentException | IllegalAccessException ignored) {} // Clear Cache Ores_Overworld.clear(); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java index a806a9a80c..fd87a05953 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ModularArmourUtils.java @@ -1,51 +1,10 @@ package gtPlusPlus.core.util.minecraft; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - import baubles.api.BaubleType; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; public class ModularArmourUtils { - public static ItemStack addComponent(ItemStack tArmour, ItemStack[] tComponents) { - if (tArmour != null) { - ItemStack rArmour = NBTUtils.writeItemsToGtCraftingComponents(tArmour, tComponents, true); - if (rArmour != null) {} - } - return null; - } - - public static enum Modifiers { - - BOOST_HP("skill.hpboost"), - BOOST_DEF("skill.defenceboost"), - BOOST_SPEED("skill.speedboost"), - BOOST_MINING("skill.miningboost"), - BOOST_DAMAGE("skill.damageboost"), - BOOST_HOLY("skill.holyboost"); - - private String MODIFIER_NAME; - - private Modifiers(final String mModifier) { - this.MODIFIER_NAME = mModifier; - } - - public String getModifier() { - return this.MODIFIER_NAME; - } - - public boolean isValidLevel(int i) { - if (i >= 0 && i <= 100) { - return true; - } - return false; - } - } - - public static enum BT { + public enum BT { TYPE_AMULET(BaubleType.AMULET, 0), TYPE_RING(BaubleType.RING, 1), @@ -53,12 +12,10 @@ public class ModularArmourUtils { private final BaubleType mType; private final int mID; - private final String mBaubleType; - private BT(final BaubleType tType, int tID) { + BT(final BaubleType tType, int tID) { this.mType = tType; this.mID = tID; - this.mBaubleType = tType.name().toLowerCase(); } public BaubleType getType() { @@ -69,99 +26,10 @@ public class ModularArmourUtils { return this; } - public BaubleType getBaubleByID(int tID) { - if (tID == 0) { - return BaubleType.AMULET; - } else if (tID == 1) { - return BaubleType.RING; - } else if (tID == 2) { - return BaubleType.BELT; - } else { - return BaubleType.RING; - } - } - public int getID() { return this.mID; } - public String getTypeAsString() { - return this.mBaubleType; - } - } - - public static void setModifierLevel(ItemStack aStack, Pair<Modifiers, Integer> mPair) { - setModifierLevel(aStack, mPair.getKey(), mPair.getValue().intValue()); - } - - public static void setModifierLevel(ItemStack aStack, Modifiers aMod, Integer aInt) { - setModifierLevel(aStack, aMod, aInt.intValue()); } - public static void setModifierLevel(ItemStack aStack, Modifiers aMod, int aInt) { - - int mCurrentLevel = getModifierLevel(aStack, aMod); - int mNewTotalLevel = mCurrentLevel + aInt; - - NBTTagCompound tNBT = NBTUtils.getNBT(aStack); - if (aMod.isValidLevel(mNewTotalLevel)) { - tNBT.setInteger(aMod.getModifier(), mNewTotalLevel); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); - } else { - if (getModifierLevel(aStack, aMod) > 100) { - setModifierLevel(aStack, aMod, 100); - } - } - } - - public static int getModifierLevel(ItemStack aStack, Pair<Modifiers, Integer> newPair) { - return getModifierLevel(aStack, newPair.getKey()); - } - - public static int getModifierLevel(ItemStack aStack, Modifiers aMod) { - NBTTagCompound tNBT = NBTUtils.getNBT(aStack); - return tNBT.getInteger(aMod.getModifier()); - } - - public static void setBaubleType(ItemStack aStack, BT aMod) { - Logger.INFO("Changing bauble type."); - NBTTagCompound tNBT = NBTUtils.getNBT(aStack); - if (aMod != null) { - tNBT.setInteger("mBaubleType", aMod.getID()); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); - } - } - - public static int getBaubleTypeID(ItemStack aStack) { - NBTTagCompound tNBT = NBTUtils.getNBT(aStack); - return tNBT.getInteger("mBaubleType"); - } - - public static BaubleType getBaubleType(ItemStack aStack) { - NBTTagCompound tNBT = NBTUtils.getNBT(aStack); - return getBaubleByID(tNBT.getInteger("mBaubleType")); - } - - public static BaubleType getBaubleByID(int tID) { - if (tID == 0) { - return BaubleType.AMULET; - } else if (tID == 1) { - return BaubleType.RING; - } else if (tID == 2) { - return BaubleType.BELT; - } else { - return BaubleType.RING; - } - } - - public static ItemStack setDefaultStats(ItemStack aStack) { - ItemStack tempStack = aStack; - setModifierLevel(tempStack, Modifiers.BOOST_DAMAGE, 0); - setModifierLevel(tempStack, Modifiers.BOOST_DEF, 0); - setModifierLevel(tempStack, Modifiers.BOOST_HOLY, 0); - setModifierLevel(tempStack, Modifiers.BOOST_HP, 0); - setModifierLevel(tempStack, Modifiers.BOOST_MINING, 0); - setModifierLevel(tempStack, Modifiers.BOOST_SPEED, 0); - return tempStack; - } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java index 9bedcf1539..706d1a4685 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/NBTUtils.java @@ -2,10 +2,6 @@ package gtPlusPlus.core.util.minecraft; import static gtPlusPlus.core.item.ModItems.ZZZ_Empty; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; @@ -13,8 +9,6 @@ import net.minecraft.nbt.NBTTagList; import gregtech.api.items.GT_MetaGenerated_Tool; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.reflect.ReflectionUtils; public class NBTUtils { @@ -29,11 +23,6 @@ public class NBTUtils { GT_Utility.ItemNBT.setNBT(aStack, tNBT); } - public static String getBookTitle(ItemStack aStack) { - NBTTagCompound tNBT = getNBT(aStack); - return tNBT.getString("title"); - } - public static ItemStack[] readItemsFromNBT(ItemStack itemstack) { NBTTagCompound tNBT = getNBT(itemstack); final NBTTagList list = tNBT.getTagList("Items", 10); @@ -52,24 +41,6 @@ public class NBTUtils { return inventory; } - public static ItemStack[] readItemsFromNBT(ItemStack itemstack, String customkey) { - NBTTagCompound tNBT = getNBT(itemstack); - final NBTTagList list = tNBT.getTagList(customkey, 10); - ItemStack inventory[] = new ItemStack[list.tagCount()]; - for (int i = 0; i < list.tagCount(); i++) { - final NBTTagCompound data = list.getCompoundTagAt(i); - final int slot = data.getInteger("Slot"); - if ((slot >= 0) && (slot < list.tagCount())) { - if (ItemStack.loadItemStackFromNBT(data) == ItemUtils.getSimpleStack(ZZZ_Empty)) { - inventory[slot] = null; - } else { - inventory[slot] = ItemStack.loadItemStackFromNBT(data); - } - } - } - return inventory; - } - public static ItemStack writeItemsToNBT(ItemStack itemstack, ItemStack[] stored) { NBTTagCompound tNBT = getNBT(itemstack); final NBTTagList list = new NBTTagList(); @@ -120,9 +91,9 @@ public class NBTUtils { } if (copyTags) { - for (int i = 0; i < stored.length; i++) { - if (stored[i] != null && stored[i].hasTagCompound()) { - rStack.setTagCompound((NBTTagCompound) stored[i].getTagCompound().copy()); + for (ItemStack itemStack : stored) { + if (itemStack != null && itemStack.hasTagCompound()) { + rStack.setTagCompound((NBTTagCompound) itemStack.getTagCompound().copy()); break; } } @@ -183,17 +154,6 @@ public class NBTUtils { return tNBT.getLong(aTag); } - public static void setFloat(ItemStack aStack, String aTag, float aInt) { - NBTTagCompound tNBT = getNBT(aStack); - tNBT.setFloat(aTag, aInt); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); - } - - public static float getFloat(ItemStack aStack, String aTag) { - NBTTagCompound tNBT = getNBT(aStack); - return tNBT.getFloat(aTag); - } - public static void setString(ItemStack aStack, String aTag, String aString) { NBTTagCompound tNBT = getNBT(aStack); tNBT.setString(aTag, aString); @@ -205,51 +165,6 @@ public class NBTUtils { return tNBT.getString(aTag); } - public static boolean doesStringExist(ItemStack aStack, String aTag) { - NBTTagCompound tNBT = getNBT(aStack); - return tNBT.hasKey(aTag); - } - - public static boolean tryIterateNBTData(ItemStack aStack) { - try { - NBTTagCompound aNBT = NBTUtils.getNBT(aStack); - if (aNBT != null) { - if (!aNBT.hasNoTags()) { - Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); - if (mInternalMap != null) { - for (Map.Entry<?, ?> e : mInternalMap.entrySet()) { - Logger.INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue()); - } - return true; - } else { - Logger.INFO("Data map reflected from NBTTagCompound was not valid."); - return false; - } - } - } - } catch (Throwable t) {} - return false; - } - - // Botania soulbind handling - public static boolean setBotanicaSoulboundOwner(ItemStack aStack, String aName) { - final String TAG_SOULBIND = "soulbind"; - NBTTagCompound tNBT = getNBT(aStack); - tNBT.setString(TAG_SOULBIND, aName); - GT_Utility.ItemNBT.setNBT(aStack, tNBT); - if (NBTUtils.doesStringExist(aStack, TAG_SOULBIND)) { - return true; - } else { - return false; - } - } - - public static String getBotanicaSoulboundOwner(ItemStack aStack) { - final String TAG_SOULBIND = "soulbind"; - NBTTagCompound tNBT = getNBT(aStack); - return tNBT.getString(TAG_SOULBIND); - } - public static boolean hasKey(ItemStack stack, String key) { final NBTTagCompound itemData = getNBT(stack); if (itemData.hasKey(key)) { @@ -267,125 +182,6 @@ public class NBTUtils { return true; } - public static boolean createLongTagCompound(ItemStack rStack, String tagName, String keyName, long keyValue) { - final NBTTagCompound tagMain = getNBT(rStack); - final NBTTagCompound tagNBT = new NBTTagCompound(); - tagNBT.setLong(keyName, keyValue); - tagMain.setTag(tagName, tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - public static boolean createStringTagCompound(ItemStack rStack, String tagName, String keyName, String keyValue) { - final NBTTagCompound tagMain = getNBT(rStack); - final NBTTagCompound tagNBT = new NBTTagCompound(); - tagNBT.setString(keyName, keyValue); - tagMain.setTag(tagName, tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - public static boolean createFloatTagCompound(ItemStack rStack, String tagName, String keyName, float keyValue) { - final NBTTagCompound tagMain = getNBT(rStack); - final NBTTagCompound tagNBT = new NBTTagCompound(); - tagNBT.setFloat(keyName, keyValue); - tagMain.setTag(tagName, tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - public static boolean createDoubleTagCompound(ItemStack rStack, String tagName, String keyName, double keyValue) { - final NBTTagCompound tagMain = getNBT(rStack); - final NBTTagCompound tagNBT = new NBTTagCompound(); - tagNBT.setDouble(keyName, keyValue); - tagMain.setTag(tagName, tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - public static boolean createBooleanTagCompound(ItemStack rStack, String tagName, String keyName, boolean keyValue) { - final NBTTagCompound tagMain = getNBT(rStack); - final NBTTagCompound tagNBT = new NBTTagCompound(); - tagNBT.setBoolean(keyName, keyValue); - tagMain.setTag(tagName, tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - public static boolean createTagCompound(ItemStack rStack, String tagName, NBTTagCompound keyValue) { - final NBTTagCompound tagMain = getNBT(rStack); - NBTTagCompound tagNBT = keyValue; - tagMain.setTag(tagName, tagNBT); - rStack.setTagCompound(tagMain); - return true; - } - - public static int getIntegerTagCompound(ItemStack aStack, String tagName, String keyName) { - NBTTagCompound aNBT = getNBT(aStack); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT.getInteger(keyName); - } - } - return 0; - } - - public static long getLongTagCompound(ItemStack aStack, String tagName, String keyName) { - NBTTagCompound aNBT = getNBT(aStack); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT.getLong(keyName); - } - } - return 0L; - } - - public static String getStringTagCompound(ItemStack aStack, String tagName, String keyName) { - NBTTagCompound aNBT = getNBT(aStack); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT.getString(keyName); - } - } - return null; - } - - public static float getFloatTagCompound(ItemStack aStack, String tagName, String keyName) { - NBTTagCompound aNBT = getNBT(aStack); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT.getFloat(keyName); - } - } - return 0; - } - - public static double getDoubleTagCompound(ItemStack aStack, String tagName, String keyName) { - NBTTagCompound aNBT = getNBT(aStack); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT.getDouble(keyName); - } - } - return 0; - } - - public static boolean getBooleanTagCompound(ItemStack aStack, String tagName, String keyName) { - NBTTagCompound aNBT = getNBT(aStack); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tagName); - if (aNBT != null) { - return aNBT.getBoolean(keyName); - } - } - return false; - } - public static NBTTagCompound getTagCompound(ItemStack aStack, String tagName) { NBTTagCompound aNBT = getNBT(aStack); if (aNBT != null && hasKey(aStack, tagName)) { @@ -397,192 +193,6 @@ public class NBTUtils { return null; } - public static boolean hasKeyInTagCompound(ItemStack stack, String tag, String key) { - NBTTagCompound aNBT = stack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag(tag); - if (aNBT.hasKey(key)) { - return true; - } - } - return false; - } - - public static Map getTagMap(NBTTagCompound aNBT) { - Map tagMap = new HashMap(); - if (!aNBT.hasNoTags()) { - Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); - if (mInternalMap != null && !mInternalMap.isEmpty()) { - tagMap.putAll(mInternalMap); - } - } - return tagMap; - } - - public static boolean isTagString(NBTTagCompound aNBT, String aTagName) { - Map<?, ?> aTagMap = getTagMap(aNBT); - if (aTagMap != null && !aTagMap.isEmpty()) { - for (Map.Entry<?, ?> e : aTagMap.entrySet()) { - if (e.getKey().equals(aTagName)) { - Object aValue = e.getValue(); - if (aValue instanceof String) { - return true; - } - } - } - } - return false; - } - - public static boolean isTagInteger(NBTTagCompound aNBT, String aTagName) { - Map<?, ?> aTagMap = getTagMap(aNBT); - if (aTagMap != null && !aTagMap.isEmpty()) { - for (Map.Entry<?, ?> e : aTagMap.entrySet()) { - if (e.getKey().equals(aTagName)) { - Object aValue = e.getValue(); - if (int.class.isInstance(aValue) || aValue instanceof Integer) { - return true; - } - } - } - } - return false; - } - - public static boolean isTagLong(NBTTagCompound aNBT, String aTagName) { - Map<?, ?> aTagMap = getTagMap(aNBT); - if (aTagMap != null && !aTagMap.isEmpty()) { - for (Map.Entry<?, ?> e : aTagMap.entrySet()) { - if (e.getKey().equals(aTagName)) { - Object aValue = e.getValue(); - if (long.class.isInstance(aValue) || aValue instanceof Long) { - return true; - } - } - } - } - return false; - } - - public static boolean isTagFloat(NBTTagCompound aNBT, String aTagName) { - Map<?, ?> aTagMap = getTagMap(aNBT); - if (aTagMap != null && !aTagMap.isEmpty()) { - for (Map.Entry<?, ?> e : aTagMap.entrySet()) { - if (e.getKey().equals(aTagName)) { - Object aValue = e.getValue(); - if (float.class.isInstance(aValue) || aValue instanceof Float) { - return true; - } - } - } - } - return false; - } - - public static boolean isTagDouble(NBTTagCompound aNBT, String aTagName) { - Map<?, ?> aTagMap = getTagMap(aNBT); - if (aTagMap != null && !aTagMap.isEmpty()) { - for (Map.Entry<?, ?> e : aTagMap.entrySet()) { - if (e.getKey().equals(aTagName)) { - Object aValue = e.getValue(); - if (double.class.isInstance(aValue) || aValue instanceof Double) { - return true; - } - } - } - } - return false; - } - - public static boolean isTagBoolean(NBTTagCompound aNBT, String aTagName) { - Map<?, ?> aTagMap = getTagMap(aNBT); - if (aTagMap != null && !aTagMap.isEmpty()) { - for (Map.Entry<?, ?> e : aTagMap.entrySet()) { - if (e.getKey().equals(aTagName)) { - Object aValue = e.getValue(); - if (boolean.class.isInstance(aValue) || aValue instanceof Boolean) { - return true; - } - } - } - } - return false; - } - - public static boolean tryCloneTagCompoundDataIntoSubTag(ItemStack aStack, NBTTagCompound aTagCompound) { - try { - NBTTagCompound aNBT = aTagCompound; - if (aNBT != null) { - if (!aNBT.hasNoTags()) { - Map<?, ?> mInternalMap = ReflectionUtils.getField(aNBT, "tagMap"); - if (mInternalMap != null) { - for (Map.Entry<?, ?> e : mInternalMap.entrySet()) { - Logger.INFO("Key: " + e.getKey().toString() + " | Value: " + e.getValue().toString()); - if (e.getValue().getClass() == String.class) { - createStringTagCompound( - aStack, - "mEntityTag", - (String) e.getKey(), - (String) e.getValue()); - } else if (e.getValue().getClass() == Boolean.class - || e.getValue().getClass() == boolean.class) { - createBooleanTagCompound( - aStack, - "mEntityTag", - (String) e.getKey(), - (Boolean) e.getValue()); - } else - if (e.getValue().getClass() == Integer.class || e.getValue().getClass() == int.class) { - createIntegerTagCompound( - aStack, - "mEntityTag", - (String) e.getKey(), - (Integer) e.getValue()); - } else if (e.getValue().getClass() == Double.class - || e.getValue().getClass() == double.class) { - createDoubleTagCompound( - aStack, - "mEntityTag", - (String) e.getKey(), - (Double) e.getValue()); - } else - if (e.getValue().getClass() == Long.class - || e.getValue().getClass() == long.class) { - createLongTagCompound( - aStack, - "mEntityTag", - (String) e.getKey(), - (Long) e.getValue()); - } else - if (e.getValue().getClass() == Float.class - || e.getValue().getClass() == float.class) { - createFloatTagCompound( - aStack, - "mEntityTag", - (String) e.getKey(), - (Float) e.getValue()); - } else { - - } - } - return true; - } - } - } - return false; - } catch (Throwable t) { - return false; - } - } - - public static NBTTagCompound getEntityCustomData(Entity aEntity) { - return ReflectionUtils.getField(aEntity, "customEntityData"); - } - - public static boolean setEntityCustomData(Entity aEntity, NBTTagCompound aTag) { - return ReflectionUtils.setField(aEntity, "customEntityData", aTag); - } - public static boolean hasTagCompound(ItemStack aStack) { return aStack.hasTagCompound(); } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java index 2be3f781a3..10ebc11e1b 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/PlayerUtils.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.util.minecraft; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.UUID; @@ -26,7 +25,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class PlayerUtils { - public static final Map<String, EntityPlayer> mCachedFakePlayers = new WeakHashMap<String, EntityPlayer>(); + public static final Map<String, EntityPlayer> mCachedFakePlayers = new WeakHashMap<>(); private static final Class mThaumcraftFakePlayer; static { @@ -48,10 +47,9 @@ public class PlayerUtils { public static EntityPlayer getPlayer(final String name) { try { final List<EntityPlayer> i = new ArrayList<>(); - final Iterator<EntityPlayerMP> iterator = MinecraftServer.getServer() - .getConfigurationManager().playerEntityList.iterator(); - while (iterator.hasNext()) { - i.add((iterator.next())); + for (EntityPlayerMP playerMP : (Iterable<EntityPlayerMP>) MinecraftServer.getServer() + .getConfigurationManager().playerEntityList) { + i.add(playerMP); } for (final EntityPlayer temp : i) { if (temp.getDisplayName().toLowerCase().equals(name.toLowerCase())) { @@ -224,8 +222,7 @@ public class PlayerUtils { } public static boolean isRealPlayer(EntityLivingBase aEntity) { - if (aEntity instanceof EntityPlayer) { - EntityPlayer p = (EntityPlayer) aEntity; + if (aEntity instanceof EntityPlayer p) { ChunkCoordinates aChunkLocation = p.getPlayerCoordinates(); if (p instanceof FakePlayer) { cacheFakePlayer(p); diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java index 5e7c96a0c3..94901dd4da 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/RecipeUtils.java @@ -11,17 +11,14 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.ShapelessRecipes; -import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; import cpw.mods.fml.common.registry.GameRegistry; -import gregtech.api.enums.Materials; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Recipe; -import gregtech.api.util.GT_Recipe.GT_Recipe_Map; import gregtech.api.util.GT_Utility; import gtPlusPlus.GTplusplus; import gtPlusPlus.api.interfaces.RunnableWithInfo; @@ -39,19 +36,9 @@ public class RecipeUtils { public static int mInvalidID = 1; - public static boolean recipeBuilder(final Object slot_1, final Object slot_2, final Object slot_3, - final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7, final Object slot_8, - final Object slot_9, ItemStack resultItem) { - - // Old Debug Code, useful for finding recipes loading too early. - /* - * if (gtPlusPlus.GTplusplus.CURRENT_LOAD_PHASE != GTplusplus.INIT_PHASE.POST_INIT) { - * Logger.RECIPE(ReflectionUtils.getMethodName(1)); Logger.RECIPE(ReflectionUtils.getMethodName(2)); - * Logger.RECIPE(ReflectionUtils.getMethodName(3)); Logger.RECIPE(ReflectionUtils.getMethodName(4)); - * Logger.RECIPE(ReflectionUtils.getMethodName(5)); Logger.RECIPE(ReflectionUtils.getMethodName(6)); - * Logger.RECIPE(ReflectionUtils.getMethodName(7)); Logger.RECIPE(ReflectionUtils.getMethodName(8)); - * Logger.RECIPE(ReflectionUtils.getMethodName(9)); FMLCommonHandler.instance().exitJava(1, true); } - */ + public static void recipeBuilder(final Object slot_1, final Object slot_2, final Object slot_3, final Object slot_4, + final Object slot_5, final Object slot_6, final Object slot_7, final Object slot_8, final Object slot_9, + ItemStack resultItem) { if (resultItem == null) { Logger.RECIPE( @@ -59,7 +46,7 @@ public class RecipeUtils { resultItem = ItemUtils.getItemStackOfAmountFromOreDict("givemeabrokenitem", 1); resultItem.setItemDamage(mInvalidID++); RegistrationHandler.recipesFailed++; - // return false; + } else if ((slot_1 == null) && (slot_2 == null) && (slot_3 == null) && (slot_4 == null) @@ -74,7 +61,7 @@ public class RecipeUtils { ? resultItem.getDisplayName() : "Bad Output Item" + " | Please report this issue on Github."); RegistrationHandler.recipesFailed++; - return false; + return; } Object[] o = new Object[] { slot_1, slot_2, slot_3, slot_4, slot_5, slot_6, slot_7, slot_8, slot_9 }; @@ -89,14 +76,8 @@ public class RecipeUtils { } else { LateRegistrationHandler.recipesSuccess++; } - return true; } - return false; } catch (RuntimeException k) { - // k.getMessage(); - // k.getClass(); - // k.printStackTrace(); - // k.getLocalizedMessage(); Logger.RECIPE( "[Fix] Invalid Recipe detected for: " + resultItem != null ? resultItem.getUnlocalizedName() : "INVALID OUTPUT ITEM"); @@ -105,189 +86,19 @@ public class RecipeUtils { } else { LateRegistrationHandler.recipesFailed++; } - return false; - } - } - - public static void shapelessBuilder(final ItemStack Output, final Object slot_1, final Object slot_2, - final Object slot_3, final Object slot_4, final Object slot_5, final Object slot_6, final Object slot_7, - final Object slot_8, final Object slot_9) { - // Item output_ITEM = Output.getItem(); - - final ArrayList<Object> validSlots = new ArrayList<>(); - - Logger.WARNING("Trying to add a recipe for " + Output.toString()); - String a, b, c, d, e, f, g, h, i; - if (slot_1 == null) { - a = " "; - } else { - a = "1"; - validSlots.add('1'); - validSlots.add(slot_1); - } - Logger.WARNING(a); - if (slot_2 == null) { - b = " "; - } else { - b = "2"; - validSlots.add('2'); - validSlots.add(slot_2); - } - Logger.WARNING(b); - if (slot_3 == null) { - c = " "; - } else { - c = "3"; - validSlots.add('3'); - validSlots.add(slot_3); - } - Logger.WARNING(c); - if (slot_4 == null) { - d = " "; - } else { - d = "4"; - validSlots.add('4'); - validSlots.add(slot_4); - } - Logger.WARNING(d); - if (slot_5 == null) { - e = " "; - } else { - e = "5"; - validSlots.add('5'); - validSlots.add(slot_5); - } - Logger.WARNING(e); - if (slot_6 == null) { - f = " "; - } else { - f = "6"; - validSlots.add('6'); - validSlots.add(slot_6); - } - Logger.WARNING(f); - if (slot_7 == null) { - g = " "; - } else { - g = "7"; - validSlots.add('7'); - validSlots.add(slot_7); - } - Logger.WARNING(g); - if (slot_8 == null) { - h = " "; - } else { - h = "8"; - validSlots.add('8'); - validSlots.add(slot_8); - } - Logger.WARNING(h); - if (slot_9 == null) { - i = " "; - } else { - i = "9"; - validSlots.add('9'); - validSlots.add(slot_9); - } - Logger.WARNING(i); - - Logger.ERROR("_______"); - Logger.ERROR("|" + a + "|" + b + "|" + c + "|"); - Logger.ERROR("_______"); - Logger.ERROR("|" + d + "|" + e + "|" + f + "|"); - Logger.ERROR("_______"); - Logger.ERROR("|" + g + "|" + h + "|" + i + "|"); - Logger.ERROR("_______"); - - validSlots.add(0, a); - validSlots.add(1, b); - validSlots.add(2, c); - validSlots.add(3, d); - validSlots.add(4, e); - validSlots.add(5, f); - validSlots.add(6, g); - validSlots.add(7, h); - validSlots.add(8, i); - - try { - // GameRegistry.addRecipe(new ShapelessOreRecipe(Output, outputAmount), (Object[]) validSlots.toArray()); - GameRegistry.addRecipe(new ShapelessOreRecipe(Output, validSlots.toArray())); - // GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2}); - Logger.RECIPE("Success! Added a recipe for " + Output.getDisplayName()); - RegistrationHandler.recipesSuccess++; - } catch (final RuntimeException k) { - k.getMessage(); - k.getClass(); - k.printStackTrace(); - k.getLocalizedMessage(); - Logger.RECIPE("[Fix] Invalid Recipe detected for: " + Output.getUnlocalizedName()); - RegistrationHandler.recipesFailed++; - } - - // GameRegistry.addShapelessRecipe(new ItemStack(output_ITEM, 1), new Object[] {slot_1, slot_2}); - } - - public static void recipeBuilder(final Object[] array, final ItemStack outPut) { - Logger.SPECIFIC_WARNING( - "object Array - recipeBuilder", - "Attempting to build a recipe using an object array as an input, splitting it, then running the normal recipeBuilder() method.", - 396); - Object a = null; - Object b = null; - Object c = null; - Object d = null; - Object e = null; - Object f = null; - Object g = null; - Object h = null; - Object i = null; - for (int z = 0; z <= array.length; z++) { - array[z].toString(); - switch (z) { - case 0: - a = array[z]; - break; - case 1: - b = array[z]; - break; - case 2: - c = array[z]; - break; - case 3: - d = array[z]; - break; - case 4: - e = array[z]; - break; - case 5: - f = array[z]; - break; - case 6: - g = array[z]; - break; - case 7: - h = array[z]; - break; - case 8: - i = array[z]; - break; - default: - break; - } - recipeBuilder(a, b, c, d, e, f, g, h, i, outPut); } } - public static boolean removeCraftingRecipe(Object x) { + public static void removeCraftingRecipe(Object x) { if (null == x) { - return false; + return; } if (x instanceof String) { final Item R = ItemUtils.getItemFromFQRN((String) x); if (R != null) { x = R; } else { - return false; + return; } } if ((x instanceof Item) || (x instanceof ItemStack)) { @@ -303,17 +114,15 @@ public class RecipeUtils { x = r; } else { Logger.RECIPE("Recipe removal failed - Tell Alkalus."); - return false; + return; } } if (RecipeUtils.attemptRecipeRemoval((Item) x)) { Logger.RECIPE("Recipe removal successful"); - return true; + return; } Logger.RECIPE("Recipe removal failed - Tell Alkalus."); - return false; } - return false; } private static boolean attemptRecipeRemoval(final Item I) { @@ -332,9 +141,8 @@ public class RecipeUtils { Logger.RECIPE("All recipes should be gone?"); if (!items.hasNext()) { Logger.RECIPE("We iterated once, let's try again to double check."); - final Iterator<IRecipe> items2 = recipes.iterator(); - while (items2.hasNext()) { - final ItemStack is = items2.next().getRecipeOutput(); + for (IRecipe recipe : recipes) { + final ItemStack is = recipe.getRecipeOutput(); if ((is != null) && (is.getItem() == I)) { items.remove(); Logger.RECIPE("REMOVING MISSED RECIPE - RECHECK CONSTRUCTORS"); @@ -348,46 +156,6 @@ public class RecipeUtils { return false; } - public static boolean addShapedGregtechRecipeForTypes(final Object InputItem1, final Object InputItem2, - final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6, - final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) { - - int using = 0, recipeSlotCurrent = 0; - boolean[] hasMultiStack = new boolean[9]; - boolean inUse[] = { false, false, false }; - ItemStack array[][] = new ItemStack[3][9]; - - Object[] inputs = { InputItem1, InputItem2, InputItem3, InputItem4, InputItem5, InputItem6, InputItem7, - InputItem8, InputItem9 }; - - for (Object o : inputs) { - if (o.getClass().isArray()) { - if (inUse[using] == false) { - inUse[using] = true; - array[using] = (ItemStack[]) o; - hasMultiStack[recipeSlotCurrent] = true; - using++; - } - } else { - hasMultiStack[recipeSlotCurrent] = false; - } - recipeSlotCurrent++; - } - - int using2 = 0; - for (boolean t : inUse) { - - if (t) { - if (array[using2] != null) { - // addShapedGregtechRecipe - } - } - using2++; - } - - return false; - } - public static boolean addShapedGregtechRecipe(final Object InputItem1, final Object InputItem2, final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6, final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) { @@ -417,61 +185,6 @@ public class RecipeUtils { return false; } - public static boolean addShapedGregtechRecipe(final Object[] inputs, ItemStack output) { - - if (inputs.length != 9) { - Logger.RECIPE( - "[Fix] Input array for " + output.getDisplayName() - + " does not equal 9. " - + inputs.length - + " is the actual size."); - RegistrationHandler.recipesFailed++; - return false; - } - - for (int x = 0; x < 9; x++) { - if (inputs[x] == null) { - inputs[x] = " "; - Logger.WARNING("Input slot " + x + " changed from NULL to a blank space."); - } else if (!(inputs[x] instanceof ItemStack) && !(inputs[x] instanceof String) - && !(inputs[x] instanceof Item)) { - if (output != null) { - Logger.RECIPE( - "[Fix] Invalid Item inserted into inputArray. Item:" + output.getDisplayName() - + " has a bad recipe. Please report to Alkalus."); - RegistrationHandler.recipesFailed++; - return false; - } else { - Logger.RECIPE("[Fix] Output is Null for a recipe. Report to Alkalus."); - output = ItemUtils.getItemStackOfAmountFromOreDict("sadibasdkjnad", 1); - RegistrationHandler.recipesFailed++; - } - } - } - - int size = COMPAT_HANDLER.mGtRecipesToGenerate.size(); - COMPAT_HANDLER.mGtRecipesToGenerate.put(new InternalRecipeObject(inputs, output, true)); - - if (COMPAT_HANDLER.mGtRecipesToGenerate.size() > size) { - if (!COMPAT_HANDLER.areInitItemsLoaded) { - RegistrationHandler.recipesSuccess++; - } else { - LateRegistrationHandler.recipesSuccess++; - } - return true; - } - return false; - } - - public static boolean addShapelessGregtechRecipe(final Object InputItem1, final Object InputItem2, - final Object InputItem3, final Object InputItem4, final Object InputItem5, final Object InputItem6, - final Object InputItem7, final Object InputItem8, final Object InputItem9, final ItemStack OutputItem) { - - Object[] inputItems = { InputItem1, InputItem2, InputItem3, InputItem4, InputItem5, InputItem6, InputItem7, - InputItem8, InputItem9 }; - return addShapelessGregtechRecipe(inputItems, OutputItem); - } - public static boolean addShapelessGregtechRecipe(final Object[] inputItems, final ItemStack OutputItem) { // Catch Invalid Recipes if (inputItems.length > 9 || inputItems.length < 1) { @@ -489,15 +202,6 @@ public class RecipeUtils { return false; } - public static ItemStack getItemStackFromOreDict(final String oredictName) { - final ArrayList<ItemStack> oreDictList = OreDictionary.getOres(oredictName); - return oreDictList.get(0); - } - - public static boolean buildShapelessRecipe(final ItemStack output, final Object[] input) { - return ShapelessUtils.addShapelessRecipe(output, input); - } - public static boolean generateMortarRecipe(ItemStack aStack, ItemStack aOutput) { return RecipeUtils.addShapedGregtechRecipe( aStack, @@ -512,32 +216,11 @@ public class RecipeUtils { aOutput); } - public static boolean doesGregtechRecipeHaveEqualCells(GT_Recipe x) { - if (x.mInputs.length == 0 && x.mOutputs.length == 0) { - return true; - } - - final int tInputAmount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(x.mInputs); - final int tOutputAmount = GT_ModHandler.getCapsuleCellContainerCountMultipliedWithStackSize(x.mOutputs); - - if (tInputAmount < tOutputAmount) { - if (!Materials.Tin.contains(x.mInputs)) { - return false; - } else { - return true; - } - } else if (tInputAmount > tOutputAmount && !Materials.Tin.contains(x.mOutputs)) { - return false; - } else { - return true; - } - } - public static String[] getRecipeInfo(GT_Recipe m) { if (m == null) { return new String[] {}; } - AutoMap<String> result = new AutoMap<String>(); + AutoMap<String> result = new AutoMap<>(); result.put(m.toString()); result.put("Input " + ItemUtils.getArrayStackNames(m.mInputs)); result.put("Output " + ItemUtils.getArrayStackNames(m.mOutputs)); @@ -628,20 +311,6 @@ public class RecipeUtils { } } - public static boolean removeGtRecipe(GT_Recipe aRecipeToRemove, GT_Recipe_Map aRecipeMap) { - if (aRecipeMap.mRecipeList.contains(aRecipeToRemove)) { - return aRecipeMap.mRecipeList.remove(aRecipeToRemove); - } - return false; - } - - public static boolean addGtRecipe(GT_Recipe aRecipeToAdd, GT_Recipe_Map aRecipeMap) { - if (!aRecipeMap.mRecipeList.contains(aRecipeToAdd)) { - return aRecipeMap.mRecipeList.add(aRecipeToAdd); - } - return false; - } - public static boolean removeRecipeByOutput(ItemStack aOutput) { return removeRecipeByOutput(aOutput, true, false, false); } @@ -683,10 +352,6 @@ public class RecipeUtils { } } - public static void addSmeltingRecipe(ItemStack aStackInput, ItemStack aStackOutput) { - addSmeltingRecipe(aStackInput, aStackOutput, 0f); - } - public static void addSmeltingRecipe(ItemStack aStackInput, ItemStack aStackOutput, float aXpGained) { GameRegistry.addSmelting(aStackInput, aStackOutput, aXpGained); @@ -720,8 +385,7 @@ public class RecipeUtils { } else if (o instanceof String) { Slots[i] = o; aFullString += aFullStringExpanded.charAt(i); - } else if (o instanceof ItemData) { - ItemData aData = (ItemData) o; + } else if (o instanceof ItemData aData) { ItemStack aStackFromGT = ItemUtils.getOrePrefixStack(aData.mPrefix, aData.mMaterial.mMaterial, 1); Slots[i] = aStackFromGT; aFullString += aFullStringExpanded.charAt(i); @@ -774,11 +438,6 @@ public class RecipeUtils { ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aDataObject); - /* - * ShapedOreRecipe aRecipe = new ShapedOreRecipe(aOutputStack, aStringData, 'a', Slots[0], 'b', Slots[1], 'c', - * Slots[2], 'd', Slots[3], 'e', Slots[4], 'f', Slots[5], 'g', Slots[6], 'h', Slots[7], 'i', Slots[8]); - */ - int size = COMPAT_HANDLER.mRecipesToGenerate.size(); COMPAT_HANDLER.mRecipesToGenerate.put(new InternalRecipeObject2(aRecipe)); if (COMPAT_HANDLER.mRecipesToGenerate.size() > size) { @@ -821,8 +480,8 @@ public class RecipeUtils { @Override public String getInfoData() { - if (mOutput != null && mOutput instanceof ItemStack) { - return ((ItemStack) mOutput).getDisplayName(); + if (mOutput != null) { + return mOutput.getDisplayName(); } return ""; } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java index b2a705481b..600bf9f4d6 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/ShapelessUtils.java @@ -36,7 +36,6 @@ public class ShapelessUtils { } } CraftingManager.getInstance().getRecipeList().add(new ShapelessRecipes(output, arraylist)); - // CraftingManager.getInstance().addShapelessRecipe(output, arraylist); return true; } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java index 7441f0b4cf..2c849350bf 100644 --- a/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/minecraft/gregtech/PollutionUtils.java @@ -21,7 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class PollutionUtils { - public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<FluidStack>(); + public static AutoMap<FluidStack> mPollutionFluidStacks = new AutoMap<>(); public static boolean isPollutionEnabled() { return GT_Mod.gregtechproxy.mPollution; @@ -35,64 +35,54 @@ public class PollutionUtils { return false; } - public static boolean addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) { + public static void addPollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) { if (GT_Mod.gregtechproxy.mPollution) { - IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort; - Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord()); - return addPollution(c, pollutionValue); + Chunk c = aTileOfSomeSort.getWorld() + .getChunkFromBlockCoords(aTileOfSomeSort.getXCoord(), aTileOfSomeSort.getZCoord()); + addPollution(c, pollutionValue); } - return false; } - public static boolean addPollution(Chunk aChunk, int pollutionValue) { + public static void addPollution(Chunk aChunk, int pollutionValue) { if (GT_Mod.gregtechproxy.mPollution) { GT_Pollution.addPollution(aChunk, pollutionValue); - return true; } - return false; } - public static boolean removePollution(IGregTechTileEntity te, int pollutionValue) { - return addPollution(te, -pollutionValue); + public static void removePollution(IGregTechTileEntity te, int pollutionValue) { + addPollution(te, -pollutionValue); } - public static boolean removePollution(IHasWorldObjectAndCoords aTileOfSomeSort, int pollutionValue) { - return addPollution(aTileOfSomeSort, -pollutionValue); + public static void removePollution(Chunk aChunk, int pollutionValue) { + addPollution(aChunk, -pollutionValue); } - public static boolean removePollution(Chunk aChunk, int pollutionValue) { - return addPollution(aChunk, -pollutionValue); - } - - public static boolean nullifyPollution(IGregTechTileEntity te) { + public static void nullifyPollution(IGregTechTileEntity te) { if (te == null) { - return false; + return; } - return nullifyPollution((IHasWorldObjectAndCoords) te); + nullifyPollution((IHasWorldObjectAndCoords) te); } - public static boolean nullifyPollution(IHasWorldObjectAndCoords aTileOfSomeSort) { + public static void nullifyPollution(IHasWorldObjectAndCoords aTileOfSomeSort) { if (aTileOfSomeSort == null) { - return false; + return; } - IHasWorldObjectAndCoords j = (IHasWorldObjectAndCoords) aTileOfSomeSort; - Chunk c = j.getWorld().getChunkFromBlockCoords(j.getXCoord(), j.getZCoord()); - return nullifyPollution(c); + Chunk c = aTileOfSomeSort.getWorld() + .getChunkFromBlockCoords(aTileOfSomeSort.getXCoord(), aTileOfSomeSort.getZCoord()); + nullifyPollution(c); } - public static boolean nullifyPollution(Chunk aChunk) { + public static void nullifyPollution(Chunk aChunk) { if (GT_Mod.gregtechproxy.mPollution) { if (aChunk == null) { - return false; + return; } int getCurrentPollution = getPollution(aChunk); - if (getCurrentPollution <= 0) { - return false; - } else { - return removePollution(aChunk, getCurrentPollution); + if (getCurrentPollution > 0) { + removePollution(aChunk, getCurrentPollution); } } - return false; } public static int getPollution(IGregTechTileEntity te) { @@ -103,7 +93,7 @@ public class PollutionUtils { return GT_Pollution.getPollution(te); } - public static boolean setPollutionFluids() { + public static void setPollutionFluids() { if (mPollutionFluidStacks.isEmpty()) { FluidStack CD, CM, SD; CD = FluidUtils.getFluidStack("carbondioxide", 1000); @@ -147,17 +137,10 @@ public class PollutionUtils { PollutionUtils.mPollutionFluidStacks.put(SD); } } - if (PollutionUtils.mPollutionFluidStacks.size() > 0) { - return true; - } - return false; } else { if (mPollutionFluidStacks.size() != 3) { Logger.INFO("Unable to detect all 3 pollution fluids. Found: "); Logger.INFO(ArrayUtils.toString(mPollutionFluidStacks)); - return false; - } else { - return true; } } } diff --git a/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java b/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java deleted file mode 100644 index ad7e407c57..0000000000 --- a/src/main/java/gtPlusPlus/core/util/minecraft/particles/EntityParticleFXMysterious.java +++ /dev/null @@ -1,15 +0,0 @@ -package gtPlusPlus.core.util.minecraft.particles; - -import net.minecraft.client.particle.EntityAuraFX; -import net.minecraft.world.World; - -public class EntityParticleFXMysterious extends EntityAuraFX { - - public EntityParticleFXMysterious(final World parWorld, final double parX, final double parY, final double parZ, - final double parMotionX, final double parMotionY, final double parMotionZ) { - super(parWorld, parX, parY, parZ, parMotionX, parMotionY, parMotionZ); - this.setParticleTextureIndex(82); // same as happy villager - this.particleScale = 2.0F; - this.setRBGColorF(0x88, 0x00, 0x88); - } -} diff --git a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java index f3452dcbe8..07dbb2cffb 100644 --- a/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java +++ b/src/main/java/gtPlusPlus/core/util/player/PlayerCache.java @@ -5,16 +5,11 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; import java.io.OutputStream; import java.util.HashMap; -import java.util.List; import java.util.Properties; import java.util.UUID; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; - import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -22,7 +17,7 @@ public class PlayerCache { private static final File cache = new File("PlayerCache.dat"); - public static final void initCache() { + public static void initCache() { if (CORE.PlayerCache == null) { try { @@ -52,30 +47,6 @@ public class PlayerCache { } } - public static void appendParamChanges(final String playerName, final String playerUUIDasString) { - final HashMap<String, UUID> playerInfo = new HashMap<>(); - playerInfo.put(playerName, UUID.fromString(playerUUIDasString)); - - /* - * try { Utils.LOG_INFO("Attempting to load "+cache.getName()); properties.load(new FileInputStream(cache)); if - * (properties == null || properties.equals(null)){ Utils.LOG_INFO("Please wait."); } else { - * Utils.LOG_INFO("Loaded PlayerCache.dat"); properties.setProperty(playerName+"_", playerUUIDasString); - * FileOutputStream fr=new FileOutputStream(cache); properties.store(fr, "Player Cache."); fr.close(); } } - */ - - try { - final FileOutputStream fos = new FileOutputStream("PlayerCache.dat"); - final ObjectOutputStream oos = new ObjectOutputStream(fos); - oos.writeObject(playerInfo); - oos.close(); - fos.close(); - Logger.INFO("Serialized Player data saved in PlayerCache.dat"); - } catch (final IOException e) { - Logger.INFO("No PlayerCache file found, creating one."); - createPropertiesFile(playerName, playerUUIDasString); - } - } - public static HashMap<String, UUID> readPropertiesFileAsMap() { HashMap<String, UUID> map = null; try { @@ -96,16 +67,4 @@ public class PlayerCache { return map; } - public static String lookupPlayerByUUID(final UUID UUID) { - if (UUID == null) { - return null; - } - final List<EntityPlayerMP> allPlayers = MinecraftServer.getServer().getConfigurationManager().playerEntityList; - for (final EntityPlayerMP player : allPlayers) { - if (player.getUniqueID().equals(UUID)) { - return player.getDisplayName(); - } - } - return "Offline Player."; - } } diff --git a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index 95e73a71f6..39976652a7 100644 --- a/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/main/java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -642,7 +642,7 @@ public class ReflectionUtils { } public static Class<?> findSubClassParameterType(Object instance, Class<?> classOfInterest, int parameterIndex) { - Map<Type, Type> typeMap = new HashMap<Type, Type>(); + Map<Type, Type> typeMap = new HashMap<>(); Class<?> instanceClass = instance.getClass(); while (classOfInterest != instanceClass.getSuperclass()) { extractTypeArguments(typeMap, instanceClass); @@ -668,11 +668,10 @@ public class ReflectionUtils { private static void extractTypeArguments(Map<Type, Type> typeMap, Class<?> clazz) { Type genericSuperclass = clazz.getGenericSuperclass(); - if (!(genericSuperclass instanceof ParameterizedType)) { + if (!(genericSuperclass instanceof ParameterizedType parameterizedType)) { return; } - ParameterizedType parameterizedType = (ParameterizedType) genericSuperclass; Type[] typeParameter = ((Class<?>) parameterizedType.getRawType()).getTypeParameters(); Type[] actualTypeArgument = parameterizedType.getActualTypeArguments(); for (int i = 0; i < typeParameter.length; i++) { @@ -685,7 +684,7 @@ public class ReflectionUtils { private static Class<?> browseNestedTypes(Object instance, TypeVariable<?> actualType) { Class<?> instanceClass = instance.getClass(); - List<Class<?>> nestedOuterTypes = new LinkedList<Class<?>>(); + List<Class<?>> nestedOuterTypes = new LinkedList<>(); for (Class<?> enclosingClass = instanceClass.getEnclosingClass(); enclosingClass != null; enclosingClass = enclosingClass.getEnclosingClass()) { try { @@ -693,13 +692,12 @@ public class ReflectionUtils { Object outerInstance = this$0.get(instance); Class<?> outerClass = outerInstance.getClass(); nestedOuterTypes.add(outerClass); - Map<Type, Type> outerTypeMap = new HashMap<Type, Type>(); + Map<Type, Type> outerTypeMap = new HashMap<>(); extractTypeArguments(outerTypeMap, outerClass); for (Map.Entry<Type, Type> entry : outerTypeMap.entrySet()) { - if (!(entry.getKey() instanceof TypeVariable)) { + if (!(entry.getKey() instanceof TypeVariable<?>foundType)) { continue; } - TypeVariable<?> foundType = (TypeVariable<?>) entry.getKey(); if (foundType.getName().equals(actualType.getName()) && isInnerClass(foundType.getGenericDeclaration(), actualType.getGenericDeclaration())) { if (entry.getValue() instanceof Class) { @@ -716,11 +714,9 @@ public class ReflectionUtils { } private static boolean isInnerClass(GenericDeclaration outerDeclaration, GenericDeclaration innerDeclaration) { - if (!(outerDeclaration instanceof Class) || !(innerDeclaration instanceof Class)) { + if (!(outerDeclaration instanceof Class<?>outerClass) || !(innerDeclaration instanceof Class<?>innerClass)) { return false; } - Class<?> outerClass = (Class<?>) outerDeclaration; - Class<?> innerClass = (Class<?>) innerDeclaration; while ((innerClass = innerClass.getEnclosingClass()) != null) { if (innerClass == outerClass) { return true; diff --git a/src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java b/src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java deleted file mode 100644 index 20bc9197f3..0000000000 --- a/src/main/java/gtPlusPlus/core/world/damage/BaseCustomDamageSource.java +++ /dev/null @@ -1,20 +0,0 @@ -package gtPlusPlus.core.world.damage; - -import net.minecraft.entity.Entity; -import net.minecraft.util.EntityDamageSourceIndirect; - -public class BaseCustomDamageSource extends EntityDamageSourceIndirect { - - public BaseCustomDamageSource(String name, Entity transmitter, Entity indirectSource) { - super(name, transmitter, indirectSource); - this.setDifficultyScaled(); - } - - /** - * Return whether this damage source will have its damage amount scaled based on the current difficulty. - */ - @Override - public boolean isDifficultyScaled() { - return true; - } -} diff --git a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java index 6e35868cb7..ddc903e86a 100644 --- a/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java +++ b/src/main/java/gtPlusPlus/core/world/explosions/MiningExplosion.java @@ -128,8 +128,7 @@ public class MiningExplosion extends Explosion { net.minecraftforge.event.ForgeEventFactory.onExplosionDetonate(this.worldObj, this, list, this.explosionSize); final Vec3 vec3 = Vec3.createVectorHelper(this.explosionX, this.explosionY, this.explosionZ); - for (int i1 = 0; i1 < list.size(); ++i1) { - final Entity entity = list.get(i1); + for (final Entity entity : list) { final double d4 = entity.getDistance(this.explosionX, this.explosionY, this.explosionZ) / this.explosionSize; diff --git a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java index 00c6f7deec..a378919486 100644 --- a/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -16,7 +16,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import gregtech.api.enums.Mods; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; @@ -32,7 +31,6 @@ import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; -@MCVersion(value = "1.7.10") @Mod( modid = Mods.Names.G_T_PLUS_PLUS_EVERGLADES, name = Everglades.NAME, diff --git a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java index b0139b2252..e223b50645 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java +++ b/src/main/java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java @@ -66,7 +66,6 @@ public class BiomeGenerator_Custom extends BiomeDecorator { this.redstoneGen = new WorldGenMinable_Custom(Blocks.redstone_ore, 10); this.diamondGen = new WorldGenMinable_Custom(Blocks.diamond_ore, 12); this.lapisGen = new WorldGenMinable_Custom(Blocks.lapis_ore, 8); - // this.fluoriteGen = new WorldGenMinable_Custom(ModBlocks.blockOreFluorite, 20); // Nature this.yellowFlowerGen = new WorldGenFlowers(Blocks.yellow_flower); diff --git a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java index 940c7b5a34..61c8ab5c26 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java +++ b/src/main/java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -1,13 +1,8 @@ package gtPlusPlus.everglades.biome; -import java.lang.reflect.Field; -import java.util.Random; - import net.minecraft.entity.monster.EntityPigZombie; import net.minecraft.entity.passive.EntityBat; import net.minecraft.entity.passive.EntitySquid; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeManager; @@ -16,11 +11,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.everglades.dimension.Dimension_Everglades; public class Biome_Everglades { @@ -36,16 +29,6 @@ public class Biome_Everglades { BiomeManager.addSpawnBiome(biome); } - public void generateNether(World world, Random random, int chunkX, int chunkZ) {} - - public void generateSurface(World world, Random random, int chunkX, int chunkZ) {} - - public void registerRenderers() {} - - public int addFuel(ItemStack fuel) { - return 0; - } - public void serverLoad(FMLServerStartingEvent event) {} public void preInit(FMLPreInitializationEvent event) {} @@ -85,33 +68,6 @@ public class Biome_Everglades { this.spawnableCaveCreatureList.add(new BiomeGenBase.SpawnListEntry(EntityBat.class, 10, 8, 8)); } - private synchronized boolean setBiomeID() { - try { - Field mInternalBiomeList = ReflectionUtils.getField(BiomeGenBase.class, "biomeList"); - BiomeGenBase[] mOriginalList = (BiomeGenBase[]) mInternalBiomeList.get(null); - BiomeGenBase[] mTempList = new BiomeGenBase[mOriginalList.length]; - for (int index = 0; index < mTempList.length; index++) { - mTempList[index] = mOriginalList[index]; - } - return false; - } catch (Exception e) { - Logger.REFLECTION( - "Could not access 'biomeList' field in " + BiomeGenBase.class.getCanonicalName() + "."); - e.printStackTrace(); - return false; - } - } - - @SideOnly(Side.CLIENT) - public int getBiomeGrassColor() { - return 0x111f11; - } - - @SideOnly(Side.CLIENT) - public int getBiomeFoliageColor() { - return 0x111f11; - } - @Override @SideOnly(Side.CLIENT) public int getSkyColorByTemp(float par1) { @@ -120,7 +76,6 @@ public class Biome_Everglades { @SuppressWarnings({ "unchecked", "unused" }) private boolean addToMonsterSpawnLists(Class<?> EntityClass, int a, int b, int c) { - // this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c)); this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; } diff --git a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java index 93c8404bb6..fe799fbe42 100644 --- a/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java +++ b/src/main/java/gtPlusPlus/everglades/biome/GenLayerBiomes.java @@ -12,11 +12,6 @@ public class GenLayerBiomes extends GenLayer { super(seed); } - public GenLayerBiomes(long seed, GenLayer genlayer) { - super(seed); - this.parent = genlayer; - } - @Override public int[] getInts(int x, int z, int width, int depth) { int[] dest = IntCache.getIntCache(width * depth); diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java index e3ee1b91df..b4943d1886 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java @@ -11,8 +11,6 @@ public class BlockDarkWorldSludgeFluid extends Fluid { protected static int mapColor = 0xFFFFFFFF; protected static float overlayAlpha = 0.2F; - // protected static SoundEvent emptySound = SoundEvents.ITEM_BUCKET_EMPTY; - // protected static SoundEvent fillSound = SoundEvents.ITEM_BUCKET_FILL; protected static Material material = SLUDGE; public BlockDarkWorldSludgeFluid(String fluidName, int rgbColour) { @@ -23,7 +21,7 @@ public class BlockDarkWorldSludgeFluid extends Fluid { super(fluidName); setColor(rgbColour); if (overlayAlpha != null) { - setAlpha(overlayAlpha.floatValue()); + setAlpha(overlayAlpha); } else { setAlpha(0); } diff --git a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index 7b7dde778e..791c4321a2 100644 --- a/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java +++ b/src/main/java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -285,8 +285,7 @@ public class BlockEvergladesPortal extends BlockBreakable implements ITileToolti @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if ((par5Entity.ridingEntity == null) && (par5Entity.riddenByEntity == null) - && ((par5Entity instanceof EntityPlayerMP))) { - EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; + && ((par5Entity instanceof EntityPlayerMP thePlayer))) { if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index 6567e75cfb..20748aac03 100644 --- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java +++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -62,8 +62,6 @@ public class ChunkProviderModded implements IChunkProvider { /** * Holds Stronghold Generator */ - // private MapGenStronghold strongholdGenerator = new - // MapGenStronghold(); /** * Holds Village Generator */ diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index 70dfd2b35a..efafa5cb4b 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java @@ -14,7 +14,7 @@ public abstract class WorldGen_GT { public final String mWorldGenName; public final boolean mEnabled; - private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<String, Boolean>(); + private final Map<String, Boolean> mDimensionMap = new ConcurrentHashMap<>(); public WorldGen_GT(String aName, List aList, boolean aDefault) { this.mWorldGenName = aName; @@ -45,7 +45,7 @@ public abstract class WorldGen_GT { this.mDimensionMap.put(aDimName, Boolean.valueOf(tValue)); return tValue; } else { - return tAllowed.booleanValue(); + return tAllowed; } } } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index 2608b0b024..52eaaa747a 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -48,9 +48,9 @@ public class WorldGen_GT_Base implements IWorldGenerator { /** * Try re-implement Richard Hendrick's Chunk by Chunk Ore Generation from his GT5u fork. */ - public static List<Runnable> mList = new ArrayList<Runnable>(); + public static List<Runnable> mList = new ArrayList<>(); - public static HashSet<Long> ProcChunks = new HashSet<Long>(); + public static HashSet<Long> ProcChunks = new HashSet<>(); // This is probably not going to work. Trying to create a fake orevein to // put into hashtable when there will be no ores in a vein. public static WorldGen_GT_Ore_Layer noOresInVein = new WorldGen_GT_Ore_Layer( @@ -65,8 +65,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { ELEMENT.getInstance().IRON, ELEMENT.getInstance().IRON); - public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>( - 1024); + public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); public boolean mIsGenerating = false; public static final Object listLock = new Object(); @@ -209,7 +208,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { } }; - public static ArrayList<NearbySeeds> seedList = new ArrayList<NearbySeeds>(); + public static ArrayList<NearbySeeds> seedList = new ArrayList<>(); // aX and aZ are now the by-chunk X and Z for the chunk of interest public WorldGenContainer(Random aRandom, int aX, int aZ, int aDimensionType, World aWorld, @@ -341,7 +340,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkGenerator, this.mChunkProvider); switch (placementResult) { - case WorldGen_GT_Ore_Layer.ORE_PLACED: + case WorldGen_GT_Ore_Layer.ORE_PLACED -> { if (debugWorldGen) GT_Log.out.println( " Added oreveinSeed=" + oreveinSeed + " tries at oremix=" @@ -353,16 +352,16 @@ public class WorldGen_GT_Base implements IWorldGenerator { validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; Logger.INFO("[World Generation Debug] ORE_PLACED"); - break; - case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: + } + case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { placementAttempts++; Logger.INFO( "[World Generation Debug] NO_ORE_IN_BOTTOM_LAYER | Attempts: " + placementAttempts); - // SHould do retry in this case - // until out of chances - break; - case WorldGen_GT_Ore_Layer.NO_OVERLAP: + } + // SHould do retry in this case + // until out of chances + case WorldGen_GT_Ore_Layer.NO_OVERLAP -> { // Orevein didn't reach this chunk, // can't add it yet to the hash Logger.INFO("[World Generation Debug] NO_OVERLAP"); @@ -378,8 +377,8 @@ public class WorldGen_GT_Base implements IWorldGenerator { + tDimensionName); validOreveins.put(oreveinSeed, tWorldGen); oreveinFound = true; - break; - case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK: + } + case WorldGen_GT_Ore_Layer.NO_OVERLAP_AIR_BLOCK -> { if (debugWorldGen) GT_Log.out.println( " No overlap and air block in test spot=" + oreveinSeed + " " @@ -393,7 +392,7 @@ public class WorldGen_GT_Base implements IWorldGenerator { // SHould do retry in this case until out of chances Logger.INFO("[World Generation Debug] NO_OVERLAP_AIR_BLOCK"); placementAttempts++; - break; + } } break; // Try the next orevein } catch (Throwable e) { @@ -484,12 +483,12 @@ public class WorldGen_GT_Base implements IWorldGenerator { this.mChunkGenerator, this.mChunkProvider); switch (placementResult) { - case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER: + case WorldGen_GT_Ore_Layer.NO_ORE_IN_BOTTOM_LAYER -> { if (debugWorldGen) GT_Log.out.println(" No ore in bottom layer"); - break; - case WorldGen_GT_Ore_Layer.NO_OVERLAP: + } + case WorldGen_GT_Ore_Layer.NO_OVERLAP -> { if (debugWorldGen) GT_Log.out.println(" No overlap"); - break; + } } } } diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index b8e53047af..19bec827c0 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -28,7 +28,7 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT; public class WorldGen_GT_Ore_Layer extends WorldGen_GT { - public static ArrayList<WorldGen_GT_Ore_Layer> sList = new ArrayList<WorldGen_GT_Ore_Layer>(); + public static ArrayList<WorldGen_GT_Ore_Layer> sList = new ArrayList<>(); public static int sWeight = 0; public final short mMinY; public final short mMaxY; @@ -56,9 +56,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { public static final int ORE_PLACED = 4; public static final int NO_OVERLAP_AIR_BLOCK = 5; - // public final boolean mMoon; - // public final boolean mMars; - // public final boolean mAsteroid; public final String aTextWorldgen = "worldgen."; public WorldGen_GT_Ore_Layer(String aName, int aMinY, int aMaxY, int aWeight, int aDensity, int aSize, @@ -92,10 +89,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { .get(aTextWorldgen + this.mWorldGenName, "Overworld", aOverworld); this.mNether = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Nether", aNether); this.mEnd = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "TheEnd", aEnd); - // this.mMoon = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Moon", aMoon); - // this.mMars = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Mars", aMars); - // this.mAsteroid = HANDLER_GT.sCustomWorldgenFile.get(aTextWorldgen + this.mWorldGenName, "Asteroid", - // aAsteroid); this.mMinY = 5; short mMaxY = 14; if (mMaxY < (this.mMinY + 7)) { @@ -134,14 +127,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { // not exist"); if (this.mEnabled) { - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mPrimaryMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSecondaryMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mBetweenMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); - // GT_Achievements.registerOre(GregTech_API.sGeneratedMaterials[(mSporadicMeta % 1000)], aMinY, aMaxY, - // aWeight, aOverworld, aNether, aEnd); sWeight += this.mWeight; } } @@ -442,7 +427,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT { private String fString = "unset", ore1String = "unset", ore2String = "unset", ore3String = "unset", ore4String = "unset"; - Map<Materials, String> gtOreMap = new HashMap<Materials, String>(); + Map<Materials, String> gtOreMap = new HashMap<>(); public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, Block aMetaData, boolean isSmallOre, boolean air) { if (!air) { diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index 5c734f5a5e..bdc9de19db 100644 --- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java +++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java @@ -235,8 +235,7 @@ public class WorldGen_Ores { ORES.AGARDITE_LA, ORES.AGARDITE_CD); - public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<Long, WorldGen_GT_Ore_Layer>( - 1024); + public static Hashtable<Long, WorldGen_GT_Ore_Layer> validOreveins = new Hashtable<>(1024); static long ID = 0; diff --git a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 2951ed3a57..15fcd1fde4 100644 --- a/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java +++ b/src/main/java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -449,11 +449,11 @@ public class TeleporterDimensionMod extends Teleporter { while (iterator.hasNext()) { Long olong = (Long) iterator.next(); Teleporter.PortalPosition portalposition = (Teleporter.PortalPosition) this.destinationCoordinateCache - .getValueByKey(olong.longValue()); + .getValueByKey(olong); if (portalposition == null || portalposition.lastUpdateTime < j) { iterator.remove(); - this.destinationCoordinateCache.remove(olong.longValue()); + this.destinationCoordinateCache.remove(olong); } } } diff --git a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java index d08ec57054..317a31d997 100644 --- a/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java +++ b/src/main/java/gtPlusPlus/nei/DecayableRecipeHandler.java @@ -123,8 +123,8 @@ public class DecayableRecipeHandler extends TemplateRecipeHandler { } } - private final void sort() { - List<DecayableRecipeNEI> g = new ArrayList<DecayableRecipeNEI>(); + private void sort() { + List<DecayableRecipeNEI> g = new ArrayList<>(); for (CachedRecipe u : arecipes) { g.add((DecayableRecipeNEI) u); } diff --git a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java index 8192f11d61..f140045a4b 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -189,8 +189,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { public List<String> handleItemTooltip(final GuiRecipe<?> gui, final ItemStack aStack, final List<String> currenttip, final int aRecipeIndex) { final TemplateRecipeHandler.CachedRecipe tObject = this.arecipes.get(aRecipeIndex); - if ((tObject instanceof GasSpargingRecipeNEI)) { - final GasSpargingRecipeNEI tRecipe = (GasSpargingRecipeNEI) tObject; + if ((tObject instanceof final GasSpargingRecipeNEI tRecipe)) { ItemStack aSpargeInput = tRecipe.mOutputs.get(0).item; ItemStack aSpentFuel = tRecipe.mOutputs.get(1).item; for (final PositionedStack tStack : tRecipe.mOutputs) { @@ -249,7 +248,7 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { if (this.permutated) { return; } - final ArrayList<ItemStack> tDisplayStacks = new ArrayList<ItemStack>(); + final ArrayList<ItemStack> tDisplayStacks = new ArrayList<>(); for (final ItemStack tStack : this.items) { if (GT_Utility.isStackValid(tStack)) { if (tStack.getItemDamage() == 32767) { @@ -282,8 +281,8 @@ public class GT_NEI_LFTR_Sparging extends TemplateRecipeHandler { public class GasSpargingRecipeNEI extends CachedRecipe implements Comparable<CachedRecipe> { public final GasSpargingRecipe mRecipe; - public final List<PositionedStack> mOutputs = new ArrayList<PositionedStack>(); - public final List<PositionedStack> mInputs = new ArrayList<PositionedStack>(); + public final List<PositionedStack> mOutputs = new ArrayList<>(); + public final List<PositionedStack> mInputs = new ArrayList<>(); public GasSpargingRecipeNEI(GasSpargingRecipe tRecipe) { super(); diff --git a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java index fc02e86011..1cec4d33e1 100644 --- a/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java +++ b/src/main/java/gtPlusPlus/nei/handlers/NeiTextureHandler.java @@ -3,11 +3,9 @@ package gtPlusPlus.nei.handlers; import static gregtech.api.enums.Mods.GTPlusPlus; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.TextureManager; import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; @@ -53,18 +51,14 @@ public final class NeiTextureHandler { public static final ResourceLocation TEXTURE = new ResourceLocation( GTPlusPlus.ID + ":textures/gui/nei/widgets.png"); - public NeiTextureHandler(int x, int y) { - this(x, y, 16, 16); - } - public NeiTextureHandler(int x, int y, int width, int height) { this( - (double) width, - (double) height, - (double) ((float) (0.00390625D * (double) x)), - (double) ((float) (0.00390625D * (double) (x + width))), - (double) ((float) (0.00390625D * (double) y)), - (double) ((float) (0.00390625D * (double) (y + height)))); + width, + height, + (float) (0.00390625D * (double) x), + (float) (0.00390625D * (double) (x + width)), + (float) (0.00390625D * (double) y), + (float) (0.00390625D * (double) (y + height))); } public NeiTextureHandler(double width, double height, double minU, double maxU, double minV, double maxV) { @@ -76,14 +70,6 @@ public final class NeiTextureHandler { this.maxV = maxV; } - public void renderIcon(double x, double y) { - this.renderIcon(x, y, this.width, this.height, 0.0D, false); - } - - public void renderIcon(double x, double y, boolean doDraw) { - this.renderIcon(x, y, this.width, this.height, 0.0D, doDraw); - } - public void renderIcon(double x, double y, double width, double height, double zLevel, boolean doDraw) { this.renderIcon(x, y, width, height, zLevel, doDraw, false); } @@ -130,22 +116,6 @@ public final class NeiTextureHandler { return Minecraft.getMinecraft().renderEngine; } - public static void bindItemTexture(ItemStack stack) { - engine().bindTexture(stack.getItemSpriteNumber() == 0 ? BLOCK_TEX : ITEM_TEX); - } - - public static void bindItemTexture() { - engine().bindTexture(ITEM_TEX); - } - - public static void bindBlockTexture() { - engine().bindTexture(BLOCK_TEX); - } - - public static void bindGlintTexture() { - engine().bindTexture(BLOCK_TEX); - } - public static void bindTexture(String string) { engine().bindTexture(new ResourceLocation(string)); } @@ -154,7 +124,4 @@ public final class NeiTextureHandler { engine().bindTexture(tex); } - public static FontRenderer fontRenderer() { - return Minecraft.getMinecraft().fontRenderer; - } } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java index 4eb1b553c1..890a9020c9 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/AlgaeDefinition.java @@ -32,26 +32,18 @@ public enum AlgaeDefinition { } public static AlgaeDefinition getByIndex(int aIndex) { - switch (aIndex) { - default: - case 0: - return Euglenophyta; - case 1: - return Chrysophyta; - case 2: - return Pyrrophyta; - case 3: - return Chlorophyta; - case 4: - return Rhodophyta; - case 5: - return Paeophyta; - case 6: - return Xanthophyta; - } + return switch (aIndex) { + default -> Euglenophyta; + case 1 -> Chrysophyta; + case 2 -> Pyrrophyta; + case 3 -> Chlorophyta; + case 4 -> Rhodophyta; + case 5 -> Paeophyta; + case 6 -> Xanthophyta; + }; } - private static final int getRGB(int r, int g, int b) { + private static int getRGB(int r, int g, int b) { return AlgaeUtils.rgbtoHexValue(r, g, b); } } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java index f3125325ed..7194921650 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/BioRecipes.java @@ -96,23 +96,23 @@ public class BioRecipes { private static Fluid mButanol; private static Fluid mAcetone; - private static final ItemStack getGreenAlgaeRecipeChip() { + private static ItemStack getGreenAlgaeRecipeChip() { return getBioChip(4); } - private static final ItemStack getBrownAlgaeRecipeChip() { + private static ItemStack getBrownAlgaeRecipeChip() { return getBioChip(8); } - private static final ItemStack getGoldenBrownAlgaeRecipeChip() { + private static ItemStack getGoldenBrownAlgaeRecipeChip() { return getBioChip(12); } - private static final ItemStack getRedAlgaeRecipeChip() { + private static ItemStack getRedAlgaeRecipeChip() { return getBioChip(16); } - private static final ItemStack getBioChip(int aID) { + private static ItemStack getBioChip(int aID) { return ItemUtils.simpleMetaStack(AgriculturalChem.mBioCircuit, aID, 0); } @@ -126,7 +126,7 @@ public class BioRecipes { Logger.INFO("[Bio] Finished with recipes"); } - private static final void initRecipeVars() { + private static void initRecipeVars() { mFert = AgriculturalChem.dustOrganicFertilizer; mDustDirt = AgriculturalChem.dustDirt; @@ -454,13 +454,13 @@ public class BioRecipes { 16); } - public static final HashSet<GT_ItemStack> mFruits = new HashSet<GT_ItemStack>(); - public static final HashSet<GT_ItemStack> mVege = new HashSet<GT_ItemStack>(); - public static final HashSet<GT_ItemStack> mNuts = new HashSet<GT_ItemStack>(); - public static final HashSet<GT_ItemStack> mSeeds = new HashSet<GT_ItemStack>(); + public static final HashSet<GT_ItemStack> mFruits = new HashSet<>(); + public static final HashSet<GT_ItemStack> mVege = new HashSet<>(); + public static final HashSet<GT_ItemStack> mNuts = new HashSet<>(); + public static final HashSet<GT_ItemStack> mSeeds = new HashSet<>(); - public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<ItemStack>(); - public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<ItemStack>(); + public static final AutoMap<ItemStack> mList_Master_FruitVege = new AutoMap<>(); + public static final AutoMap<ItemStack> mList_Master_Seeds = new AutoMap<>(); private static void processFermentationOreDict() { processOreDictEntry("listAllfruit", mFruits); @@ -689,7 +689,7 @@ public class BioRecipes { private static void recipeAluminiumPellet() { // Ore Names, no prefix - AutoMap<String> aOreNames = new AutoMap<String>(); + AutoMap<String> aOreNames = new AutoMap<>(); aOreNames.put("Lazurite"); aOreNames.put("Bauxite"); @@ -702,11 +702,11 @@ public class BioRecipes { aOreNames.put("GreenSapphire"); // Voltage - HashMap<String, Integer> aOreData1 = new HashMap<String, Integer>(); + HashMap<String, Integer> aOreData1 = new HashMap<>(); // Input Count - HashMap<String, Integer> aOreData2 = new HashMap<String, Integer>(); + HashMap<String, Integer> aOreData2 = new HashMap<>(); // Output Count - HashMap<String, Integer> aOreData3 = new HashMap<String, Integer>(); + HashMap<String, Integer> aOreData3 = new HashMap<>(); aOreData1.put("Lazurite", 120); aOreData1.put("Bauxite", 90); @@ -737,7 +737,7 @@ public class BioRecipes { aOreData3.put("GreenSapphire", 2); // Assemble all valid crushed ore types for making pellet mix - HashMap<String, ItemStack> aOreCache = new HashMap<String, ItemStack>(); + HashMap<String, ItemStack> aOreCache = new HashMap<>(); for (String aOreName : aOreNames) { String aTemp = aOreName; aOreName = "crushedPurified" + aOreName; diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java index 22f1ef0b34..8ce137a323 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/IAlgalItem.java @@ -6,7 +6,7 @@ import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData; public interface IAlgalItem { - public abstract AlgaeDefinition getAlgaeType(ItemStack aStack); + AlgaeDefinition getAlgaeType(ItemStack aStack); - public abstract AlgaeGeneticData getSpeciesData(ItemStack aStack); + AlgaeGeneticData getSpeciesData(ItemStack aStack); } diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java index 0fab6a2c96..7b1fb2b148 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/item/algae/ItemAlgaeBase.java @@ -22,7 +22,6 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.plugin.agrichem.AlgaeDefinition; import gtPlusPlus.plugin.agrichem.IAlgalItem; import gtPlusPlus.plugin.agrichem.logic.AlgaeGeneticData; -import gtPlusPlus.plugin.agrichem.logic.AlgaeGrowthRequirement; public class ItemAlgaeBase extends Item implements IAlgalItem { @@ -211,7 +210,7 @@ public class ItemAlgaeBase extends Item implements IAlgalItem { aSpeed, aLifespan, 0, - new AutoMap<AlgaeGrowthRequirement>()); + new AutoMap<>()); aTag = aGenes.writeToNBT(); } } else { diff --git a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java index c59076f01d..c11877b672 100644 --- a/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java +++ b/src/main/java/gtPlusPlus/plugin/agrichem/logic/AlgaeGeneticData.java @@ -27,7 +27,7 @@ public class AlgaeGeneticData { private final AutoMap<AlgaeGrowthRequirement> mSpecialRequirements; public AlgaeGeneticData() { - this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<AlgaeGrowthRequirement>()); + this(true, true, true, true, (byte) 0, 1f, 1f, (byte) 30, 0, new AutoMap<>()); } public AlgaeGeneticData(boolean isDominant, boolean requiresLight, boolean isSalt, boolean isFresh, @@ -67,7 +67,7 @@ public class AlgaeGeneticData { mLifespan = aNBT.getByte("mLifespan"); mGeneration = aNBT.getInteger("mGeneration"); } - mSpecialRequirements = new AutoMap<AlgaeGrowthRequirement>(); + mSpecialRequirements = new AutoMap<>(); } /** diff --git a/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java index 4d87a746f3..b35ad2c063 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/interfaces/IBugFix.java @@ -2,5 +2,5 @@ package gtPlusPlus.plugin.fixes.interfaces; public interface IBugFix { - public boolean isFixValid(); + boolean isFixValid(); } diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java index f4c4df492e..2fa92951c7 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java @@ -13,7 +13,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.plugin.fixes.interfaces.IBugFix; -import gtPlusPlus.preloader.DevHelper; +import gtPlusPlus.preloader.CORE_Preloader; public class VanillaBedHeightFix implements IBugFix { @@ -22,25 +22,21 @@ public class VanillaBedHeightFix implements IBugFix { public VanillaBedHeightFix(IPlugin minstance) { mParent = minstance; - if (DevHelper.isValidHelperObject()) { - Method m; - if (DevHelper.isObfuscatedEnvironment()) { - m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class); - } else { - m = ReflectionUtils.getMethod( - net.minecraft.entity.player.EntityPlayer.class, - "sleepInBedAt", - int.class, - int.class, - int.class); - } - if (m != null) { - mSleepInBedAt = m; - mParent.log("Registering Bed Height Fix."); - Utils.registerEvent(this); - } else { - mSleepInBedAt = null; - } + Method m; + if (!CORE_Preloader.DEV_ENVIRONMENT) { + m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class); + } else { + m = ReflectionUtils.getMethod( + net.minecraft.entity.player.EntityPlayer.class, + "sleepInBedAt", + int.class, + int.class, + int.class); + } + if (m != null) { + mSleepInBedAt = m; + mParent.log("Registering Bed Height Fix."); + Utils.registerEvent(this); } else { mSleepInBedAt = null; } diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java index 98657b455f..ed1d9890d7 100644 --- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java +++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/music/MusicTocker.java @@ -62,13 +62,13 @@ public class MusicTocker extends MusicTicker implements Runnable { return false; } - private final void updateInternalNumber() { + private void updateInternalNumber() { if (ReflectionUtils.doesFieldExist(getClass(), "field_147676_d")) { ReflectionUtils.setField(this, "field_147676_d", mTimeUntilNextTrack); } } - private final void updateInternalSound(ISound aSound) { + private void updateInternalSound(ISound aSound) { if (ReflectionUtils.doesFieldExist(getClass(), "field_147678_c")) { ReflectionUtils.setField(this, "field_147678_c", aSound); } diff --git a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java index 72ec918d37..be1dafd231 100644 --- a/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java +++ b/src/main/java/gtPlusPlus/plugin/manager/Core_Manager.java @@ -7,7 +7,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class Core_Manager { - public static AutoMap<IPlugin> mPlugins = new AutoMap<IPlugin>(); + public static AutoMap<IPlugin> mPlugins = new AutoMap<>(); /** * @param plugin - Dynamically registers the plugin for loading. @@ -36,7 +36,7 @@ public class Core_Manager { } } return true; - } catch (Throwable t) {} + } catch (Throwable ignored) {} return false; } @@ -50,7 +50,7 @@ public class Core_Manager { } } return true; - } catch (Throwable t) {} + } catch (Throwable ignored) {} return false; } @@ -64,11 +64,11 @@ public class Core_Manager { } } return true; - } catch (Throwable t) {} + } catch (Throwable ignored) {} return false; } - public static boolean serverStart() { + public static void serverStart() { try { for (IPlugin h : mPlugins) { if (h.serverStart()) { @@ -77,12 +77,10 @@ public class Core_Manager { Logger.INFO("[Plugin] Failed during Server Start Phase for " + h.getPluginName() + "."); } } - return true; - } catch (Throwable t) {} - return false; + } catch (Throwable ignored) {} } - public static boolean serverStop() { + public static void serverStop() { try { for (IPlugin h : mPlugins) { if (h.serverStop()) { @@ -91,8 +89,6 @@ public class Core_Manager { Logger.INFO("[Plugin] Failed during Server Stop Phase for " + h.getPluginName() + "."); } } - return true; - } catch (Throwable t) {} - return false; + } catch (Throwable ignored) {} } } diff --git a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java b/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java index a382572db5..146c92764b 100644 --- a/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java +++ b/src/main/java/gtPlusPlus/preloader/CORE_Preloader.java @@ -26,7 +26,7 @@ public class CORE_Preloader { } static { - ArrayList<ArtifactVersion> deps = new ArrayList<ArtifactVersion>(); + ArrayList<ArtifactVersion> deps = new ArrayList<>(); // deps.add("required-before:gregtech;"); DEPENDENCIES = Collections.unmodifiableList(deps); } diff --git a/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java b/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java deleted file mode 100644 index 6c7f4075a8..0000000000 --- a/src/main/java/gtPlusPlus/preloader/ChunkDebugger.java +++ /dev/null @@ -1,61 +0,0 @@ -package gtPlusPlus.preloader; - -import java.util.LinkedHashMap; -import java.util.Map; - -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraft.world.World; -import net.minecraftforge.common.ForgeChunkManager.Ticket; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; - -public class ChunkDebugger { - - public static final Map<Integer, Pair<String, String>> mChunkTicketsMap = new LinkedHashMap<Integer, Pair<String, String>>(); - public static final Map<String, Pair<String, String>> mChunksLoadedByModsMap = new LinkedHashMap<String, Pair<String, String>>(); - - public static void storeTicketToCache(Ticket aTicket, World aWorld) { - mChunkTicketsMap.put( - aTicket.hashCode(), - new Pair<String, String>(aTicket.getModId(), "" + aTicket.world.provider.dimensionId)); - Logger.REFLECTION( - "Ticket created by " + aTicket.getModId() + " for dimension " + aTicket.world.provider.dimensionId); - } - - public static void storeLoadChunkToCache(Ticket aTicket, ChunkCoordIntPair aChunk) { - mChunksLoadedByModsMap.put(aChunk.toString(), new Pair<String, String>(aTicket.getModId(), aChunk.toString())); - Logger.REFLECTION( - "Chunk Loaded by " + aTicket.getModId() - + " at position " - + aChunk.toString() - + " for dimension " - + aTicket.world.provider.dimensionId); - } - - public static void removeTicketFromCache(Ticket aTicket) { - Pair<String, String> aPair = mChunkTicketsMap.get(aTicket.hashCode()); - String aKey = aPair.getKey(); - if (aKey == null) { - aKey = "Invalid ModId"; - } - Logger.REFLECTION("Ticket released by " + aKey + " for dimension " + aTicket.world.provider.dimensionId); - mChunkTicketsMap.remove(aTicket.hashCode()); - } - - public static void removeLoadedChunkFromCache(ChunkCoordIntPair aChunk) { - if (aChunk == null || aChunk.toString() == null) { - return; - } - Pair<String, String> aPair = mChunksLoadedByModsMap.get(aChunk.toString()); - if (aPair == null) { - return; - } - String aKey = aPair.getKey(); - String aValue = aPair.getValue(); - if (aKey != null && aValue != null) { - Logger.REFLECTION("Chunk Unloaded by " + aKey + " at position " + aChunk.toString() + ""); - } - mChunksLoadedByModsMap.remove(aChunk.toString()); - } -} diff --git a/src/main/java/gtPlusPlus/preloader/DevHelper.java b/src/main/java/gtPlusPlus/preloader/DevHelper.java deleted file mode 100644 index bc240b1b5d..0000000000 --- a/src/main/java/gtPlusPlus/preloader/DevHelper.java +++ /dev/null @@ -1,7317 +0,0 @@ -package gtPlusPlus.preloader; - -import java.io.IOException; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.launchwrapper.Launch; - -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.api.objects.data.weakref.WeakAutoMap; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class DevHelper { - - private static final DevHelper mInstance; - public static final boolean mIsValidHelper; - - static { - mInstance = new DevHelper(); - if (DevHelperInternals.init()) { - mIsValidHelper = true; - } else { - mIsValidHelper = false; - } - } - - public DevHelper() {} - - public static boolean isObfuscatedEnvironment() { - // Are we in a 'decompiled' environment? - boolean deobfuscatedEnvironment = false; - byte[] bs; - try { - bs = Launch.classLoader.getClassBytes("net.minecraft.world.World"); - if (bs != null) { - deobfuscatedEnvironment = true; - } else { - deobfuscatedEnvironment = false; - } - } catch (IOException e) {} - return !deobfuscatedEnvironment; - } - - @SuppressWarnings("rawtypes") - public static Method getForgeMethod(Class c, String s, Class... varags) { - String s1, s2; - Method a, b; - s1 = s; - s2 = getSRG(s); - try { - a = ReflectionUtils.getMethod(c, s1, varags); - if (a != null) { - return a; - } else { - b = ReflectionUtils.getMethod(c, s2, varags); - if (b != null) { - return b; - } - } - } catch (Exception e) {} - return null; - } - - private static final synchronized DevHelper getInstance() { - return mInstance; - } - - public static final synchronized boolean isValidHelperObject() { - return mIsValidHelper; - } - - public static String getSRG(String mForgeName) { - String aSRG = DevHelperInternals.forgeToSrg.get(mForgeName); - return aSRG != null ? aSRG : "BAD_SRG_NAME"; - } - - public static String getForge(String mSrgName) { - String aForgeName = DevHelperInternals.srgToForge.get(mSrgName); - return aForgeName != null ? aForgeName : "BAD_FORGE_NAME"; - } - - public static String getMinecraftClassName(String adeObName, boolean obfuscated) { - if (obfuscated) { - return getObfuscated(adeObName); - } - return adeObName; - } - - public static String getObfuscated(String mDeob) { - String obfuscatedClassname = DevHelperInternals.deObToOb.get(mDeob); - obfuscatedClassname = obfuscatedClassname != null ? obfuscatedClassname : "BAD_OBFUSCATED_CLASS_NAME"; - if (obfuscatedClassname.equals("BAD_OBFUSCATED_CLASS_NAME")) { - Preloader_Logger.INFO("[Fix] Failed to Get Deobfuscated name for " + mDeob); - } - return obfuscatedClassname; - } - - public static String getDeobfuscated(String mOb) { - String deobfuscatedClassname = DevHelperInternals.obToDeOb.get(mOb); - return deobfuscatedClassname != null ? deobfuscatedClassname : "BAD_DEOBFUSCATED_CLASS_NAME"; - } - - public static class DevHelperInternals { - - public static final Map<String, String> srgToForge = new HashMap<String, String>(); - public static final Map<String, String> forgeToSrg = new HashMap<String, String>(); - private static WeakAutoMap<Pair<String, String>> mInitMap = new WeakAutoMap<Pair<String, String>>(); - - // Obfuscation - public static final Map<String, String> obToDeOb = new HashMap<String, String>(); - public static final Map<String, String> deObToOb = new HashMap<String, String>(); - private static WeakAutoMap<Pair<String, String>> mObInitMap = new WeakAutoMap<Pair<String, String>>(); - - private static boolean init() { - init1(); - init2(); - init3(); - init4(); - if (mInitMap.size() > 0) { - for (Pair<String, String> p : mInitMap) { - if (p != null) { - String srg = p.getKey(); - String forge = p.getValue(); - srgToForge.put(srg, forge); - forgeToSrg.put(forge, srg); - } - } - } - - if (mObInitMap.size() > 0) { - for (Pair<String, String> p : mObInitMap) { - if (p != null) { - String ob = p.getKey(); - String deOb = p.getValue(); - obToDeOb.put(ob, deOb); - deObToOb.put(deOb, ob); - } - } - } - Preloader_Logger.INFO("[DevHelper] mInitMap size: " + mInitMap.size()); - Preloader_Logger.INFO("[DevHelper] mObInitMap size: " + mObInitMap.size()); - - Preloader_Logger.INFO("[DevHelper] srgToForge size: " + srgToForge.size()); - Preloader_Logger.INFO("[DevHelper] forgeToSrg size: " + forgeToSrg.size()); - Preloader_Logger.INFO("[DevHelper] obToDeOb size: " + obToDeOb.size()); - Preloader_Logger.INFO("[DevHelper] deObToOb size: " + deObToOb.size()); - - if (srgToForge.size() > 0 && forgeToSrg.size() > 0 && obToDeOb.size() > 0 && deObToOb.size() > 0) { - if (srgToForge.size() == forgeToSrg.size() && obToDeOb.size() == deObToOb.size()) { - return true; - } else { - if (srgToForge.size() != forgeToSrg.size()) { - int aKey1 = 0; - int aKey2 = 0; - HashMap<Integer, String> aMissingForgeNames = new HashMap<Integer, String>(); - HashMap<Integer, String> aMissingSrgNames = new HashMap<Integer, String>(); - Preloader_Logger.INFO("Mismatch between mapped Forge and Srg names, finding missing values."); - if (srgToForge.size() > forgeToSrg.size()) { - Preloader_Logger.INFO("More SRG Keys detected."); - for (String aKey : srgToForge.keySet()) { - if (!forgeToSrg.containsValue(aKey)) { - aMissingSrgNames.put(aKey1++, aKey); - } - } - } else if (srgToForge.size() < forgeToSrg.size()) { - Preloader_Logger.INFO("More Forge Keys detected."); - for (String aKey : forgeToSrg.keySet()) { - if (!srgToForge.containsValue(aKey)) { - aMissingForgeNames.put(aKey2++, aKey); - } - } - } - if (!aMissingForgeNames.isEmpty()) { - for (String missingVal : aMissingForgeNames.values()) { - // Preloader_Logger.WARNING("Missing Forge value: "+missingVal); - } - } - if (!aMissingSrgNames.isEmpty()) { - for (String missingVal : aMissingSrgNames.values()) { - // Preloader_Logger.WARNING("Missing SRG value: "+missingVal); - } - } - } - if (obToDeOb.size() != deObToOb.size()) { - int aKey1 = 0; - int aKey2 = 0; - HashMap<Integer, String> aMissingObfNames = new HashMap<Integer, String>(); - HashMap<Integer, String> aMissingDeObfNames = new HashMap<Integer, String>(); - Preloader_Logger.INFO( - "Mismatch between mapped Obfuscated and Deobfuscated names, finding missing values."); - if (obToDeOb.size() > deObToOb.size()) { - Preloader_Logger.INFO("More Obfuscated Keys detected."); - for (String aKey : obToDeOb.keySet()) { - if (!deObToOb.containsValue(aKey)) { - aMissingObfNames.put(aKey1++, aKey); - } - } - } else if (obToDeOb.size() < deObToOb.size()) { - Preloader_Logger.INFO("More Deobfuscated Keys detected."); - for (String aKey : deObToOb.keySet()) { - if (!obToDeOb.containsValue(aKey)) { - aMissingDeObfNames.put(aKey2++, aKey); - } - } - } - if (!aMissingObfNames.isEmpty()) { - for (String missingVal : aMissingObfNames.values()) { - Preloader_Logger.WARNING("Missing Obfuscated value: " + missingVal); - } - } - if (!aMissingDeObfNames.isEmpty()) { - for (String missingVal : aMissingDeObfNames.values()) { - Preloader_Logger.WARNING("Missing Deobfuscated value: " + missingVal); - } - } - } - } - } - - // return true anyway as some keys will mismatch. - return true; - } - - private static void init1() { - mInitMap.put(new Pair<String, String>("func_100011_g", "getIsPotionDurationMax")); - mInitMap.put(new Pair<String, String>("func_100012_b", "setPotionDurationMax")); - mInitMap.put(new Pair<String, String>("func_100015_a", "isKeyDown")); - mInitMap.put(new Pair<String, String>("func_102007_a", "canInsertItem")); - mInitMap.put(new Pair<String, String>("func_102008_b", "canExtractItem")); - mInitMap.put(new Pair<String, String>("func_104002_bU", "isNoDespawnRequired")); - mInitMap.put(new Pair<String, String>("func_104055_i", "setForceGamemode")); - mInitMap.put(new Pair<String, String>("func_104056_am", "getForceGamemode")); - mInitMap.put(new Pair<String, String>("func_104112_b", "saveExtraData")); - mInitMap.put(new Pair<String, String>("func_104140_m", "saveChunkData")); - mInitMap.put(new Pair<String, String>("func_110123_P", "onChunkLoad")); - mInitMap.put(new Pair<String, String>("func_110124_au", "getUniqueID")); - mInitMap.put(new Pair<String, String>("func_110125_a", "setParticleIcon")); - mInitMap.put(new Pair<String, String>("func_110128_b", "onBroken")); - mInitMap.put(new Pair<String, String>("func_110130_b", "getKnotForBlock")); - mInitMap.put(new Pair<String, String>("func_110131_b", "removeFrameFromMap")); - mInitMap.put(new Pair<String, String>("func_110138_aP", "getMaxHealth")); - mInitMap.put(new Pair<String, String>("func_110139_bj", "getAbsorptionAmount")); - mInitMap.put(new Pair<String, String>("func_110140_aT", "getAttributeMap")); - mInitMap.put(new Pair<String, String>("func_110142_aN", "getCombatTracker")); - mInitMap.put(new Pair<String, String>("func_110143_aJ", "getHealth")); - mInitMap.put(new Pair<String, String>("func_110144_aD", "getLastAttacker")); - mInitMap.put(new Pair<String, String>("func_110145_l", "dismountEntity")); - mInitMap.put(new Pair<String, String>("func_110147_ax", "applyEntityAttributes")); - mInitMap.put(new Pair<String, String>("func_110148_a", "getEntityAttribute")); - mInitMap.put(new Pair<String, String>("func_110149_m", "setAbsorptionAmount")); - mInitMap.put(new Pair<String, String>("func_110159_bB", "updateLeashedState")); - mInitMap.put(new Pair<String, String>("func_110160_i", "clearLeashed")); - mInitMap.put(new Pair<String, String>("func_110161_a", "onSpawnWithEgg")); - mInitMap.put(new Pair<String, String>("func_110162_b", "setLeashedToEntity")); - mInitMap.put(new Pair<String, String>("func_110163_bv", "enablePersistence")); - mInitMap.put(new Pair<String, String>("func_110164_bC", "allowLeashing")); - mInitMap.put(new Pair<String, String>("func_110165_bF", "recreateLeash")); - mInitMap.put(new Pair<String, String>("func_110166_bE", "getLeashedToEntity")); - mInitMap.put(new Pair<String, String>("func_110167_bD", "getLeashed")); - mInitMap.put(new Pair<String, String>("func_110171_b", "setHomeArea")); - mInitMap.put(new Pair<String, String>("func_110172_bL", "getHomePosition")); - mInitMap.put(new Pair<String, String>("func_110173_bK", "isWithinHomeDistanceCurrentPosition")); - mInitMap.put(new Pair<String, String>("func_110174_bM", "getMaximumHomeDistance")); - mInitMap.put(new Pair<String, String>("func_110175_bO", "hasHome")); - mInitMap.put(new Pair<String, String>("func_110176_b", "isWithinHomeDistance")); - mInitMap.put(new Pair<String, String>("func_110177_bN", "detachHome")); - mInitMap.put(new Pair<String, String>("func_110195_a", "addGrowth")); - mInitMap.put(new Pair<String, String>("func_110198_t", "increaseTemper")); - mInitMap.put(new Pair<String, String>("func_110199_f", "openGUI")); - mInitMap.put(new Pair<String, String>("func_110200_cJ", "canMate")); - mInitMap.put(new Pair<String, String>("func_110202_bQ", "getHorseVariant")); - mInitMap.put(new Pair<String, String>("func_110204_cc", "isEatingHaystack")); - mInitMap.put(new Pair<String, String>("func_110206_u", "setJumpPower")); - mInitMap.put(new Pair<String, String>("func_110207_m", "setChested")); - mInitMap.put(new Pair<String, String>("func_110208_b", "setHorseWatchableBoolean")); - mInitMap.put(new Pair<String, String>("func_110209_cd", "isRearing")); - mInitMap.put(new Pair<String, String>("func_110212_cp", "getVariantTexturePaths")); - mInitMap.put(new Pair<String, String>("func_110214_p", "setHorseType")); - mInitMap.put(new Pair<String, String>("func_110215_cj", "getHorseJumpStrength")); - mInitMap.put(new Pair<String, String>("func_110216_r", "spawnHorseParticles")); - mInitMap.put(new Pair<String, String>("func_110217_cl", "getAngrySoundName")); - mInitMap.put(new Pair<String, String>("func_110218_cm", "getMaxTemper")); - mInitMap.put(new Pair<String, String>("func_110219_q", "setRearing")); - mInitMap.put(new Pair<String, String>("func_110220_cK", "makeHorseRear")); - mInitMap.put(new Pair<String, String>("func_110221_n", "setHasReproduced")); - mInitMap.put(new Pair<String, String>("func_110222_cv", "isSterile")); - mInitMap.put(new Pair<String, String>("func_110223_p", "getRearingAmount")); - mInitMap.put(new Pair<String, String>("func_110224_ci", "dropChests")); - mInitMap.put(new Pair<String, String>("func_110227_p", "setEatingHaystack")); - mInitMap.put(new Pair<String, String>("func_110228_bR", "isAdultHorse")); - mInitMap.put(new Pair<String, String>("func_110229_cs", "canCarryChest")); - mInitMap.put(new Pair<String, String>("func_110231_cz", "makeHorseRearWithSound")); - mInitMap.put(new Pair<String, String>("func_110233_w", "getHorseWatchableBoolean")); - mInitMap.put(new Pair<String, String>("func_110234_j", "setHorseTamed")); - mInitMap.put(new Pair<String, String>("func_110235_q", "setHorseVariant")); - mInitMap.put(new Pair<String, String>("func_110238_s", "setTemper")); - mInitMap.put(new Pair<String, String>("func_110240_a", "dropItemsInChest")); - mInitMap.put(new Pair<String, String>("func_110243_cf", "getHasReproduced")); - mInitMap.put(new Pair<String, String>("func_110244_cA", "dropChestItems")); - mInitMap.put(new Pair<String, String>("func_110246_bZ", "isHorseJumping")); - mInitMap.put(new Pair<String, String>("func_110247_cG", "setHorseTexturePaths")); - mInitMap.put(new Pair<String, String>("func_110248_bS", "isTame")); - mInitMap.put(new Pair<String, String>("func_110249_cI", "openHorseMouth")); - mInitMap.put(new Pair<String, String>("func_110250_a", "getClosestHorse")); - mInitMap.put(new Pair<String, String>("func_110251_o", "setHorseSaddled")); - mInitMap.put(new Pair<String, String>("func_110252_cg", "getTemper")); - mInitMap.put(new Pair<String, String>("func_110254_bY", "getHorseSize")); - mInitMap.put(new Pair<String, String>("func_110255_k", "setHorseJumping")); - mInitMap.put(new Pair<String, String>("func_110256_cu", "isUndead")); - mInitMap.put(new Pair<String, String>("func_110257_ck", "isHorseSaddled")); - mInitMap.put(new Pair<String, String>("func_110258_o", "getGrassEatingAmount")); - mInitMap.put(new Pair<String, String>("func_110259_cr", "canWearArmor")); - mInitMap.put(new Pair<String, String>("func_110260_d", "getHorseArmorIndex")); - mInitMap.put(new Pair<String, String>("func_110261_ca", "isChested")); - mInitMap.put(new Pair<String, String>("func_110262_ch", "prepareChunkForSpawn")); - mInitMap.put(new Pair<String, String>("func_110263_g", "setTamedBy")); - mInitMap.put(new Pair<String, String>("func_110264_co", "getHorseTexture")); - mInitMap.put(new Pair<String, String>("func_110265_bP", "getHorseType")); - mInitMap.put(new Pair<String, String>("func_110297_a_", "verifySellingItem")); - mInitMap.put(new Pair<String, String>("func_110298_a", "displayGUIHorse")); - mInitMap.put(new Pair<String, String>("func_110303_q", "getLocationCape")); - mInitMap.put(new Pair<String, String>("func_110304_a", "getDownloadImageSkin")); - mInitMap.put(new Pair<String, String>("func_110306_p", "getLocationSkin")); - mInitMap.put(new Pair<String, String>("func_110311_f", "getLocationSkin")); - mInitMap.put(new Pair<String, String>("func_110317_t", "isRidingHorse")); - mInitMap.put(new Pair<String, String>("func_110318_g", "sendHorseJump")); - mInitMap.put(new Pair<String, String>("func_110319_bJ", "getHorseJumpPower")); - mInitMap.put(new Pair<String, String>("func_110322_i", "sendHorseInteraction")); - mInitMap.put(new Pair<String, String>("func_110326_a", "setRecordPlaying")); - mInitMap.put(new Pair<String, String>("func_110327_a", "renderIcons")); - mInitMap.put(new Pair<String, String>("func_110430_a", "setEntityActionState")); - mInitMap.put(new Pair<String, String>("func_110432_I", "getSession")); - mInitMap.put(new Pair<String, String>("func_110434_K", "getTextureManager")); - mInitMap.put(new Pair<String, String>("func_110435_P", "addDefaultResourcePack")); - mInitMap.put(new Pair<String, String>("func_110436_a", "refreshResources")); - mInitMap.put(new Pair<String, String>("func_110437_J", "getProxy")); - mInitMap.put(new Pair<String, String>("func_110438_M", "getResourcePackRepository")); - mInitMap.put(new Pair<String, String>("func_110441_Q", "updateDisplayMode")); - mInitMap.put(new Pair<String, String>("func_110442_L", "getResourceManager")); - mInitMap.put(new Pair<String, String>("func_110454_ao", "getServerProxy")); - mInitMap.put(new Pair<String, String>("func_110455_j", "getOpPermissionLevel")); - mInitMap.put(new Pair<String, String>("func_110462_b", "getPackFormat")); - mInitMap.put(new Pair<String, String>("func_110468_c", "getFrameIndex")); - mInitMap.put(new Pair<String, String>("func_110469_d", "getFrameTime")); - mInitMap.put(new Pair<String, String>("func_110470_b", "frameHasTime")); - mInitMap.put(new Pair<String, String>("func_110471_a", "getFrameHeight")); - mInitMap.put(new Pair<String, String>("func_110472_a", "getFrameTimeSingle")); - mInitMap.put(new Pair<String, String>("func_110473_c", "getFrameCount")); - mInitMap.put(new Pair<String, String>("func_110474_b", "getFrameWidth")); - mInitMap.put(new Pair<String, String>("func_110479_a", "getTextureBlur")); - mInitMap.put(new Pair<String, String>("func_110480_b", "getTextureClamp")); - mInitMap.put(new Pair<String, String>("func_110483_a", "getSectionName")); - mInitMap.put(new Pair<String, String>("func_110492_a", "parseAnimationFrame")); - mInitMap.put(new Pair<String, String>("func_110495_a", "hasNoTime")); - mInitMap.put(new Pair<String, String>("func_110496_c", "getFrameIndex")); - mInitMap.put(new Pair<String, String>("func_110497_b", "getFrameTime")); - mInitMap.put(new Pair<String, String>("func_110503_a", "parseMetadataSection")); - mInitMap.put(new Pair<String, String>("func_110504_a", "registerMetadataSectionType")); - mInitMap.put(new Pair<String, String>("func_110505_a", "getGson")); - mInitMap.put(new Pair<String, String>("func_110514_c", "getResourcePack")); - mInitMap.put(new Pair<String, String>("func_110515_d", "getResourcePackName")); - mInitMap.put(new Pair<String, String>("func_110516_a", "updateResourcePack")); - mInitMap.put(new Pair<String, String>("func_110517_b", "closeResourcePack")); - mInitMap.put(new Pair<String, String>("func_110518_a", "bindTexturePackIcon")); - mInitMap.put(new Pair<String, String>("func_110519_e", "getTexturePackDescription")); - mInitMap.put(new Pair<String, String>("func_110526_a", "getMetadata")); - mInitMap.put(new Pair<String, String>("func_110527_b", "getInputStream")); - mInitMap.put(new Pair<String, String>("func_110528_c", "hasMetadata")); - mInitMap.put(new Pair<String, String>("func_110536_a", "getResource")); - mInitMap.put(new Pair<String, String>("func_110537_b", "getLocationMcmeta")); - mInitMap.put(new Pair<String, String>("func_110538_a", "addResourcePack")); - mInitMap.put(new Pair<String, String>("func_110541_a", "reloadResources")); - mInitMap.put(new Pair<String, String>("func_110542_a", "registerReloadListener")); - mInitMap.put(new Pair<String, String>("func_110543_a", "clearResources")); - mInitMap.put(new Pair<String, String>("func_110544_b", "notifyReloadListeners")); - mInitMap.put(new Pair<String, String>("func_110545_a", "reloadResourcePack")); - mInitMap.put(new Pair<String, String>("func_110549_a", "onResourceManagerReload")); - mInitMap.put(new Pair<String, String>("func_110550_d", "tick")); - mInitMap.put(new Pair<String, String>("func_110551_a", "loadTexture")); - mInitMap.put(new Pair<String, String>("func_110552_b", "getGlTextureId")); - mInitMap.put(new Pair<String, String>("func_110564_a", "updateDynamicTexture")); - mInitMap.put(new Pair<String, String>("func_110565_c", "getTextureData")); - mInitMap.put(new Pair<String, String>("func_110569_e", "initMissingImage")); - mInitMap.put(new Pair<String, String>("func_110571_b", "loadTextureAtlas")); - mInitMap.put(new Pair<String, String>("func_110572_b", "getAtlasSprite")); - mInitMap.put(new Pair<String, String>("func_110573_f", "registerIcons")); - mInitMap.put(new Pair<String, String>("func_110577_a", "bindTexture")); - mInitMap.put(new Pair<String, String>("func_110578_a", "getDynamicTextureLocation")); - mInitMap.put(new Pair<String, String>("func_110579_a", "loadTexture")); - mInitMap.put(new Pair<String, String>("func_110580_a", "loadTickableTexture")); - mInitMap.put(new Pair<String, String>("func_110581_b", "getTexture")); - mInitMap.put(new Pair<String, String>("func_110586_a", "getPackImage")); - mInitMap.put(new Pair<String, String>("func_110587_b", "getResourceDomains")); - mInitMap.put(new Pair<String, String>("func_110589_b", "resourceExists")); - mInitMap.put(new Pair<String, String>("func_110590_a", "getInputStream")); - mInitMap.put(new Pair<String, String>("func_110591_a", "getInputStreamByName")); - mInitMap.put(new Pair<String, String>("func_110592_c", "locationToName")); - mInitMap.put(new Pair<String, String>("func_110593_b", "hasResourceName")); - mInitMap.put(new Pair<String, String>("func_110594_c", "logNameNotLowercase")); - mInitMap.put(new Pair<String, String>("func_110595_a", "getRelativeName")); - mInitMap.put(new Pair<String, String>("func_110596_a", "readMetadata")); - mInitMap.put(new Pair<String, String>("func_110599_c", "getResourcePackZipFile")); - mInitMap.put(new Pair<String, String>("func_110605_c", "getResourceStream")); - mInitMap.put(new Pair<String, String>("func_110609_b", "getRepositoryEntriesAll")); - mInitMap.put(new Pair<String, String>("func_110611_a", "updateRepositoryEntriesAll")); - mInitMap.put(new Pair<String, String>("func_110612_e", "getDirResourcepacks")); - mInitMap.put(new Pair<String, String>("func_110613_c", "getRepositoryEntries")); - mInitMap.put(new Pair<String, String>("func_110614_g", "getResourcePackFiles")); - mInitMap.put(new Pair<String, String>("func_110616_f", "fixDirResourcepacks")); - mInitMap.put(new Pair<String, String>("func_110623_a", "getResourcePath")); - mInitMap.put(new Pair<String, String>("func_110624_b", "getResourceDomain")); - mInitMap.put(new Pair<String, String>("func_110646_a", "getTextWithoutFormattingCodes")); - mInitMap.put(new Pair<String, String>("func_110647_a", "getOSType")); - mInitMap.put(new Pair<String, String>("func_110661_a", "parseDouble")); - mInitMap.put(new Pair<String, String>("func_110662_c", "parseBoolean")); - mInitMap.put(new Pair<String, String>("func_110664_a", "parseDouble")); - mInitMap.put(new Pair<String, String>("func_110665_a", "clamp_double")); - mInitMap.put(new Pair<String, String>("func_110666_a", "clamp_coord")); - mInitMap.put(new Pair<String, String>("func_110682_a", "setBoxRotation")); - mInitMap.put(new Pair<String, String>("func_110683_a", "updateHorseRotation")); - mInitMap.put(new Pair<String, String>("func_110738_j", "isRidingHorse")); - mInitMap.put(new Pair<String, String>("func_110775_a", "getEntityTexture")); - mInitMap.put(new Pair<String, String>("func_110776_a", "bindTexture")); - mInitMap.put(new Pair<String, String>("func_110777_b", "bindEntityTexture")); - mInitMap.put(new Pair<String, String>("func_110813_b", "canRenderName")); - mInitMap.put(new Pair<String, String>("func_110934_a", "addSprite")); - mInitMap.put(new Pair<String, String>("func_110935_a", "getCurrentWidth")); - mInitMap.put(new Pair<String, String>("func_110936_b", "getCurrentHeight")); - mInitMap.put(new Pair<String, String>("func_110966_b", "setIconWidth")); - mInitMap.put(new Pair<String, String>("func_110967_i", "getOriginY")); - mInitMap.put(new Pair<String, String>("func_110968_a", "setFramesTextureData")); - mInitMap.put(new Pair<String, String>("func_110969_c", "setIconHeight")); - mInitMap.put(new Pair<String, String>("func_110970_k", "getFrameCount")); - mInitMap.put(new Pair<String, String>("func_110971_a", "initSprite")); - mInitMap.put(new Pair<String, String>("func_110985_a", "updateAnaglyph")); - mInitMap.put(new Pair<String, String>("func_110986_a", "readImageData")); - mInitMap.put(new Pair<String, String>("func_110987_a", "uploadTextureImage")); - mInitMap.put(new Pair<String, String>("func_110988_a", "uploadTexture")); - mInitMap.put(new Pair<String, String>("func_110989_a", "uploadTextureImageAllocate")); - mInitMap.put(new Pair<String, String>("func_110990_a", "copyToBuffer")); - mInitMap.put(new Pair<String, String>("func_110991_a", "allocateTexture")); - mInitMap.put(new Pair<String, String>("func_110993_a", "uploadTextureImageSubImpl")); - mInitMap.put(new Pair<String, String>("func_110994_a", "copyToBufferPos")); - mInitMap.put(new Pair<String, String>("func_110995_a", "uploadTextureImageSub")); - mInitMap.put(new Pair<String, String>("func_110996_a", "glGenTextures")); - mInitMap.put(new Pair<String, String>("func_110997_a", "setTextureClamped")); - mInitMap.put(new Pair<String, String>("func_111108_a", "getAttributeUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_111109_a", "clampValue")); - mInitMap.put(new Pair<String, String>("func_111110_b", "getDefaultValue")); - mInitMap.put(new Pair<String, String>("func_111111_c", "getShouldWatch")); - mInitMap.put(new Pair<String, String>("func_111112_a", "setShouldWatch")); - mInitMap.put(new Pair<String, String>("func_111116_f", "getDescription")); - mInitMap.put(new Pair<String, String>("func_111117_a", "setDescription")); - mInitMap.put(new Pair<String, String>("func_111121_a", "applyModifier")); - mInitMap.put(new Pair<String, String>("func_111123_a", "getAttribute")); - mInitMap.put(new Pair<String, String>("func_111124_b", "removeModifier")); - mInitMap.put(new Pair<String, String>("func_111125_b", "getBaseValue")); - mInitMap.put(new Pair<String, String>("func_111126_e", "getAttributeValue")); - mInitMap.put(new Pair<String, String>("func_111127_a", "getModifier")); - mInitMap.put(new Pair<String, String>("func_111128_a", "setBaseValue")); - mInitMap.put(new Pair<String, String>("func_111129_g", "computeValue")); - mInitMap.put(new Pair<String, String>("func_111130_a", "getModifiersByOperation")); - mInitMap.put(new Pair<String, String>("func_111131_f", "flagForUpdate")); - mInitMap.put(new Pair<String, String>("func_111145_d", "getWatchableObjectFloat")); - mInitMap.put(new Pair<String, String>("func_111146_a", "getAllAttributes")); - mInitMap.put(new Pair<String, String>("func_111147_b", "applyAttributeModifiers")); - mInitMap.put(new Pair<String, String>("func_111148_a", "removeAttributeModifiers")); - mInitMap.put(new Pair<String, String>("func_111149_a", "addAttributeInstance")); - mInitMap.put(new Pair<String, String>("func_111150_b", "registerAttribute")); - mInitMap.put(new Pair<String, String>("func_111151_a", "getAttributeInstance")); - mInitMap.put(new Pair<String, String>("func_111152_a", "getAttributeInstanceByName")); - mInitMap.put(new Pair<String, String>("func_111160_c", "getWatchedAttributes")); - mInitMap.put(new Pair<String, String>("func_111161_b", "getAttributeInstanceSet")); - mInitMap.put(new Pair<String, String>("func_111164_d", "getAmount")); - mInitMap.put(new Pair<String, String>("func_111165_e", "isSaved")); - mInitMap.put(new Pair<String, String>("func_111166_b", "getName")); - mInitMap.put(new Pair<String, String>("func_111167_a", "getID")); - mInitMap.put(new Pair<String, String>("func_111168_a", "setSaved")); - mInitMap.put(new Pair<String, String>("func_111169_c", "getOperation")); - mInitMap.put(new Pair<String, String>("func_111175_f", "getTargetDistance")); - mInitMap.put(new Pair<String, String>("func_111184_a", "registerPotionAttributeModifier")); - mInitMap.put(new Pair<String, String>("func_111185_a", "applyAttributesModifiersToEntity")); - mInitMap.put(new Pair<String, String>("func_111187_a", "removeAttributesModifiersFromEntity")); - mInitMap.put(new Pair<String, String>("func_111190_b", "sendMetadataToAllAssociatedPlayers")); - mInitMap.put(new Pair<String, String>("func_111194_a", "processChunk")); - mInitMap.put(new Pair<String, String>("func_111196_a", "increaseInhabitedTime")); - mInitMap.put(new Pair<String, String>("func_111205_h", "getItemAttributeModifiers")); - mInitMap.put(new Pair<String, String>("func_111206_d", "setTextureName")); - mInitMap.put(new Pair<String, String>("func_111207_a", "itemInteractionForEntity")); - mInitMap.put(new Pair<String, String>("func_111208_A", "getIconString")); - mInitMap.put(new Pair<String, String>("func_111225_m", "getRelevantEnchantmentTypes")); - mInitMap.put(new Pair<String, String>("func_111229_a", "setRelevantEnchantmentTypes")); - mInitMap.put(new Pair<String, String>("func_111238_b", "canBeHovered")); - mInitMap.put(new Pair<String, String>("func_111257_a", "writeBaseAttributeMapToNBT")); - mInitMap.put(new Pair<String, String>("func_111258_a", "applyModifiersToAttributeInstance")); - mInitMap.put(new Pair<String, String>("func_111259_a", "readAttributeModifierFromNBT")); - mInitMap.put(new Pair<String, String>("func_111261_a", "writeAttributeInstanceToNBT")); - mInitMap.put(new Pair<String, String>("func_111262_a", "writeAttributeModifierToNBT")); - mInitMap.put(new Pair<String, String>("func_111269_d", "getPathSearchRange")); - mInitMap.put(new Pair<String, String>("func_111270_a", "union")); - mInitMap.put(new Pair<String, String>("func_111271_a", "getUnicodePageLocation")); - mInitMap.put(new Pair<String, String>("func_111272_d", "readFontTexture")); - mInitMap.put(new Pair<String, String>("func_111282_a", "interactWithEntity")); - mInitMap.put(new Pair<String, String>("func_111283_C", "getAttributeModifiers")); - mInitMap.put(new Pair<String, String>("func_111285_a", "getUsername")); - mInitMap.put(new Pair<String, String>("func_111286_b", "getSessionID")); - mInitMap.put(new Pair<String, String>("func_120011_ar", "setGuiEnabled")); - mInitMap.put(new Pair<String, String>("func_120016_a", "createServerGui")); - mInitMap.put(new Pair<String, String>("func_120018_d", "getLogComponent")); - mInitMap.put(new Pair<String, String>("func_120019_b", "getStatsComponent")); - mInitMap.put(new Pair<String, String>("func_120020_c", "getPlayerListComponent")); - mInitMap.put(new Pair<String, String>("func_130001_d", "getCurrentMoonPhaseFactor")); - mInitMap.put(new Pair<String, String>("func_130002_c", "interactFirst")); - mInitMap.put(new Pair<String, String>("func_130010_a", "getOriginX")); - mInitMap.put(new Pair<String, String>("func_130011_c", "setLastAttacker")); - mInitMap.put(new Pair<String, String>("func_130014_f_", "getEntityWorld")); - mInitMap.put(new Pair<String, String>("func_130071_aq", "getCurrentTimeMillis")); - mInitMap.put(new Pair<String, String>("func_130072_d", "getAnimationFrame")); - mInitMap.put(new Pair<String, String>("func_130073_e", "getFrameIndexSet")); - mInitMap.put(new Pair<String, String>("func_130077_b", "getPackName")); - mInitMap.put(new Pair<String, String>("func_130086_a", "getTextureType")); - mInitMap.put(new Pair<String, String>("func_130087_a", "getResourceLocation")); - mInitMap.put(new Pair<String, String>("func_130088_a", "loadTextureMap")); - mInitMap.put(new Pair<String, String>("func_130098_m", "hasAnimationMetadata")); - mInitMap.put(new Pair<String, String>("func_130099_d", "allocateFrameTextureData")); - mInitMap.put(new Pair<String, String>("func_130102_n", "resetSprite")); - mInitMap.put(new Pair<String, String>("func_130103_l", "clearFramesTextureData")); - mInitMap.put(new Pair<String, String>("func_130105_g", "getMinecraftStartTimeMillis")); - mInitMap.put(new Pair<String, String>("func_135016_M", "getLanguageManager")); - mInitMap.put(new Pair<String, String>("func_135018_a", "getLanguages")); - mInitMap.put(new Pair<String, String>("func_135021_a", "loadLocaleData")); - mInitMap.put(new Pair<String, String>("func_135022_a", "loadLocaleDataFiles")); - mInitMap.put(new Pair<String, String>("func_135023_a", "formatMessage")); - mInitMap.put(new Pair<String, String>("func_135024_b", "checkUnicode")); - mInitMap.put(new Pair<String, String>("func_135025_a", "isUnicode")); - mInitMap.put(new Pair<String, String>("func_135026_c", "translateKeyPrivate")); - mInitMap.put(new Pair<String, String>("func_135028_a", "loadLocaleData")); - mInitMap.put(new Pair<String, String>("func_135034_a", "getLanguageCode")); - mInitMap.put(new Pair<String, String>("func_135035_b", "isBidirectional")); - mInitMap.put(new Pair<String, String>("func_135040_d", "getLanguages")); - mInitMap.put(new Pair<String, String>("func_135041_c", "getCurrentLanguage")); - mInitMap.put(new Pair<String, String>("func_135042_a", "isCurrentLocaleUnicode")); - mInitMap.put(new Pair<String, String>("func_135043_a", "parseLanguageMetadata")); - mInitMap.put(new Pair<String, String>("func_135044_b", "isCurrentLanguageBidirectional")); - mInitMap.put(new Pair<String, String>("func_135045_a", "setCurrentLanguage")); - mInitMap.put(new Pair<String, String>("func_135051_a", "setLocale")); - mInitMap.put(new Pair<String, String>("func_135052_a", "format")); - mInitMap.put(new Pair<String, String>("func_135055_a", "getResourceDomains")); - mInitMap.put(new Pair<String, String>("func_135056_b", "getAllResources")); - mInitMap.put(new Pair<String, String>("func_135058_a", "getPackMetadata")); - mInitMap.put(new Pair<String, String>("func_135063_a", "replaceWith")); - mInitMap.put(new Pair<String, String>("func_135064_c", "tryTranslateKey")); - mInitMap.put(new Pair<String, String>("func_140005_i", "switchToRealms")); - mInitMap.put(new Pair<String, String>("func_142008_O", "shouldSetPosAfterLoading")); - mInitMap.put(new Pair<String, String>("func_142012_a", "isOnTeam")); - mInitMap.put(new Pair<String, String>("func_142013_aG", "getLastAttackerTime")); - mInitMap.put(new Pair<String, String>("func_142014_c", "isOnSameTeam")); - mInitMap.put(new Pair<String, String>("func_142015_aE", "getRevengeTimer")); - mInitMap.put(new Pair<String, String>("func_142020_c", "setClientBrand")); - mInitMap.put(new Pair<String, String>("func_142021_k", "getClientBrand")); - mInitMap.put(new Pair<String, String>("func_142049_d", "removeAllModifiers")); - mInitMap.put(new Pair<String, String>("func_142053_d", "formatString")); - mInitMap.put(new Pair<String, String>("func_142054_a", "isSameTeam")); - mInitMap.put(new Pair<String, String>("func_143004_u", "markPlayerActive")); - mInitMap.put(new Pair<String, String>("func_143006_e", "setPlayerIdleTimeout")); - mInitMap.put(new Pair<String, String>("func_143007_ar", "getMaxPlayerIdleMinutes")); - mInitMap.put(new Pair<String, String>("func_143011_b", "readStructureFromNBT")); - mInitMap.put(new Pair<String, String>("func_143012_a", "writeStructureToNBT")); - mInitMap.put(new Pair<String, String>("func_143016_a", "registerVillagePieces")); - mInitMap.put(new Pair<String, String>("func_143025_a", "getStructureName")); - mInitMap.put(new Pair<String, String>("func_143031_a", "registerStructureComponent")); - mInitMap.put(new Pair<String, String>("func_143034_b", "registerStructure")); - mInitMap.put(new Pair<String, String>("func_143045_a", "registerScatteredFeaturePieces")); - mInitMap.put(new Pair<String, String>("func_143046_a", "registerStrongholdPieces")); - mInitMap.put(new Pair<String, String>("func_143048_a", "registerStructurePieces")); - mInitMap.put(new Pair<String, String>("func_143049_a", "registerNetherFortressPieces")); - mInitMap.put(new Pair<String, String>("func_145747_a", "addChatMessage")); - mInitMap.put(new Pair<String, String>("func_145748_c_", "getFormattedCommandSenderName")); - mInitMap.put(new Pair<String, String>("func_145749_h", "getLastOutput")); - mInitMap.put(new Pair<String, String>("func_145752_a", "setCommand")); - mInitMap.put(new Pair<String, String>("func_145753_i", "getCustomName")); - mInitMap.put(new Pair<String, String>("func_145758_a", "writeDataToNBT")); - mInitMap.put(new Pair<String, String>("func_145759_b", "readDataFromNBT")); - mInitMap.put(new Pair<String, String>("func_145760_g", "getSuccessCount")); - mInitMap.put(new Pair<String, String>("func_145769_d", "setEntityId")); - mInitMap.put(new Pair<String, String>("func_145770_h", "isInRangeToRender3d")); - mInitMap.put(new Pair<String, String>("func_145771_j", "pushOutOfBlocks")); - mInitMap.put(new Pair<String, String>("func_145772_a", "getExplosionResistance")); - mInitMap.put(new Pair<String, String>("func_145773_az", "doesEntityNotTriggerPressurePlate")); - mInitMap.put(new Pair<String, String>("func_145775_I", "doBlockCollisions")); - mInitMap.put(new Pair<String, String>("func_145776_H", "getSwimSound")); - mInitMap.put(new Pair<String, String>("func_145777_O", "getSplashSound")); - mInitMap.put(new Pair<String, String>("func_145778_a", "dropItemWithOffset")); - mInitMap.put(new Pair<String, String>("func_145779_a", "dropItem")); - mInitMap.put(new Pair<String, String>("func_145780_a", "playStepSound")); - mInitMap.put(new Pair<String, String>("func_145782_y", "getEntityId")); - mInitMap.put(new Pair<String, String>("func_145797_a", "setOwner")); - mInitMap.put(new Pair<String, String>("func_145798_i", "getOwner")); - mInitMap.put(new Pair<String, String>("func_145799_b", "setThrower")); - mInitMap.put(new Pair<String, String>("func_145800_j", "getThrower")); - mInitMap.put(new Pair<String, String>("func_145805_f", "getBlock")); - mInitMap.put(new Pair<String, String>("func_145806_a", "setHurtEntities")); - mInitMap.put(new Pair<String, String>("func_145807_e", "getWorldObj")); - mInitMap.put(new Pair<String, String>("func_145817_o", "getDefaultDisplayTile")); - mInitMap.put(new Pair<String, String>("func_145818_k_", "isCustomInventoryName")); - mInitMap.put(new Pair<String, String>("func_145820_n", "getDisplayTile")); - mInitMap.put(new Pair<String, String>("func_145825_b", "getInventoryName")); - mInitMap.put(new Pair<String, String>("func_145826_a", "addMapping")); - mInitMap.put(new Pair<String, String>("func_145827_c", "createAndLoadEntity")); - mInitMap.put(new Pair<String, String>("func_145828_a", "addInfoToCrashReport")); - mInitMap.put(new Pair<String, String>("func_145829_t", "validate")); - mInitMap.put(new Pair<String, String>("func_145830_o", "hasWorldObj")); - mInitMap.put(new Pair<String, String>("func_145831_w", "getWorld")); - mInitMap.put(new Pair<String, String>("func_145832_p", "getBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_145833_n", "getMaxRenderDistanceSquared")); - mInitMap.put(new Pair<String, String>("func_145834_a", "setWorldObj")); - mInitMap.put(new Pair<String, String>("func_145835_a", "getDistanceSq")); - mInitMap.put(new Pair<String, String>("func_145836_u", "updateContainingBlockInfo")); - mInitMap.put(new Pair<String, String>("func_145837_r", "isInvalid")); - mInitMap.put(new Pair<String, String>("func_145838_q", "getBlockType")); - mInitMap.put(new Pair<String, String>("func_145839_a", "readFromNBT")); - mInitMap.put(new Pair<String, String>("func_145841_b", "writeToNBT")); - mInitMap.put(new Pair<String, String>("func_145842_c", "receiveClientEvent")); - mInitMap.put(new Pair<String, String>("func_145843_s", "invalidate")); - mInitMap.put(new Pair<String, String>("func_145844_m", "getDescriptionPacket")); - mInitMap.put(new Pair<String, String>("func_145845_h", "updateEntity")); - mInitMap.put(new Pair<String, String>("func_145861_a", "getStoredBlockID")); - mInitMap.put(new Pair<String, String>("func_145864_c", "getPistonOrientation")); - mInitMap.put(new Pair<String, String>("func_145866_f", "clearPistonTileEntity")); - mInitMap.put(new Pair<String, String>("func_145867_d", "shouldPistonHeadBeRendered")); - mInitMap.put(new Pair<String, String>("func_145868_b", "isExtending")); - mInitMap.put(new Pair<String, String>("func_145877_a", "changePitch")); - mInitMap.put(new Pair<String, String>("func_145878_a", "triggerNote")); - mInitMap.put(new Pair<String, String>("func_145888_j", "isOnTransferCooldown")); - mInitMap.put(new Pair<String, String>("func_145896_c", "setTransferCooldown")); - mInitMap.put(new Pair<String, String>("func_145903_a", "setSkullRotation")); - mInitMap.put(new Pair<String, String>("func_145904_a", "getSkullType")); - mInitMap.put(new Pair<String, String>("func_145906_b", "getSkullRotation")); - mInitMap.put(new Pair<String, String>("func_145913_a", "setEditable")); - mInitMap.put(new Pair<String, String>("func_145914_a", "getIsEditable")); - mInitMap.put(new Pair<String, String>("func_145934_k", "canBrew")); - mInitMap.put(new Pair<String, String>("func_145935_i", "getBrewTime")); - mInitMap.put(new Pair<String, String>("func_145938_d", "setBrewTime")); - mInitMap.put(new Pair<String, String>("func_145939_j", "getFilledSlots")); - mInitMap.put(new Pair<String, String>("func_145940_l", "brewPotions")); - mInitMap.put(new Pair<String, String>("func_145948_k", "canSmelt")); - mInitMap.put(new Pair<String, String>("func_145949_j", "smeltItem")); - mInitMap.put(new Pair<String, String>("func_145950_i", "isBurning")); - mInitMap.put(new Pair<String, String>("func_145951_a", "setCustomInventoryName")); - mInitMap.put(new Pair<String, String>("func_145952_a", "getItemBurnTime")); - mInitMap.put(new Pair<String, String>("func_145953_d", "getCookProgressScaled")); - mInitMap.put(new Pair<String, String>("func_145954_b", "isItemFuel")); - mInitMap.put(new Pair<String, String>("func_145955_e", "getBurnTimeRemainingScaled")); - mInitMap.put(new Pair<String, String>("func_145965_a", "getFlowerPotItem")); - mInitMap.put(new Pair<String, String>("func_145966_b", "getFlowerPotData")); - mInitMap.put(new Pair<String, String>("func_145976_a", "setCustomName")); - mInitMap.put(new Pair<String, String>("func_145977_a", "isSameTypeChestAt")); - mInitMap.put(new Pair<String, String>("func_145979_i", "checkForAdjacentChests")); - mInitMap.put(new Pair<String, String>("func_145980_j", "getChestType")); - mInitMap.put(new Pair<String, String>("func_145995_a", "setOutputSignal")); - mInitMap.put(new Pair<String, String>("func_145996_a", "getOutputSignal")); - mInitMap.put(new Pair<String, String>("func_145998_l", "getLevels")); - mInitMap.put(new Pair<String, String>("func_146001_d", "setPrimaryEffect")); - mInitMap.put(new Pair<String, String>("func_146002_i", "shouldBeamRender")); - mInitMap.put(new Pair<String, String>("func_146004_e", "setSecondaryEffect")); - mInitMap.put(new Pair<String, String>("func_146006_k", "getSecondaryEffect")); - mInitMap.put(new Pair<String, String>("func_146007_j", "getPrimaryEffect")); - mInitMap.put(new Pair<String, String>("func_146023_a", "getStrVsBlock")); - mInitMap.put(new Pair<String, String>("func_146024_c", "getInventorySlotContainItemAndDamage")); - mInitMap.put(new Pair<String, String>("func_146026_a", "consumeInventoryItem")); - mInitMap.put(new Pair<String, String>("func_146027_a", "clearInventory")); - mInitMap.put(new Pair<String, String>("func_146028_b", "hasItem")); - mInitMap.put(new Pair<String, String>("func_146029_c", "getInventorySlotContainItem")); - mInitMap.put(new Pair<String, String>("func_146030_a", "setCurrentItem")); - mInitMap.put(new Pair<String, String>("func_146031_a", "setChestTileEntity")); - mInitMap.put(new Pair<String, String>("func_146034_e", "handleHookRetraction")); - mInitMap.put(new Pair<String, String>("func_146035_c", "handleHookCasting")); - mInitMap.put(new Pair<String, String>("func_146068_u", "getDropItem")); - mInitMap.put(new Pair<String, String>("func_146080_bZ", "getCarriedBlock")); - mInitMap.put(new Pair<String, String>("func_146081_a", "setCarriedBlock")); - mInitMap.put(new Pair<String, String>("func_146082_f", "setInLove")); - mInitMap.put(new Pair<String, String>("func_146086_d", "setHorseArmorStack")); - mInitMap.put(new Pair<String, String>("func_146094_a", "getUUID")); - mInitMap.put(new Pair<String, String>("func_146096_a", "getBreakSpeed")); - mInitMap.put(new Pair<String, String>("func_146099_a", "canHarvestBlock")); - mInitMap.put(new Pair<String, String>("func_146100_a", "displayGUIEditSign")); - mInitMap.put(new Pair<String, String>("func_146103_bH", "getGameProfile")); - mInitMap.put(new Pair<String, String>("func_146105_b", "addChatComponentMessage")); - mInitMap.put(new Pair<String, String>("func_146107_m", "getStatFileWriter")); - mInitMap.put(new Pair<String, String>("func_146110_a", "drawModalRectWithCustomSizedTexture")); - mInitMap.put(new Pair<String, String>("func_146111_b", "drawButtonForegroundLayer")); - mInitMap.put(new Pair<String, String>("func_146112_a", "drawButton")); - mInitMap.put(new Pair<String, String>("func_146113_a", "playPressSound")); - mInitMap.put(new Pair<String, String>("func_146114_a", "getHoverState")); - mInitMap.put(new Pair<String, String>("func_146115_a", "isMouseOver")); - mInitMap.put(new Pair<String, String>("func_146116_c", "mousePressed")); - mInitMap.put(new Pair<String, String>("func_146117_b", "getButtonWidth")); - mInitMap.put(new Pair<String, String>("func_146118_a", "mouseReleased")); - mInitMap.put(new Pair<String, String>("func_146119_b", "mouseDragged")); - mInitMap.put(new Pair<String, String>("func_146136_c", "returnEnumOptions")); - mInitMap.put(new Pair<String, String>("func_146158_b", "getChatGUI")); - mInitMap.put(new Pair<String, String>("func_146159_a", "drawLabel")); - mInitMap.put(new Pair<String, String>("func_146160_b", "drawLabelBackground")); - mInitMap.put(new Pair<String, String>("func_146175_b", "deleteFromCursor")); - mInitMap.put(new Pair<String, String>("func_146176_q", "getVisible")); - mInitMap.put(new Pair<String, String>("func_146177_a", "deleteWords")); - mInitMap.put(new Pair<String, String>("func_146178_a", "updateCursorCounter")); - mInitMap.put(new Pair<String, String>("func_146179_b", "getText")); - mInitMap.put(new Pair<String, String>("func_146180_a", "setText")); - mInitMap.put(new Pair<String, String>("func_146181_i", "getEnableBackgroundDrawing")); - mInitMap.put(new Pair<String, String>("func_146182_d", "moveCursorBy")); - mInitMap.put(new Pair<String, String>("func_146183_a", "getNthWordFromPos")); - mInitMap.put(new Pair<String, String>("func_146184_c", "setEnabled")); - mInitMap.put(new Pair<String, String>("func_146185_a", "setEnableBackgroundDrawing")); - mInitMap.put(new Pair<String, String>("func_146186_n", "getSelectionEnd")); - mInitMap.put(new Pair<String, String>("func_146187_c", "getNthWordFromCursor")); - mInitMap.put(new Pair<String, String>("func_146188_c", "drawCursorVertical")); - mInitMap.put(new Pair<String, String>("func_146189_e", "setVisible")); - mInitMap.put(new Pair<String, String>("func_146190_e", "setCursorPosition")); - mInitMap.put(new Pair<String, String>("func_146191_b", "writeText")); - mInitMap.put(new Pair<String, String>("func_146192_a", "mouseClicked")); - mInitMap.put(new Pair<String, String>("func_146193_g", "setTextColor")); - mInitMap.put(new Pair<String, String>("func_146194_f", "drawTextBox")); - mInitMap.put(new Pair<String, String>("func_146195_b", "setFocused")); - mInitMap.put(new Pair<String, String>("func_146196_d", "setCursorPositionZero")); - mInitMap.put(new Pair<String, String>("func_146198_h", "getCursorPosition")); - mInitMap.put(new Pair<String, String>("func_146199_i", "setSelectionPos")); - mInitMap.put(new Pair<String, String>("func_146200_o", "getWidth")); - mInitMap.put(new Pair<String, String>("func_146201_a", "textboxKeyTyped")); - mInitMap.put(new Pair<String, String>("func_146202_e", "setCursorPositionEnd")); - mInitMap.put(new Pair<String, String>("func_146203_f", "setMaxStringLength")); - mInitMap.put(new Pair<String, String>("func_146204_h", "setDisabledTextColour")); - mInitMap.put(new Pair<String, String>("func_146205_d", "setCanLoseFocus")); - mInitMap.put(new Pair<String, String>("func_146206_l", "isFocused")); - mInitMap.put(new Pair<String, String>("func_146207_c", "getSelectedText")); - mInitMap.put(new Pair<String, String>("func_146208_g", "getMaxStringLength")); - mInitMap.put(new Pair<String, String>("func_146227_a", "printChatMessage")); - mInitMap.put(new Pair<String, String>("func_146228_f", "getChatWidth")); - mInitMap.put(new Pair<String, String>("func_146229_b", "scroll")); - mInitMap.put(new Pair<String, String>("func_146230_a", "drawChat")); - mInitMap.put(new Pair<String, String>("func_146231_a", "clearChatMessages")); - mInitMap.put(new Pair<String, String>("func_146232_i", "getLineCount")); - mInitMap.put(new Pair<String, String>("func_146233_a", "calculateChatboxWidth")); - mInitMap.put(new Pair<String, String>("func_146234_a", "printChatMessageWithOptionalDeletion")); - mInitMap.put(new Pair<String, String>("func_146235_b", "formatColors")); - mInitMap.put(new Pair<String, String>("func_146236_a", "getChatComponent")); - mInitMap.put(new Pair<String, String>("func_146237_a", "setChatLine")); - mInitMap.put(new Pair<String, String>("func_146238_c", "getSentMessages")); - mInitMap.put(new Pair<String, String>("func_146239_a", "addToSentMessages")); - mInitMap.put(new Pair<String, String>("func_146240_d", "resetScroll")); - mInitMap.put(new Pair<String, String>("func_146241_e", "getChatOpen")); - mInitMap.put(new Pair<String, String>("func_146242_c", "deleteChatLine")); - mInitMap.put(new Pair<String, String>("func_146243_b", "calculateChatboxHeight")); - mInitMap.put(new Pair<String, String>("func_146244_h", "getChatScale")); - mInitMap.put(new Pair<String, String>("func_146245_b", "refreshChat")); - mInitMap.put(new Pair<String, String>("func_146246_g", "getChatHeight")); - mInitMap.put(new Pair<String, String>("func_146254_a", "updateAchievementWindow")); - mInitMap.put(new Pair<String, String>("func_146255_b", "displayUnformattedAchievement")); - mInitMap.put(new Pair<String, String>("func_146256_a", "displayAchievement")); - mInitMap.put(new Pair<String, String>("func_146257_b", "clearAchievements")); - mInitMap.put(new Pair<String, String>("func_146258_c", "updateAchievementWindowScale")); - mInitMap.put(new Pair<String, String>("func_146269_k", "handleInput")); - mInitMap.put(new Pair<String, String>("func_146270_b", "drawWorldBackground")); - mInitMap.put(new Pair<String, String>("func_146271_m", "isCtrlKeyDown")); - mInitMap.put(new Pair<String, String>("func_146272_n", "isShiftKeyDown")); - mInitMap.put(new Pair<String, String>("func_146273_a", "mouseClickMove")); - mInitMap.put(new Pair<String, String>("func_146274_d", "handleMouseInput")); - mInitMap.put(new Pair<String, String>("func_146275_d", "setClipboardString")); - mInitMap.put(new Pair<String, String>("func_146276_q_", "drawDefaultBackground")); - mInitMap.put(new Pair<String, String>("func_146277_j", "getClipboardString")); - mInitMap.put(new Pair<String, String>("func_146278_c", "drawBackground")); - mInitMap.put(new Pair<String, String>("func_146279_a", "drawCreativeTabHoveringText")); - mInitMap.put(new Pair<String, String>("func_146280_a", "setWorldAndResolution")); - mInitMap.put(new Pair<String, String>("func_146281_b", "onGuiClosed")); - mInitMap.put(new Pair<String, String>("func_146282_l", "handleKeyboardInput")); - mInitMap.put(new Pair<String, String>("func_146283_a", "drawHoveringText")); - mInitMap.put(new Pair<String, String>("func_146284_a", "actionPerformed")); - mInitMap.put(new Pair<String, String>("func_146285_a", "renderToolTip")); - mInitMap.put(new Pair<String, String>("func_146286_b", "mouseReleased")); - mInitMap.put(new Pair<String, String>("func_146350_a", "setButtonDelay")); - mInitMap.put(new Pair<String, String>("func_146358_g", "disableSecurityWarning")); - mInitMap.put(new Pair<String, String>("func_146359_e", "copyLinkToClipboard")); - mInitMap.put(new Pair<String, String>("func_146367_a", "connect")); - mInitMap.put(new Pair<String, String>("func_146402_a", "getSentHistory")); - mInitMap.put(new Pair<String, String>("func_146403_a", "submitChatMessage")); - mInitMap.put(new Pair<String, String>("func_146404_p_", "autocompletePlayerNames")); - mInitMap.put(new Pair<String, String>("func_146405_a", "sendAutocompleteRequest")); - mInitMap.put(new Pair<String, String>("func_146406_a", "onAutocompleteResponse")); - mInitMap.put(new Pair<String, String>("func_146407_a", "openLink")); - mInitMap.put(new Pair<String, String>("func_146418_g", "wakeFromSleep")); - mInitMap.put(new Pair<String, String>("func_146456_p", "pageGetCurrent")); - mInitMap.put(new Pair<String, String>("func_146457_a", "pageSetCurrent")); - mInitMap.put(new Pair<String, String>("func_146459_b", "pageInsertIntoCurrent")); - mInitMap.put(new Pair<String, String>("func_146460_c", "keyTypedInTitle")); - mInitMap.put(new Pair<String, String>("func_146461_i", "addmInitMap.put(newPage")); - mInitMap.put(new Pair<String, String>("func_146462_a", "sendBookToServer")); - mInitMap.put(new Pair<String, String>("func_146463_b", "keyTypedInBook")); - mInitMap.put(new Pair<String, String>("func_146464_h", "updateButtons")); - mInitMap.put(new Pair<String, String>("func_146504_a", "getSoundVolume")); - mInitMap.put(new Pair<String, String>("func_146509_g", "doneLoading")); - mInitMap.put(new Pair<String, String>("func_146521_a", "drawStatsScreen")); - mInitMap.put(new Pair<String, String>("func_146527_c", "drawSprite")); - mInitMap.put(new Pair<String, String>("func_146531_b", "drawButtonBackground")); - mInitMap.put(new Pair<String, String>("func_146541_h", "createButtons")); - mInitMap.put(new Pair<String, String>("func_146552_b", "drawAchievementScreen")); - mInitMap.put(new Pair<String, String>("func_146553_h", "drawTitle")); - mInitMap.put(new Pair<String, String>("func_146574_g", "sendRespawnPacket")); - mInitMap.put(new Pair<String, String>("func_146575_b", "drawWinGameScreen")); - mInitMap.put(new Pair<String, String>("func_146586_a", "setDomInitMap.put(neworking")); - mInitMap.put(new Pair<String, String>("func_146789_i", "getOldServerPinger")); - mInitMap.put(new Pair<String, String>("func_146790_a", "selectServer")); - mInitMap.put(new Pair<String, String>("func_146791_a", "connectToServer")); - mInitMap.put(new Pair<String, String>("func_146792_q", "refreshServerList")); - mInitMap.put(new Pair<String, String>("func_146794_g", "createButtons")); - mInitMap.put(new Pair<String, String>("func_146795_p", "getServerList")); - mInitMap.put(new Pair<String, String>("func_146796_h", "connectToSelected")); - mInitMap.put(new Pair<String, String>("func_146961_a", "hasResourcePackEntry")); - mInitMap.put(new Pair<String, String>("func_146975_c", "getSlotAtPosition")); - mInitMap.put(new Pair<String, String>("func_146976_a", "drawGuiContainerBackgroundLayer")); - mInitMap.put(new Pair<String, String>("func_146977_a", "drawSlot")); - mInitMap.put(new Pair<String, String>("func_146978_c", "isPointInRegion")); - mInitMap.put(new Pair<String, String>("func_146979_b", "drawGuiContainerForegroundLayer")); - mInitMap.put(new Pair<String, String>("func_146980_g", "updateDragSplitting")); - mInitMap.put(new Pair<String, String>("func_146981_a", "isMouseOverSlot")); - mInitMap.put(new Pair<String, String>("func_146982_a", "drawItemStack")); - mInitMap.put(new Pair<String, String>("func_146983_a", "checkHotbarKeys")); - mInitMap.put(new Pair<String, String>("func_146984_a", "handleMouseClick")); - mInitMap.put(new Pair<String, String>("func_147035_g", "getMerchant")); - mInitMap.put(new Pair<String, String>("func_147044_g", "drawActivePotionEffects")); - mInitMap.put(new Pair<String, String>("func_147046_a", "drawEntityOnScreen")); - mInitMap.put(new Pair<String, String>("func_147050_b", "setCurrentCreativeTab")); - mInitMap.put(new Pair<String, String>("func_147052_b", "renderCreativeInventoryHoveringText")); - mInitMap.put(new Pair<String, String>("func_147053_i", "updateCreativeSearch")); - mInitMap.put(new Pair<String, String>("func_147055_p", "needsScrollBars")); - mInitMap.put(new Pair<String, String>("func_147090_g", "renameItem")); - mInitMap.put(new Pair<String, String>("func_147095_a", "requestTexturePackLoad")); - mInitMap.put(new Pair<String, String>("func_147099_x", "getStatFile")); - mInitMap.put(new Pair<String, String>("func_147104_D", "getCurrentServerData")); - mInitMap.put(new Pair<String, String>("func_147106_B", "scheduleResourcesRefresh")); - mInitMap.put(new Pair<String, String>("func_147107_h", "isFramerateLimitBelowMax")); - mInitMap.put(new Pair<String, String>("func_147108_a", "displayGuiScreen")); - mInitMap.put(new Pair<String, String>("func_147109_W", "getAmbientMusicType")); - mInitMap.put(new Pair<String, String>("func_147110_a", "getFramebuffer")); - mInitMap.put(new Pair<String, String>("func_147111_S", "isJava64bit")); - mInitMap.put(new Pair<String, String>("func_147112_ai", "middleClickMouse")); - mInitMap.put(new Pair<String, String>("func_147113_T", "isGamePaused")); - mInitMap.put(new Pair<String, String>("func_147114_u", "getNetHandler")); - mInitMap.put(new Pair<String, String>("func_147115_a", "sendClickBlockToController")); - mInitMap.put(new Pair<String, String>("func_147116_af", "clickMouse")); - mInitMap.put(new Pair<String, String>("func_147117_R", "getTextureMapBlocks")); - mInitMap.put(new Pair<String, String>("func_147118_V", "getSoundHandler")); - mInitMap.put(new Pair<String, String>("func_147119_ah", "updateFramebufferSize")); - mInitMap.put(new Pair<String, String>("func_147120_f", "resetSize")); - mInitMap.put(new Pair<String, String>("func_147121_ag", "rightClickMouse")); - mInitMap.put(new Pair<String, String>("func_147122_X", "isJvm64bit")); - mInitMap.put(new Pair<String, String>("func_147130_as", "getMinecraftSessionService")); - mInitMap.put(new Pair<String, String>("func_147132_au", "refreshStatusNextTick")); - mInitMap.put(new Pair<String, String>("func_147133_T", "getTexturePack")); - mInitMap.put(new Pair<String, String>("func_147134_at", "getServerStatusResponse")); - mInitMap.put(new Pair<String, String>("func_147135_j", "getDifficulty")); - mInitMap.put(new Pair<String, String>("func_147136_ar", "isAnnouncingPlayerAchievements")); - mInitMap.put(new Pair<String, String>("func_147137_ag", "getNetworkSystem")); - mInitMap.put(new Pair<String, String>("func_147138_a", "addFaviconToStatusResponse")); - mInitMap.put(new Pair<String, String>("func_147139_a", "setDifficultyForAllWorlds")); - mInitMap.put(new Pair<String, String>("func_147149_a", "saveToFile")); - mInitMap.put(new Pair<String, String>("func_147153_a", "addBlockInfo")); - mInitMap.put(new Pair<String, String>("func_147155_a", "getCategoryName")); - mInitMap.put(new Pair<String, String>("func_147156_b", "getCategoryId")); - mInitMap.put(new Pair<String, String>("func_147176_a", "getChatComponentFromNthArg")); - mInitMap.put(new Pair<String, String>("func_147177_a", "joinNiceString")); - mInitMap.put(new Pair<String, String>("func_147178_a", "getChatComponentFromNthArg")); - mInitMap.put(new Pair<String, String>("func_147179_f", "getItemByText")); - mInitMap.put(new Pair<String, String>("func_147180_g", "getBlockByText")); - mInitMap.put(new Pair<String, String>("func_147185_d", "addTeam")); - mInitMap.put(new Pair<String, String>("func_147186_g", "listTeams")); - mInitMap.put(new Pair<String, String>("func_147187_n", "resetPlayers")); - mInitMap.put(new Pair<String, String>("func_147188_j", "emptyTeam")); - mInitMap.put(new Pair<String, String>("func_147190_h", "joinTeam")); - mInitMap.put(new Pair<String, String>("func_147191_h", "removeObjective")); - mInitMap.put(new Pair<String, String>("func_147192_d", "getScoreboard")); - mInitMap.put(new Pair<String, String>("func_147193_c", "addObjective")); - mInitMap.put(new Pair<String, String>("func_147194_f", "removeTeam")); - mInitMap.put(new Pair<String, String>("func_147195_l", "listPlayers")); - mInitMap.put(new Pair<String, String>("func_147196_d", "listObjectives")); - mInitMap.put(new Pair<String, String>("func_147197_m", "setPlayer")); - mInitMap.put(new Pair<String, String>("func_147198_k", "setObjectiveDisplay")); - mInitMap.put(new Pair<String, String>("func_147199_i", "leaveTeam")); - mInitMap.put(new Pair<String, String>("func_147200_e", "setTeamOption")); - mInitMap.put(new Pair<String, String>("func_147215_a", "addBlockDestroyEffects")); - mInitMap.put(new Pair<String, String>("func_147223_a", "pingPendingNetworks")); - mInitMap.put(new Pair<String, String>("func_147224_a", "ping")); - mInitMap.put(new Pair<String, String>("func_147225_b", "tryCompatibilityPing")); - mInitMap.put(new Pair<String, String>("func_147226_b", "clearPendingNetworks")); - mInitMap.put(new Pair<String, String>("func_147231_a", "onDisconnect")); - mInitMap.put(new Pair<String, String>("func_147232_a", "onConnectionStateTransition")); - mInitMap.put(new Pair<String, String>("func_147233_a", "onNetworkTick")); - mInitMap.put(new Pair<String, String>("func_147234_a", "handleBlockChange")); - mInitMap.put(new Pair<String, String>("func_147235_a", "handleSpawnObject")); - mInitMap.put(new Pair<String, String>("func_147236_a", "handleEntityStatus")); - mInitMap.put(new Pair<String, String>("func_147237_a", "handleSpawnPlayer")); - mInitMap.put(new Pair<String, String>("func_147238_a", "handleDestroyEntities")); - mInitMap.put(new Pair<String, String>("func_147239_a", "handleConfirmTransaction")); - mInitMap.put(new Pair<String, String>("func_147240_a", "handleCustomPayload")); - mInitMap.put(new Pair<String, String>("func_147241_a", "handleWindowItems")); - mInitMap.put(new Pair<String, String>("func_147242_a", "handleEntityEquipment")); - mInitMap.put(new Pair<String, String>("func_147243_a", "handleEntityAttach")); - mInitMap.put(new Pair<String, String>("func_147244_a", "handleEntityVelocity")); - mInitMap.put(new Pair<String, String>("func_147245_a", "handleWindowProperty")); - mInitMap.put(new Pair<String, String>("func_147246_a", "handleCollectItem")); - mInitMap.put(new Pair<String, String>("func_147247_a", "handleTeams")); - mInitMap.put(new Pair<String, String>("func_147248_a", "handleUpdateSign")); - mInitMap.put(new Pair<String, String>("func_147249_a", "handleUpdateHealth")); - mInitMap.put(new Pair<String, String>("func_147250_a", "handleUpdateScore")); - mInitMap.put(new Pair<String, String>("func_147251_a", "handleChat")); - mInitMap.put(new Pair<String, String>("func_147252_a", "handleChangeGameState")); - mInitMap.put(new Pair<String, String>("func_147253_a", "handleDisconnect")); - mInitMap.put(new Pair<String, String>("func_147254_a", "handleDisplayScoreboard")); - mInitMap.put(new Pair<String, String>("func_147255_a", "handleSoundEffect")); - mInitMap.put(new Pair<String, String>("func_147256_a", "handlePlayerListItem")); - mInitMap.put(new Pair<String, String>("func_147257_a", "handleHeldItemChange")); - mInitMap.put(new Pair<String, String>("func_147258_a", "handlePlayerPosLook")); - mInitMap.put(new Pair<String, String>("func_147259_a", "handleEntityMovement")); - mInitMap.put(new Pair<String, String>("func_147260_a", "handleEntityEffect")); - mInitMap.put(new Pair<String, String>("func_147261_a", "handleBlockAction")); - mInitMap.put(new Pair<String, String>("func_147262_a", "handleRemoveEntityEffect")); - mInitMap.put(new Pair<String, String>("func_147263_a", "handleChunkData")); - mInitMap.put(new Pair<String, String>("func_147264_a", "handleMaps")); - mInitMap.put(new Pair<String, String>("func_147265_a", "handleOpenWindow")); - mInitMap.put(new Pair<String, String>("func_147266_a", "handleSetSlot")); - mInitMap.put(new Pair<String, String>("func_147267_a", "handleEntityHeadLook")); - mInitMap.put(new Pair<String, String>("func_147268_a", "handleSignEditorOpen")); - mInitMap.put(new Pair<String, String>("func_147269_a", "handleMapChunkBulk")); - mInitMap.put(new Pair<String, String>("func_147270_a", "handlePlayerAbilities")); - mInitMap.put(new Pair<String, String>("func_147271_a", "handleSpawnPosition")); - mInitMap.put(new Pair<String, String>("func_147272_a", "handleKeepAlive")); - mInitMap.put(new Pair<String, String>("func_147273_a", "handleUpdateTileEntity")); - mInitMap.put(new Pair<String, String>("func_147274_a", "handleTabComplete")); - mInitMap.put(new Pair<String, String>("func_147275_a", "handleEntityTeleport")); - mInitMap.put(new Pair<String, String>("func_147276_a", "handleCloseWindow")); - mInitMap.put(new Pair<String, String>("func_147277_a", "handleEffect")); - mInitMap.put(new Pair<String, String>("func_147278_a", "handleUseBed")); - mInitMap.put(new Pair<String, String>("func_147279_a", "handleAnimation")); - mInitMap.put(new Pair<String, String>("func_147280_a", "handleRespawn")); - mInitMap.put(new Pair<String, String>("func_147281_a", "handleSpawnMob")); - mInitMap.put(new Pair<String, String>("func_147282_a", "handleJoinGame")); - mInitMap.put(new Pair<String, String>("func_147283_a", "handleExplosion")); - mInitMap.put(new Pair<String, String>("func_147284_a", "handleEntityMetadata")); - mInitMap.put(new Pair<String, String>("func_147285_a", "handleTimeUpdate")); - mInitMap.put(new Pair<String, String>("func_147286_a", "handleSpawnExperienceOrb")); - mInitMap.put(new Pair<String, String>("func_147287_a", "handleMultiBlockChange")); - mInitMap.put(new Pair<String, String>("func_147288_a", "handleSpawnPainting")); - mInitMap.put(new Pair<String, String>("func_147289_a", "handleParticles")); - mInitMap.put(new Pair<String, String>("func_147290_a", "handleEntityProperties")); - mInitMap.put(new Pair<String, String>("func_147291_a", "handleScoreboardObjective")); - mInitMap.put(new Pair<String, String>("func_147292_a", "handleSpawnGlobalEntity")); - mInitMap.put(new Pair<String, String>("func_147293_a", "handleStatistics")); - mInitMap.put(new Pair<String, String>("func_147294_a", "handleBlockBreakAnim")); - mInitMap.put(new Pair<String, String>("func_147295_a", "handleSetExperience")); - mInitMap.put(new Pair<String, String>("func_147296_c", "cleanup")); - mInitMap.put(new Pair<String, String>("func_147297_a", "addToSendQueue")); - mInitMap.put(new Pair<String, String>("func_147298_b", "getNetworkManager")); - mInitMap.put(new Pair<String, String>("func_147311_a", "processPing")); - mInitMap.put(new Pair<String, String>("func_147312_a", "processServerQuery")); - mInitMap.put(new Pair<String, String>("func_147315_a", "processEncryptionResponse")); - mInitMap.put(new Pair<String, String>("func_147316_a", "processLoginStart")); - mInitMap.put(new Pair<String, String>("func_147322_a", "closeConnection")); - mInitMap.put(new Pair<String, String>("func_147338_a", "processEnchantItem")); - mInitMap.put(new Pair<String, String>("func_147339_a", "processConfirmTransaction")); - mInitMap.put(new Pair<String, String>("func_147340_a", "processUseEntity")); - mInitMap.put(new Pair<String, String>("func_147341_a", "processTabComplete")); - mInitMap.put(new Pair<String, String>("func_147342_a", "processClientStatus")); - mInitMap.put(new Pair<String, String>("func_147343_a", "processUpdateSign")); - mInitMap.put(new Pair<String, String>("func_147344_a", "processCreativeInventoryAction")); - mInitMap.put(new Pair<String, String>("func_147345_a", "processPlayerDigging")); - mInitMap.put(new Pair<String, String>("func_147346_a", "processPlayerBlockPlacement")); - mInitMap.put(new Pair<String, String>("func_147347_a", "processPlayer")); - mInitMap.put(new Pair<String, String>("func_147348_a", "processPlayerAbilities")); - mInitMap.put(new Pair<String, String>("func_147349_a", "processVanilla250Packet")); - mInitMap.put(new Pair<String, String>("func_147350_a", "processAnimation")); - mInitMap.put(new Pair<String, String>("func_147351_a", "processClickWindow")); - mInitMap.put(new Pair<String, String>("func_147352_a", "processClientSettings")); - mInitMap.put(new Pair<String, String>("func_147353_a", "processKeepAlive")); - mInitMap.put(new Pair<String, String>("func_147354_a", "processChatMessage")); - mInitMap.put(new Pair<String, String>("func_147355_a", "processHeldItemChange")); - mInitMap.put(new Pair<String, String>("func_147356_a", "processCloseWindow")); - mInitMap.put(new Pair<String, String>("func_147357_a", "processEntityAction")); - mInitMap.put(new Pair<String, String>("func_147358_a", "processInput")); - mInitMap.put(new Pair<String, String>("func_147359_a", "sendPacket")); - mInitMap.put(new Pair<String, String>("func_147360_c", "kickPlayerFromServer")); - mInitMap.put(new Pair<String, String>("func_147361_d", "handleSlashCommand")); - mInitMap.put(new Pair<String, String>("func_147362_b", "getNetworkManager")); - mInitMap.put(new Pair<String, String>("func_147363_d", "currentTimeMillis")); - mInitMap.put(new Pair<String, String>("func_147364_a", "setPlayerLocation")); - mInitMap.put(new Pair<String, String>("func_147383_a", "processHandshake")); - mInitMap.put(new Pair<String, String>("func_147388_a", "handleDisconnect")); - mInitMap.put(new Pair<String, String>("func_147389_a", "handleEncryptionRequest")); - mInitMap.put(new Pair<String, String>("func_147390_a", "handleLoginSuccess")); - mInitMap.put(new Pair<String, String>("func_147397_a", "handleServerInfo")); - mInitMap.put(new Pair<String, String>("func_147398_a", "handlePong")); - mInitMap.put(new Pair<String, String>("func_147407_a", "setBase64EncodedIconData")); - mInitMap.put(new Pair<String, String>("func_147409_e", "getBase64EncodedIconData")); - mInitMap.put(new Pair<String, String>("func_147416_a", "findClosestStructure")); - mInitMap.put(new Pair<String, String>("func_147422_a", "replaceBlocksForBiome")); - mInitMap.put(new Pair<String, String>("func_147437_c", "isAirBlock")); - mInitMap.put(new Pair<String, String>("func_147438_o", "getTileEntity")); - mInitMap.put(new Pair<String, String>("func_147439_a", "getBlock")); - mInitMap.put(new Pair<String, String>("func_147440_b", "findClosestStructure")); - mInitMap.put(new Pair<String, String>("func_147441_b", "notifyBlocksOfNeighborChange")); - mInitMap.put(new Pair<String, String>("func_147442_i", "setThunderStrength")); - mInitMap.put(new Pair<String, String>("func_147443_d", "destroyBlockInWorldPartially")); - mInitMap.put(new Pair<String, String>("func_147444_c", "notifyBlockChange")); - mInitMap.put(new Pair<String, String>("func_147445_c", "isBlockNormalCubeDefault")); - mInitMap.put(new Pair<String, String>("func_147447_a", "rayTraceBlocks")); - mInitMap.put(new Pair<String, String>("func_147449_b", "setBlock")); - mInitMap.put(new Pair<String, String>("func_147451_t", "updateAllLightTypes")); - mInitMap.put(new Pair<String, String>("func_147452_c", "addBlockEvent")); - mInitMap.put(new Pair<String, String>("func_147453_f", "updateNeighborsAboutBlockChange")); - mInitMap.put(new Pair<String, String>("func_147454_a", "scheduleBlockUpdateWithPriority")); - mInitMap.put(new Pair<String, String>("func_147455_a", "setTileEntity")); - mInitMap.put(new Pair<String, String>("func_147457_a", "markTileEntityForRemoval")); - mInitMap.put(new Pair<String, String>("func_147458_c", "markBlockRangeForRenderUpdate")); - mInitMap.put(new Pair<String, String>("func_147459_d", "notifyBlocksOfNeighborChange")); - mInitMap.put(new Pair<String, String>("func_147460_e", "notifyBlockOfNeighborChange")); - mInitMap.put(new Pair<String, String>("func_147462_b", "getTensionFactorForBlock")); - mInitMap.put(new Pair<String, String>("func_147463_c", "updateLightByType")); - mInitMap.put(new Pair<String, String>("func_147464_a", "scheduleBlockUpdate")); - mInitMap.put(new Pair<String, String>("func_147465_d", "setBlock")); - mInitMap.put(new Pair<String, String>("func_147466_a", "doesBlockHaveSolidTopSurface")); - mInitMap.put(new Pair<String, String>("func_147468_f", "setBlockToAir")); - mInitMap.put(new Pair<String, String>("func_147469_q", "isBlockFullCube")); - mInitMap.put(new Pair<String, String>("func_147471_g", "markBlockForUpdate")); - mInitMap.put(new Pair<String, String>("func_147472_a", "canPlaceEntityOnSide")); - mInitMap.put(new Pair<String, String>("func_147474_b", "getTopBlock")); - mInitMap.put(new Pair<String, String>("func_147475_p", "removeTileEntity")); - mInitMap.put(new Pair<String, String>("func_147476_b", "markTileEntityChunkModified")); - mInitMap.put(new Pair<String, String>("func_147477_a", "isBlockTickScheduledThisTick")); - mInitMap.put(new Pair<String, String>("func_147478_e", "canSnowAt")); - mInitMap.put(new Pair<String, String>("func_147479_m", "markBlockForRenderUpdate")); - mInitMap.put(new Pair<String, String>("func_147480_a", "breakBlock")); - mInitMap.put(new Pair<String, String>("func_147493_a", "createPlayer")); - mInitMap.put(new Pair<String, String>("func_147496_a", "onWorldChange")); - mInitMap.put(new Pair<String, String>("func_147499_a", "bindTexture")); - mInitMap.put(new Pair<String, String>("func_147500_a", "renderTileEntityAt")); - mInitMap.put(new Pair<String, String>("func_147542_a", "cacheActiveRenderInfo")); - mInitMap.put(new Pair<String, String>("func_147544_a", "renderTileEntity")); - mInitMap.put(new Pair<String, String>("func_147545_a", "hasSpecialRenderer")); - mInitMap.put(new Pair<String, String>("func_147546_a", "getSpecialRendererByClass")); - mInitMap.put(new Pair<String, String>("func_147547_b", "getSpecialRenderer")); - mInitMap.put(new Pair<String, String>("func_147548_a", "getFontRenderer")); - mInitMap.put(new Pair<String, String>("func_147549_a", "renderTileEntityAt")); - mInitMap.put(new Pair<String, String>("func_147564_a", "getVertexState")); - mInitMap.put(new Pair<String, String>("func_147565_a", "setVertexState")); - mInitMap.put(new Pair<String, String>("func_147570_f", "getHasNormals")); - mInitMap.put(new Pair<String, String>("func_147571_e", "getHasBrightness")); - mInitMap.put(new Pair<String, String>("func_147572_a", "getRawBuffer")); - mInitMap.put(new Pair<String, String>("func_147573_d", "getHasTexture")); - mInitMap.put(new Pair<String, String>("func_147574_g", "getHasColor")); - mInitMap.put(new Pair<String, String>("func_147575_c", "getVertexCount")); - mInitMap.put(new Pair<String, String>("func_147576_b", "getRawBufferIndex")); - mInitMap.put(new Pair<String, String>("func_147584_b", "onStaticEntitiesChanged")); - mInitMap.put(new Pair<String, String>("func_147585_a", "markBlockRangeForRenderUpdate")); - mInitMap.put(new Pair<String, String>("func_147586_a", "markBlockForUpdate")); - mInitMap.put(new Pair<String, String>("func_147587_b", "destroyBlockPartially")); - mInitMap.put(new Pair<String, String>("func_147588_b", "markBlockForRenderUpdate")); - mInitMap.put(new Pair<String, String>("func_147589_a", "renderEntities")); - mInitMap.put(new Pair<String, String>("func_147590_a", "drawOutlinedBoundingBox")); - mInitMap.put(new Pair<String, String>("func_147591_f", "rebuildDisplayListEntities")); - mInitMap.put(new Pair<String, String>("func_147604_a", "setFramebufferColor")); - mInitMap.put(new Pair<String, String>("func_147605_b", "createFramebuffer")); - mInitMap.put(new Pair<String, String>("func_147606_d", "unbindFramebufferTexture")); - mInitMap.put(new Pair<String, String>("func_147607_a", "setFramebufferFilter")); - mInitMap.put(new Pair<String, String>("func_147608_a", "deleteFramebuffer")); - mInitMap.put(new Pair<String, String>("func_147609_e", "unbindFramebuffer")); - mInitMap.put(new Pair<String, String>("func_147610_a", "bindFramebuffer")); - mInitMap.put(new Pair<String, String>("func_147611_b", "checkFramebufferComplete")); - mInitMap.put(new Pair<String, String>("func_147612_c", "bindFramebufferTexture")); - mInitMap.put(new Pair<String, String>("func_147613_a", "createBindFramebuffer")); - mInitMap.put(new Pair<String, String>("func_147614_f", "framebufferClear")); - mInitMap.put(new Pair<String, String>("func_147615_c", "framebufferRender")); - mInitMap.put(new Pair<String, String>("func_147631_c", "deleteGlTexture")); - mInitMap.put(new Pair<String, String>("func_147632_b", "setAnisotropicFiltering")); - mInitMap.put(new Pair<String, String>("func_147633_a", "setMipmapLevels")); - mInitMap.put(new Pair<String, String>("func_147634_a", "completeResourceLocation")); - mInitMap.put(new Pair<String, String>("func_147640_e", "checkTextureUploaded")); - mInitMap.put(new Pair<String, String>("func_147641_a", "setBufferedImage")); - mInitMap.put(new Pair<String, String>("func_147645_c", "deleteTexture")); - mInitMap.put(new Pair<String, String>("func_147647_b", "bidiReorder")); - mInitMap.put(new Pair<String, String>("func_147649_g", "getXPosF")); - mInitMap.put(new Pair<String, String>("func_147650_b", "getSoundLocation")); - mInitMap.put(new Pair<String, String>("func_147651_i", "getZPosF")); - mInitMap.put(new Pair<String, String>("func_147652_d", "getRepeatDelay")); - mInitMap.put(new Pair<String, String>("func_147653_e", "getVolume")); - mInitMap.put(new Pair<String, String>("func_147654_h", "getYPosF")); - mInitMap.put(new Pair<String, String>("func_147655_f", "getPitch")); - mInitMap.put(new Pair<String, String>("func_147656_j", "getAttenuationType")); - mInitMap.put(new Pair<String, String>("func_147657_c", "canRepeat")); - mInitMap.put(new Pair<String, String>("func_147667_k", "isDonePlaying")); - mInitMap.put(new Pair<String, String>("func_147673_a", "createPositionedSoundRecord")); - mInitMap.put(new Pair<String, String>("func_147674_a", "createPositionedSoundRecord")); - mInitMap.put(new Pair<String, String>("func_147675_a", "createRecordSoundAtPosition")); - mInitMap.put(new Pair<String, String>("func_147680_a", "getSound")); - mInitMap.put(new Pair<String, String>("func_147681_a", "playDelayedSound")); - mInitMap.put(new Pair<String, String>("func_147682_a", "playSound")); - mInitMap.put(new Pair<String, String>("func_147683_b", "stopSound")); - mInitMap.put(new Pair<String, String>("func_147684_a", "setSoundLevel")); - mInitMap.put(new Pair<String, String>("func_147685_d", "unloadSounds")); - mInitMap.put(new Pair<String, String>("func_147686_a", "getRandomSoundFromCategories")); - mInitMap.put(new Pair<String, String>("func_147687_e", "resumeSounds")); - mInitMap.put(new Pair<String, String>("func_147689_b", "pauseSounds")); - mInitMap.put(new Pair<String, String>("func_147690_c", "stopSounds")); - mInitMap.put(new Pair<String, String>("func_147691_a", "setListener")); - mInitMap.put(new Pair<String, String>("func_147692_c", "isSoundPlaying")); - mInitMap.put(new Pair<String, String>("func_147693_a", "loadSoundResource")); - mInitMap.put(new Pair<String, String>("func_147701_i", "getMapItemRenderer")); - mInitMap.put(new Pair<String, String>("func_147702_a", "isShaderActive")); - mInitMap.put(new Pair<String, String>("func_147703_b", "deactivateShader")); - mInitMap.put(new Pair<String, String>("func_147704_a", "updateShaderGroupSize")); - mInitMap.put(new Pair<String, String>("func_147705_c", "activateNextShader")); - mInitMap.put(new Pair<String, String>("func_147706_e", "getShaderGroup")); - mInitMap.put(new Pair<String, String>("func_147715_a", "renderChest")); - mInitMap.put(new Pair<String, String>("func_147721_p", "renderBlockLiquid")); - mInitMap.put(new Pair<String, String>("func_147722_a", "renderBlockStairs")); - mInitMap.put(new Pair<String, String>("func_147723_f", "renderBlockTripWireSource")); - mInitMap.put(new Pair<String, String>("func_147724_m", "renderBlockStem")); - mInitMap.put(new Pair<String, String>("func_147725_a", "renderBlockAnvil")); - mInitMap.put(new Pair<String, String>("func_147726_j", "renderBlockVine")); - mInitMap.put(new Pair<String, String>("func_147727_a", "mixAoBrightness")); - mInitMap.put(new Pair<String, String>("func_147728_a", "renderBlockAnvilOrient")); - mInitMap.put(new Pair<String, String>("func_147729_a", "getLiquidHeight")); - mInitMap.put(new Pair<String, String>("func_147730_a", "renderBlockStemSmall")); - mInitMap.put(new Pair<String, String>("func_147731_b", "renderPistonBase")); - mInitMap.put(new Pair<String, String>("func_147732_a", "renderBlockRedstoneDiodeMetadata")); - mInitMap.put(new Pair<String, String>("func_147733_k", "renderBlockStainedGlassPane")); - mInitMap.put(new Pair<String, String>("func_147734_d", "renderFaceZPos")); - mInitMap.put(new Pair<String, String>("func_147735_a", "renderBlockFence")); - mInitMap.put(new Pair<String, String>("func_147736_d", "renderStandardBlockWithColorMultiplier")); - mInitMap.put(new Pair<String, String>("func_147737_a", "renderBlockAnvilRotate")); - mInitMap.put(new Pair<String, String>("func_147738_c", "renderPistonRodEW")); - mInitMap.put(new Pair<String, String>("func_147739_a", "renderItemIn3d")); - mInitMap.put(new Pair<String, String>("func_147740_a", "renderBlockStemBig")); - mInitMap.put(new Pair<String, String>("func_147741_a", "renderBlockBrewingStand")); - mInitMap.put(new Pair<String, String>("func_147742_r", "renderBlockLog")); - mInitMap.put(new Pair<String, String>("func_147743_a", "renderBlockEndPortalFrame")); - mInitMap.put(new Pair<String, String>("func_147744_b", "hasOverrideBlockTexture")); - mInitMap.put(new Pair<String, String>("func_147745_b", "getBlockIcon")); - mInitMap.put(new Pair<String, String>("func_147746_l", "renderCrossedSquares")); - mInitMap.put(new Pair<String, String>("func_147747_a", "renderTorchAtAngle")); - mInitMap.put(new Pair<String, String>("func_147748_a", "renderBlockRedstoneDiode")); - mInitMap.put(new Pair<String, String>("func_147749_a", "renderBlockSandFalling")); - mInitMap.put(new Pair<String, String>("func_147750_a", "renderPistonExtensionAllFaces")); - mInitMap.put(new Pair<String, String>("func_147751_a", "renderStandardBlockWithAmbientOcclusion")); - mInitMap.put(new Pair<String, String>("func_147752_a", "renderBlockFlowerpot")); - mInitMap.put(new Pair<String, String>("func_147753_b", "setRenderAllFaces")); - mInitMap.put(new Pair<String, String>("func_147754_e", "renderBlockCactusImpl")); - mInitMap.put(new Pair<String, String>("func_147755_t", "renderBlockCactus")); - mInitMap.put(new Pair<String, String>("func_147756_g", "renderBlockTripWire")); - mInitMap.put(new Pair<String, String>("func_147757_a", "setOverrideBlockTexture")); - mInitMap.put(new Pair<String, String>("func_147758_b", "getIconSafe")); - mInitMap.put(new Pair<String, String>("func_147759_a", "renderBlockRepeater")); - mInitMap.put(new Pair<String, String>("func_147760_u", "renderBlockDoor")); - mInitMap.put(new Pair<String, String>("func_147761_c", "renderFaceZNeg")); - mInitMap.put(new Pair<String, String>("func_147762_c", "unlockBlockBounds")); - mInitMap.put(new Pair<String, String>("func_147763_a", "renderPistonRodUD")); - mInitMap.put(new Pair<String, String>("func_147764_f", "renderFaceXPos")); - mInitMap.put(new Pair<String, String>("func_147765_a", "drawCrossedSquares")); - mInitMap.put(new Pair<String, String>("func_147766_a", "renderBlockMinecartTrack")); - mInitMap.put(new Pair<String, String>("func_147767_a", "renderBlockPane")); - mInitMap.put(new Pair<String, String>("func_147768_a", "renderFaceYNeg")); - mInitMap.put(new Pair<String, String>("func_147769_a", "renderBlockAllFaces")); - mInitMap.put(new Pair<String, String>("func_147770_b", "overrideBlockBounds")); - mInitMap.put(new Pair<String, String>("func_147771_a", "clearOverrideBlockTexture")); - mInitMap.put(new Pair<String, String>("func_147772_a", "renderBlockCocoa")); - mInitMap.put(new Pair<String, String>("func_147773_v", "renderBlockBed")); - mInitMap.put(new Pair<String, String>("func_147774_a", "renderBlockDoublePlant")); - mInitMap.put(new Pair<String, String>("func_147775_a", "setRenderBoundsFromBlock")); - mInitMap.put(new Pair<String, String>("func_147776_a", "renderBlockFenceGate")); - mInitMap.put(new Pair<String, String>("func_147777_a", "getBlockIconFromSide")); - mInitMap.put(new Pair<String, String>("func_147778_a", "getAoBrightness")); - mInitMap.put(new Pair<String, String>("func_147779_s", "renderBlockQuartz")); - mInitMap.put(new Pair<String, String>("func_147780_a", "renderBlockAnvilMetadata")); - mInitMap.put(new Pair<String, String>("func_147781_a", "renderBlockRedstoneComparator")); - mInitMap.put(new Pair<String, String>("func_147782_a", "setRenderBounds")); - mInitMap.put(new Pair<String, String>("func_147783_o", "renderBlockLilyPad")); - mInitMap.put(new Pair<String, String>("func_147784_q", "renderStandardBlock")); - mInitMap.put(new Pair<String, String>("func_147785_a", "renderBlockCauldron")); - mInitMap.put(new Pair<String, String>("func_147786_a", "setRenderFromInside")); - mInitMap.put(new Pair<String, String>("func_147787_a", "getBlockIconFromSideAndMetadata")); - mInitMap.put(new Pair<String, String>("func_147788_h", "renderBlockRedstomInitMap.put(newire")); - mInitMap.put(new Pair<String, String>("func_147789_b", "renderPistonRodSN")); - mInitMap.put(new Pair<String, String>("func_147790_e", "renderBlockLever")); - mInitMap.put(new Pair<String, String>("func_147791_c", "renderBlockTorch")); - mInitMap.put(new Pair<String, String>("func_147792_a", "renderBlockUsingTexture")); - mInitMap.put(new Pair<String, String>("func_147793_a", "getBlockIcon")); - mInitMap.put(new Pair<String, String>("func_147794_i", "renderBlockLadder")); - mInitMap.put(new Pair<String, String>("func_147795_a", "renderBlockCropsImpl")); - mInitMap.put(new Pair<String, String>("func_147796_n", "renderBlockCrops")); - mInitMap.put(new Pair<String, String>("func_147797_a", "renderBlockBeacon")); - mInitMap.put(new Pair<String, String>("func_147798_e", "renderFaceXNeg")); - mInitMap.put(new Pair<String, String>("func_147799_a", "renderBlockHopperMetadata")); - mInitMap.put(new Pair<String, String>("func_147800_a", "renderBlockAsItem")); - mInitMap.put(new Pair<String, String>("func_147801_a", "renderBlockFire")); - mInitMap.put(new Pair<String, String>("func_147802_a", "renderBlockDragonEgg")); - mInitMap.put(new Pair<String, String>("func_147803_a", "renderBlockHopper")); - mInitMap.put(new Pair<String, String>("func_147804_d", "renderPistonBaseAllFaces")); - mInitMap.put(new Pair<String, String>("func_147805_b", "renderBlockByRenderType")); - mInitMap.put(new Pair<String, String>("func_147806_b", "renderFaceYPos")); - mInitMap.put(new Pair<String, String>("func_147807_a", "renderBlockWall")); - mInitMap.put(new Pair<String, String>("func_147808_b", "renderStandardBlockWithAmbientOcclusionPartial")); - mInitMap.put(new Pair<String, String>("func_147809_c", "renderPistonExtension")); - mInitMap.put(new Pair<String, String>("func_147889_b", "updateRendererSort")); - mInitMap.put(new Pair<String, String>("func_147890_b", "preRenderBlocks")); - mInitMap.put(new Pair<String, String>("func_147891_a", "postRenderBlocks")); - mInitMap.put(new Pair<String, String>("func_147892_a", "updateRenderer")); - mInitMap.put(new Pair<String, String>("func_147905_a", "isStaticEntity")); - mInitMap.put(new Pair<String, String>("func_147906_a", "renderLivingLabel")); - mInitMap.put(new Pair<String, String>("func_147936_a", "renderEntityStatic")); - mInitMap.put(new Pair<String, String>("func_147937_a", "renderEntitySimple")); - mInitMap.put(new Pair<String, String>("func_147938_a", "cacheActiveRenderInfo")); - mInitMap.put(new Pair<String, String>("func_147939_a", "doRenderEntity")); - mInitMap.put(new Pair<String, String>("func_147940_a", "renderEntityWithPosYaw")); - mInitMap.put(new Pair<String, String>("func_147942_a", "deleteTexture")); - mInitMap.put(new Pair<String, String>("func_147946_a", "allocateTextureImpl")); - mInitMap.put(new Pair<String, String>("func_147947_a", "uploadTextureSub")); - mInitMap.put(new Pair<String, String>("func_147948_a", "prepareAnisotropicData")); - mInitMap.put(new Pair<String, String>("func_147949_a", "generateMipmapData")); - } - - private static void init2() { - mInitMap.put(new Pair<String, String>("func_147951_b", "setTextureBlurred")); - mInitMap.put(new Pair<String, String>("func_147955_a", "uploadTextureMipmap")); - mInitMap.put(new Pair<String, String>("func_147960_a", "prepareAnisotropicFiltering")); - mInitMap.put(new Pair<String, String>("func_147961_a", "fixTransparentPixels")); - mInitMap.put(new Pair<String, String>("func_147962_a", "getFrameTextureData")); - mInitMap.put(new Pair<String, String>("func_147963_d", "generateMipmaps")); - mInitMap.put(new Pair<String, String>("func_147964_a", "loadSprite")); - mInitMap.put(new Pair<String, String>("func_147965_a", "getFrameTextureData")); - mInitMap.put(new Pair<String, String>("func_147969_b", "getMipmapDimension")); - mInitMap.put(new Pair<String, String>("func_147984_b", "getShaderUniformOrDefault")); - mInitMap.put(new Pair<String, String>("func_147985_d", "markDirty")); - mInitMap.put(new Pair<String, String>("func_147986_h", "getProgram")); - mInitMap.put(new Pair<String, String>("func_147987_b", "parseUniform")); - mInitMap.put(new Pair<String, String>("func_147988_a", "deleteShader")); - mInitMap.put(new Pair<String, String>("func_147989_e", "getVertexShaderLoader")); - mInitMap.put(new Pair<String, String>("func_147990_i", "setupUniforms")); - mInitMap.put(new Pair<String, String>("func_147991_a", "getShaderUniform")); - mInitMap.put(new Pair<String, String>("func_147992_a", "addSamplerTexture")); - mInitMap.put(new Pair<String, String>("func_147993_b", "endShader")); - mInitMap.put(new Pair<String, String>("func_147994_f", "getFragmentShaderLoader")); - mInitMap.put(new Pair<String, String>("func_147995_c", "useShader")); - mInitMap.put(new Pair<String, String>("func_147996_a", "parseSampler")); - mInitMap.put(new Pair<String, String>("func_148017_a", "getFramebuffer")); - mInitMap.put(new Pair<String, String>("func_148018_a", "loadShaderGroup")); - mInitMap.put(new Pair<String, String>("func_148020_a", "addFramebuffer")); - mInitMap.put(new Pair<String, String>("func_148021_a", "deleteShaderGroup")); - mInitMap.put(new Pair<String, String>("func_148022_b", "getShaderGroupName")); - mInitMap.put(new Pair<String, String>("func_148023_a", "addShader")); - mInitMap.put(new Pair<String, String>("func_148024_c", "resetProjectionMatrix")); - mInitMap.put(new Pair<String, String>("func_148026_a", "createBindFramebuffers")); - mInitMap.put(new Pair<String, String>("func_148027_a", "initTarget")); - mInitMap.put(new Pair<String, String>("func_148028_c", "initUniform")); - mInitMap.put(new Pair<String, String>("func_148040_d", "preLoadShader")); - mInitMap.put(new Pair<String, String>("func_148041_a", "addAuxFramebuffer")); - mInitMap.put(new Pair<String, String>("func_148042_a", "loadShader")); - mInitMap.put(new Pair<String, String>("func_148043_c", "getShaderManager")); - mInitMap.put(new Pair<String, String>("func_148044_b", "deleteShader")); - mInitMap.put(new Pair<String, String>("func_148045_a", "setProjectionMatrix")); - mInitMap.put(new Pair<String, String>("func_148054_b", "deleteShader")); - mInitMap.put(new Pair<String, String>("func_148055_a", "getShaderFilename")); - mInitMap.put(new Pair<String, String>("func_148056_a", "attachShader")); - mInitMap.put(new Pair<String, String>("func_148057_a", "loadShader")); - mInitMap.put(new Pair<String, String>("func_148062_a", "getShaderName")); - mInitMap.put(new Pair<String, String>("func_148063_b", "getShaderExtension")); - mInitMap.put(new Pair<String, String>("func_148064_d", "getLoadedShaders")); - mInitMap.put(new Pair<String, String>("func_148065_c", "getShaderMode")); - mInitMap.put(new Pair<String, String>("func_148074_b", "getStaticShaderLinkHelper")); - mInitMap.put(new Pair<String, String>("func_148075_b", "linkProgram")); - mInitMap.put(new Pair<String, String>("func_148076_a", "setmInitMap.put(newStaticShaderLinkHelper")); - mInitMap.put(new Pair<String, String>("func_148077_a", "deleteShader")); - mInitMap.put(new Pair<String, String>("func_148078_c", "createProgram")); - mInitMap.put(new Pair<String, String>("func_148081_a", "set")); - mInitMap.put(new Pair<String, String>("func_148082_k", "uploadFloatMatrix")); - mInitMap.put(new Pair<String, String>("func_148083_a", "set")); - mInitMap.put(new Pair<String, String>("func_148084_b", "setUniformLocation")); - mInitMap.put(new Pair<String, String>("func_148085_a", "parseType")); - mInitMap.put(new Pair<String, String>("func_148086_a", "getShaderName")); - mInitMap.put(new Pair<String, String>("func_148087_a", "set")); - mInitMap.put(new Pair<String, String>("func_148088_a", "set")); - mInitMap.put(new Pair<String, String>("func_148089_j", "uploadFloat")); - mInitMap.put(new Pair<String, String>("func_148090_a", "set")); - mInitMap.put(new Pair<String, String>("func_148091_i", "uploadInt")); - mInitMap.put(new Pair<String, String>("func_148093_b", "upload")); - mInitMap.put(new Pair<String, String>("func_148094_a", "set")); - mInitMap.put(new Pair<String, String>("func_148095_a", "set")); - mInitMap.put(new Pair<String, String>("func_148096_h", "markDirty")); - mInitMap.put(new Pair<String, String>("func_148097_a", "set")); - mInitMap.put(new Pair<String, String>("func_148120_b", "drawSelectionBox")); - mInitMap.put(new Pair<String, String>("func_148121_k", "bindAmountScrolled")); - mInitMap.put(new Pair<String, String>("func_148122_a", "setDimensions")); - mInitMap.put(new Pair<String, String>("func_148123_a", "drawBackground")); - mInitMap.put(new Pair<String, String>("func_148124_c", "getSlotIndexFromScreenCoords")); - mInitMap.put(new Pair<String, String>("func_148125_i", "getEnabled")); - mInitMap.put(new Pair<String, String>("func_148126_a", "drawSlot")); - mInitMap.put(new Pair<String, String>("func_148127_b", "getSize")); - mInitMap.put(new Pair<String, String>("func_148128_a", "drawScreen")); - mInitMap.put(new Pair<String, String>("func_148129_a", "drawListHeader")); - mInitMap.put(new Pair<String, String>("func_148130_a", "setShowSelectionBox")); - mInitMap.put(new Pair<String, String>("func_148131_a", "isSelected")); - mInitMap.put(new Pair<String, String>("func_148133_a", "setHasListHeader")); - mInitMap.put(new Pair<String, String>("func_148134_d", "registerScrollButtons")); - mInitMap.put(new Pair<String, String>("func_148136_c", "overlayBackground")); - mInitMap.put(new Pair<String, String>("func_148137_d", "getScrollBarX")); - mInitMap.put(new Pair<String, String>("func_148138_e", "getContentHeight")); - mInitMap.put(new Pair<String, String>("func_148139_c", "getListWidth")); - mInitMap.put(new Pair<String, String>("func_148140_g", "setSlotXBoundsFromLeft")); - mInitMap.put(new Pair<String, String>("func_148141_e", "isMouseYWithinSlotBounds")); - mInitMap.put(new Pair<String, String>("func_148143_b", "setEnabled")); - mInitMap.put(new Pair<String, String>("func_148144_a", "elementClicked")); - mInitMap.put(new Pair<String, String>("func_148145_f", "scrollBy")); - mInitMap.put(new Pair<String, String>("func_148146_j", "getSlotHeight")); - mInitMap.put(new Pair<String, String>("func_148147_a", "actionPerformed")); - mInitMap.put(new Pair<String, String>("func_148148_g", "getAmountScrolled")); - mInitMap.put(new Pair<String, String>("func_148180_b", "getListEntry")); - mInitMap.put(new Pair<String, String>("func_148201_l", "getList")); - mInitMap.put(new Pair<String, String>("func_148202_k", "getListHeader")); - mInitMap.put(new Pair<String, String>("func_148254_d", "getToken")); - mInitMap.put(new Pair<String, String>("func_148255_b", "getPlayerID")); - mInitMap.put(new Pair<String, String>("func_148256_e", "getProfile")); - mInitMap.put(new Pair<String, String>("func_148259_a", "saveScreenshot")); - mInitMap.put(new Pair<String, String>("func_148260_a", "saveScreenshot")); - mInitMap.put(new Pair<String, String>("func_148262_d", "denormalizeValue")); - mInitMap.put(new Pair<String, String>("func_148263_a", "setValueMax")); - mInitMap.put(new Pair<String, String>("func_148264_f", "snapToStep")); - mInitMap.put(new Pair<String, String>("func_148266_c", "normalizeValue")); - mInitMap.put(new Pair<String, String>("func_148267_f", "getValueMax")); - mInitMap.put(new Pair<String, String>("func_148268_e", "snapToStepClamp")); - mInitMap.put(new Pair<String, String>("func_148277_b", "mouseReleased")); - mInitMap.put(new Pair<String, String>("func_148278_a", "mousePressed")); - mInitMap.put(new Pair<String, String>("func_148279_a", "drawEntry")); - mInitMap.put(new Pair<String, String>("func_148289_a", "getLanServer")); - mInitMap.put(new Pair<String, String>("func_148296_a", "getServerData")); - mInitMap.put(new Pair<String, String>("func_148297_b", "prepareServerIcon")); - mInitMap.put(new Pair<String, String>("func_148329_a", "scrollTo")); - mInitMap.put(new Pair<String, String>("func_148334_a", "generatemInitMap.put(newRandomName")); - mInitMap.put(new Pair<String, String>("func_148335_a", "reseedRandomGenerator")); - mInitMap.put(new Pair<String, String>("func_148522_a", "onDownloadComplete")); - mInitMap.put(new Pair<String, String>("func_148526_a", "obtainResourcePack")); - mInitMap.put(new Pair<String, String>("func_148530_e", "getResourcePackInstance")); - mInitMap.put(new Pair<String, String>("func_148535_c", "getListMipmaps")); - mInitMap.put(new Pair<String, String>("func_148537_a", "sendPacketToAllPlayersInDimension")); - mInitMap.put(new Pair<String, String>("func_148539_a", "sendChatMsg")); - mInitMap.put(new Pair<String, String>("func_148540_a", "sendPacketToAllPlayers")); - mInitMap.put(new Pair<String, String>("func_148541_a", "sendToAllNear")); - mInitMap.put(new Pair<String, String>("func_148542_a", "allowUserToConnect")); - mInitMap.put(new Pair<String, String>("func_148543_a", "sendToAllNearExcept")); - mInitMap.put(new Pair<String, String>("func_148544_a", "sendChatMsgImpl")); - mInitMap.put(new Pair<String, String>("func_148545_a", "createPlayerForUser")); - mInitMap.put(new Pair<String, String>("func_148552_f", "isStreaming")); - mInitMap.put(new Pair<String, String>("func_148553_a", "setSoundEntryVolume")); - mInitMap.put(new Pair<String, String>("func_148554_a", "setSoundEntryWeight")); - mInitMap.put(new Pair<String, String>("func_148555_d", "getSoundEntryWeight")); - mInitMap.put(new Pair<String, String>("func_148556_a", "getSoundEntryName")); - mInitMap.put(new Pair<String, String>("func_148557_a", "setStreaming")); - mInitMap.put(new Pair<String, String>("func_148558_b", "getSoundEntryVolume")); - mInitMap.put(new Pair<String, String>("func_148559_b", "setSoundEntryPitch")); - mInitMap.put(new Pair<String, String>("func_148560_c", "getSoundEntryPitch")); - mInitMap.put(new Pair<String, String>("func_148561_a", "setSoundEntryName")); - mInitMap.put(new Pair<String, String>("func_148562_a", "setSoundEntryType")); - mInitMap.put(new Pair<String, String>("func_148563_e", "getSoundEntryType")); - mInitMap.put(new Pair<String, String>("func_148570_a", "getSoundList")); - mInitMap.put(new Pair<String, String>("func_148571_a", "setSoundCategory")); - mInitMap.put(new Pair<String, String>("func_148572_a", "setReplaceExisting")); - mInitMap.put(new Pair<String, String>("func_148573_c", "getSoundCategory")); - mInitMap.put(new Pair<String, String>("func_148574_b", "canReplaceExisting")); - mInitMap.put(new Pair<String, String>("func_148580_a", "getType")); - mInitMap.put(new Pair<String, String>("func_148586_a", "getTypeInt")); - mInitMap.put(new Pair<String, String>("func_148594_a", "getNormalizedVolume")); - mInitMap.put(new Pair<String, String>("func_148595_a", "getSoundCategoryVolume")); - mInitMap.put(new Pair<String, String>("func_148596_a", "reloadSoundSystem")); - mInitMap.put(new Pair<String, String>("func_148597_a", "isSoundPlaying")); - mInitMap.put(new Pair<String, String>("func_148599_a", "playDelayedSound")); - mInitMap.put(new Pair<String, String>("func_148601_a", "setSoundCategoryVolume")); - mInitMap.put(new Pair<String, String>("func_148602_b", "stopSound")); - mInitMap.put(new Pair<String, String>("func_148604_f", "resumeAllSounds")); - mInitMap.put(new Pair<String, String>("func_148605_d", "updateAllSounds")); - mInitMap.put(new Pair<String, String>("func_148606_a", "getNormalizedPitch")); - mInitMap.put(new Pair<String, String>("func_148608_i", "loadSoundSystem")); - mInitMap.put(new Pair<String, String>("func_148610_e", "pauseAllSounds")); - mInitMap.put(new Pair<String, String>("func_148611_c", "playSound")); - mInitMap.put(new Pair<String, String>("func_148612_a", "getURLForSoundResource")); - mInitMap.put(new Pair<String, String>("func_148613_b", "unloadSoundSystem")); - mInitMap.put(new Pair<String, String>("func_148614_c", "stopAllSounds")); - mInitMap.put(new Pair<String, String>("func_148615_a", "setListener")); - mInitMap.put(new Pair<String, String>("func_148633_c", "getMaxDelay")); - mInitMap.put(new Pair<String, String>("func_148634_b", "getMinDelay")); - mInitMap.put(new Pair<String, String>("func_148635_a", "getMusicTickerLocation")); - mInitMap.put(new Pair<String, String>("func_148647_b", "setVolume")); - mInitMap.put(new Pair<String, String>("func_148648_d", "isStreamingSound")); - mInitMap.put(new Pair<String, String>("func_148649_c", "getVolume")); - mInitMap.put(new Pair<String, String>("func_148650_b", "getPitch")); - mInitMap.put(new Pair<String, String>("func_148651_a", "setPitch")); - mInitMap.put(new Pair<String, String>("func_148652_a", "getSoundPoolEntryLocation")); - mInitMap.put(new Pair<String, String>("func_148727_a", "addSoundToEventPool")); - mInitMap.put(new Pair<String, String>("func_148728_d", "getSoundCategory")); - mInitMap.put(new Pair<String, String>("func_148729_c", "getSoundEventLocation")); - mInitMap.put(new Pair<String, String>("func_148740_a", "createUnderlyingMap")); - mInitMap.put(new Pair<String, String>("func_148741_d", "containsKey")); - mInitMap.put(new Pair<String, String>("func_148742_b", "getKeys")); - mInitMap.put(new Pair<String, String>("func_148750_c", "getNameForObject")); - mInitMap.put(new Pair<String, String>("func_148753_b", "containsId")); - mInitMap.put(new Pair<String, String>("func_148754_a", "getObjectById")); - mInitMap.put(new Pair<String, String>("func_148755_c", "ensureNamespaced")); - mInitMap.put(new Pair<String, String>("func_148756_a", "addObject")); - mInitMap.put(new Pair<String, String>("func_148757_b", "getIDForObject")); - mInitMap.put(new Pair<String, String>("func_148762_a", "registerSound")); - mInitMap.put(new Pair<String, String>("func_148763_c", "clearMap")); - mInitMap.put(new Pair<String, String>("func_148821_a", "glBlendFunc")); - mInitMap.put(new Pair<String, String>("func_148822_b", "isFramebufferEnabled")); - mInitMap.put(new Pair<String, String>("func_148833_a", "processPacket")); - mInitMap.put(new Pair<String, String>("func_148834_a", "readBlob")); - mInitMap.put(new Pair<String, String>("func_148835_b", "serialize")); - mInitMap.put(new Pair<String, String>("func_148836_a", "hasPriority")); - mInitMap.put(new Pair<String, String>("func_148837_a", "readPacketData")); - mInitMap.put(new Pair<String, String>("func_148838_a", "writeBlob")); - mInitMap.put(new Pair<String, String>("func_148839_a", "generatePacket")); - mInitMap.put(new Pair<String, String>("func_148840_b", "writePacketData")); - mInitMap.put(new Pair<String, String>("func_148853_f", "getTileEntityType")); - mInitMap.put(new Pair<String, String>("func_148854_e", "getZ")); - mInitMap.put(new Pair<String, String>("func_148855_d", "getY")); - mInitMap.put(new Pair<String, String>("func_148856_c", "getX")); - mInitMap.put(new Pair<String, String>("func_148857_g", "getNbtCompound")); - mInitMap.put(new Pair<String, String>("func_148864_h", "getData2")); - mInitMap.put(new Pair<String, String>("func_148865_f", "getZ")); - mInitMap.put(new Pair<String, String>("func_148866_e", "getY")); - mInitMap.put(new Pair<String, String>("func_148867_d", "getX")); - mInitMap.put(new Pair<String, String>("func_148868_c", "getBlockType")); - mInitMap.put(new Pair<String, String>("func_148869_g", "getData1")); - mInitMap.put(new Pair<String, String>("func_148916_d", "isChat")); - mInitMap.put(new Pair<String, String>("func_149089_e", "getZ")); - mInitMap.put(new Pair<String, String>("func_149090_d", "getY")); - mInitMap.put(new Pair<String, String>("func_149091_a", "getPlayer")); - mInitMap.put(new Pair<String, String>("func_149092_c", "getX")); - mInitMap.put(new Pair<String, String>("func_149101_g", "getFlySpeed")); - mInitMap.put(new Pair<String, String>("func_149102_b", "setFlying")); - mInitMap.put(new Pair<String, String>("func_149103_f", "isCreativeMode")); - mInitMap.put(new Pair<String, String>("func_149104_a", "setFlySpeed")); - mInitMap.put(new Pair<String, String>("func_149105_e", "isAllowFlying")); - mInitMap.put(new Pair<String, String>("func_149106_d", "isFlying")); - mInitMap.put(new Pair<String, String>("func_149107_h", "getWalkSpeed")); - mInitMap.put(new Pair<String, String>("func_149108_a", "setInvulnerable")); - mInitMap.put(new Pair<String, String>("func_149109_c", "setAllowFlying")); - mInitMap.put(new Pair<String, String>("func_149110_b", "setWalkSpeed")); - mInitMap.put(new Pair<String, String>("func_149111_d", "setCreativeMode")); - mInitMap.put(new Pair<String, String>("func_149112_c", "isInvulnerable")); - mInitMap.put(new Pair<String, String>("func_149187_d", "getData")); - mInitMap.put(new Pair<String, String>("func_149188_c", "getMapId")); - mInitMap.put(new Pair<String, String>("func_149239_h", "getPosZ")); - mInitMap.put(new Pair<String, String>("func_149240_f", "getPosX")); - mInitMap.put(new Pair<String, String>("func_149241_e", "getSoundData")); - mInitMap.put(new Pair<String, String>("func_149242_d", "getSoundType")); - mInitMap.put(new Pair<String, String>("func_149243_g", "getPosY")); - mInitMap.put(new Pair<String, String>("func_149244_c", "isSoundServerwide")); - mInitMap.put(new Pair<String, String>("func_149289_c", "getClientTime")); - mInitMap.put(new Pair<String, String>("func_149304_c", "getProfile")); - mInitMap.put(new Pair<String, String>("func_149330_d", "getFoodLevel")); - mInitMap.put(new Pair<String, String>("func_149331_e", "getSaturationLevel")); - mInitMap.put(new Pair<String, String>("func_149332_c", "getHealth")); - mInitMap.put(new Pair<String, String>("func_149419_c", "getMessage")); - mInitMap.put(new Pair<String, String>("func_149421_d", "getType")); - mInitMap.put(new Pair<String, String>("func_149435_c", "getStatus")); - mInitMap.put(new Pair<String, String>("func_149439_c", "getMessage")); - mInitMap.put(new Pair<String, String>("func_149460_c", "getKey")); - mInitMap.put(new Pair<String, String>("func_149462_g", "getYaw")); - mInitMap.put(new Pair<String, String>("func_149463_k", "getRotating")); - mInitMap.put(new Pair<String, String>("func_149464_c", "getPositionX")); - mInitMap.put(new Pair<String, String>("func_149467_d", "getPositionY")); - mInitMap.put(new Pair<String, String>("func_149470_h", "getPitch")); - mInitMap.put(new Pair<String, String>("func_149471_f", "getStance")); - mInitMap.put(new Pair<String, String>("func_149472_e", "getPositionZ")); - mInitMap.put(new Pair<String, String>("func_149482_g", "getFlySpeed")); - mInitMap.put(new Pair<String, String>("func_149483_b", "setFlying")); - mInitMap.put(new Pair<String, String>("func_149484_f", "isCreativeMode")); - mInitMap.put(new Pair<String, String>("func_149485_a", "setFlySpeed")); - mInitMap.put(new Pair<String, String>("func_149486_e", "isAllowFlying")); - mInitMap.put(new Pair<String, String>("func_149488_d", "isFlying")); - mInitMap.put(new Pair<String, String>("func_149489_h", "getWalkSpeed")); - mInitMap.put(new Pair<String, String>("func_149490_a", "setInvulnerable")); - mInitMap.put(new Pair<String, String>("func_149491_c", "setAllowFlying")); - mInitMap.put(new Pair<String, String>("func_149492_b", "setWalkSpeed")); - mInitMap.put(new Pair<String, String>("func_149493_d", "setCreativeMode")); - mInitMap.put(new Pair<String, String>("func_149494_c", "isInvulnerable")); - mInitMap.put(new Pair<String, String>("func_149501_f", "getDiggingBlockFace")); - mInitMap.put(new Pair<String, String>("func_149502_e", "getDiggedBlockZ")); - mInitMap.put(new Pair<String, String>("func_149503_d", "getDiggedBlockY")); - mInitMap.put(new Pair<String, String>("func_149505_c", "getDiggedBlockX")); - mInitMap.put(new Pair<String, String>("func_149506_g", "getDiggedBlockStatus")); - mInitMap.put(new Pair<String, String>("func_149518_g", "getDifficulty")); - mInitMap.put(new Pair<String, String>("func_149519_h", "isShowCape")); - mInitMap.put(new Pair<String, String>("func_149520_f", "isColorsEnabled")); - mInitMap.put(new Pair<String, String>("func_149521_d", "getView")); - mInitMap.put(new Pair<String, String>("func_149523_e", "getChatVisibility")); - mInitMap.put(new Pair<String, String>("func_149524_c", "getLang")); - mInitMap.put(new Pair<String, String>("func_149532_c", "getId")); - mInitMap.put(new Pair<String, String>("func_149533_d", "getUid")); - mInitMap.put(new Pair<String, String>("func_149537_d", "getButton")); - mInitMap.put(new Pair<String, String>("func_149539_c", "getId")); - mInitMap.put(new Pair<String, String>("func_149542_h", "getMode")); - mInitMap.put(new Pair<String, String>("func_149543_e", "getUsedButton")); - mInitMap.put(new Pair<String, String>("func_149544_d", "getSlotId")); - mInitMap.put(new Pair<String, String>("func_149546_g", "getClickedItem")); - mInitMap.put(new Pair<String, String>("func_149547_f", "getActionNumber")); - mInitMap.put(new Pair<String, String>("func_149548_c", "getWindowId")); - mInitMap.put(new Pair<String, String>("func_149558_e", "getData")); - mInitMap.put(new Pair<String, String>("func_149559_c", "getChannel")); - mInitMap.put(new Pair<String, String>("func_149564_a", "getEntityFromWorld")); - mInitMap.put(new Pair<String, String>("func_149565_c", "getAction")); - mInitMap.put(new Pair<String, String>("func_149568_f", "getPlacedBlockDirection")); - mInitMap.put(new Pair<String, String>("func_149569_i", "getPlacedBlockOffsetY")); - mInitMap.put(new Pair<String, String>("func_149570_e", "getPlacedBlockZ")); - mInitMap.put(new Pair<String, String>("func_149571_d", "getPlacedBlockY")); - mInitMap.put(new Pair<String, String>("func_149573_h", "getPlacedBlockOffsetX")); - mInitMap.put(new Pair<String, String>("func_149574_g", "getStack")); - mInitMap.put(new Pair<String, String>("func_149575_j", "getPlacedBlockOffsetZ")); - mInitMap.put(new Pair<String, String>("func_149576_c", "getPlacedBlockX")); - mInitMap.put(new Pair<String, String>("func_149585_e", "getZ")); - mInitMap.put(new Pair<String, String>("func_149586_d", "getY")); - mInitMap.put(new Pair<String, String>("func_149588_c", "getX")); - mInitMap.put(new Pair<String, String>("func_149589_f", "getLines")); - mInitMap.put(new Pair<String, String>("func_149594_c", "getRequestedState")); - mInitMap.put(new Pair<String, String>("func_149595_d", "getProtocolVersion")); - mInitMap.put(new Pair<String, String>("func_149614_c", "getSlotId")); - mInitMap.put(new Pair<String, String>("func_149616_d", "getForwardSpeed")); - mInitMap.put(new Pair<String, String>("func_149617_f", "isSneaking")); - mInitMap.put(new Pair<String, String>("func_149618_e", "isJumping")); - mInitMap.put(new Pair<String, String>("func_149620_c", "getStrafeSpeed")); - mInitMap.put(new Pair<String, String>("func_149625_d", "getStack")); - mInitMap.put(new Pair<String, String>("func_149627_c", "getSlotId")); - mInitMap.put(new Pair<String, String>("func_149633_g", "getSelectedBoundingBoxFromPool")); - mInitMap.put(new Pair<String, String>("func_149634_a", "getBlockFromItem")); - mInitMap.put(new Pair<String, String>("func_149635_D", "getBlockColor")); - mInitMap.put(new Pair<String, String>("func_149636_a", "harvestBlock")); - mInitMap.put(new Pair<String, String>("func_149637_q", "isBlockNormalCube")); - mInitMap.put(new Pair<String, String>("func_149638_a", "getExplosionResistance")); - mInitMap.put(new Pair<String, String>("func_149639_l", "fillWithRain")); - mInitMap.put(new Pair<String, String>("func_149640_a", "modifyEntityVelocity")); - mInitMap.put(new Pair<String, String>("func_149641_N", "getTextureName")); - mInitMap.put(new Pair<String, String>("func_149642_a", "dropBlockAsItem")); - mInitMap.put(new Pair<String, String>("func_149643_k", "getDamageValue")); - mInitMap.put(new Pair<String, String>("func_149644_j", "createStackedBlock")); - mInitMap.put(new Pair<String, String>("func_149645_b", "getRenderType")); - mInitMap.put(new Pair<String, String>("func_149646_a", "shouldSideBeRendered")); - mInitMap.put(new Pair<String, String>("func_149647_a", "setCreativeTab")); - mInitMap.put(new Pair<String, String>("func_149648_K", "isFlowerPot")); - mInitMap.put(new Pair<String, String>("func_149649_H", "disableStats")); - mInitMap.put(new Pair<String, String>("func_149650_a", "getItemDropped")); - mInitMap.put(new Pair<String, String>("func_149651_a", "registerIcons")); - mInitMap.put(new Pair<String, String>("func_149652_G", "getEnableStats")); - mInitMap.put(new Pair<String, String>("func_149653_t", "getTickRandomly")); - mInitMap.put(new Pair<String, String>("func_149654_a", "isVecInsideYZBounds")); - mInitMap.put(new Pair<String, String>("func_149655_b", "isPassable")); - mInitMap.put(new Pair<String, String>("func_149656_h", "getMobilityFlag")); - mInitMap.put(new Pair<String, String>("func_149657_c", "dropXpOnBlockBreak")); - mInitMap.put(new Pair<String, String>("func_149658_d", "setTextureName")); - mInitMap.put(new Pair<String, String>("func_149659_a", "canDropFromExplosion")); - mInitMap.put(new Pair<String, String>("func_149660_a", "onBlockPlaced")); - mInitMap.put(new Pair<String, String>("func_149661_c", "isVecInsideXYBounds")); - mInitMap.put(new Pair<String, String>("func_149662_c", "isOpaqueCube")); - mInitMap.put(new Pair<String, String>("func_149663_c", "setUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_149664_b", "onBlockDestroyedByPlayer")); - mInitMap.put(new Pair<String, String>("func_149665_z", "getBlockBoundsMinY")); - mInitMap.put(new Pair<String, String>("func_149666_a", "getSubBlocks")); - mInitMap.put(new Pair<String, String>("func_149667_c", "isAssociatedBlock")); - mInitMap.put(new Pair<String, String>("func_149668_a", "getCollisionBoundingBoxFromPool")); - mInitMap.put(new Pair<String, String>("func_149669_A", "getBlockBoundsMaxY")); - mInitMap.put(new Pair<String, String>("func_149670_a", "onEntityCollidedWithBlock")); - mInitMap.put(new Pair<String, String>("func_149671_p", "registerBlocks")); - mInitMap.put(new Pair<String, String>("func_149672_a", "setStepSound")); - mInitMap.put(new Pair<String, String>("func_149673_e", "getIcon")); - mInitMap.put(new Pair<String, String>("func_149674_a", "updateTick")); - mInitMap.put(new Pair<String, String>("func_149675_a", "setTickRandomly")); - mInitMap.put(new Pair<String, String>("func_149676_a", "setBlockBounds")); - mInitMap.put(new Pair<String, String>("func_149677_c", "getMixedBrightnessForBlock")); - mInitMap.put(new Pair<String, String>("func_149678_a", "canStopRayTrace")); - mInitMap.put(new Pair<String, String>("func_149679_a", "quantityDroppedWithBonus")); - mInitMap.put(new Pair<String, String>("func_149680_a", "isEqualTo")); - mInitMap.put(new Pair<String, String>("func_149681_a", "onBlockHarvested")); - mInitMap.put(new Pair<String, String>("func_149682_b", "getIdFromBlock")); - mInitMap.put(new Pair<String, String>("func_149683_g", "setBlockBoundsForItemRender")); - mInitMap.put(new Pair<String, String>("func_149684_b", "getBlockFromName")); - mInitMap.put(new Pair<String, String>("func_149685_I", "getAmbientOcclusionLightValue")); - mInitMap.put(new Pair<String, String>("func_149686_d", "renderAsNormalBlock")); - mInitMap.put(new Pair<String, String>("func_149687_b", "isVecInsideXZBounds")); - mInitMap.put(new Pair<String, String>("func_149688_o", "getMaterial")); - mInitMap.put(new Pair<String, String>("func_149689_a", "onBlockPlacedBy")); - mInitMap.put(new Pair<String, String>("func_149690_a", "dropBlockAsItemWithChance")); - mInitMap.put(new Pair<String, String>("func_149691_a", "getIcon")); - mInitMap.put(new Pair<String, String>("func_149692_a", "damageDropped")); - mInitMap.put(new Pair<String, String>("func_149693_C", "getBlockBoundsMaxZ")); - mInitMap.put(new Pair<String, String>("func_149694_d", "getItem")); - mInitMap.put(new Pair<String, String>("func_149695_a", "onNeighborBlockChange")); - mInitMap.put(new Pair<String, String>("func_149696_a", "onBlockEventReceived")); - mInitMap.put(new Pair<String, String>("func_149697_b", "dropBlockAsItem")); - mInitMap.put(new Pair<String, String>("func_149698_L", "requiresUpdates")); - mInitMap.put(new Pair<String, String>("func_149699_a", "onBlockClicked")); - mInitMap.put(new Pair<String, String>("func_149700_E", "canSilkHarvest")); - mInitMap.put(new Pair<String, String>("func_149701_w", "getRenderBlockPass")); - mInitMap.put(new Pair<String, String>("func_149702_O", "getItemIconName")); - mInitMap.put(new Pair<String, String>("func_149703_v", "isCollidable")); - mInitMap.put(new Pair<String, String>("func_149704_x", "getBlockBoundsMinX")); - mInitMap.put(new Pair<String, String>("func_149705_a", "canReplace")); - mInitMap.put(new Pair<String, String>("func_149706_B", "getBlockBoundsMinZ")); - mInitMap.put(new Pair<String, String>("func_149707_d", "canPlaceBlockOnSide")); - mInitMap.put(new Pair<String, String>("func_149708_J", "getCreativeTabToDisplayOn")); - mInitMap.put(new Pair<String, String>("func_149709_b", "isProvidingWeakPower")); - mInitMap.put(new Pair<String, String>("func_149710_n", "getUseNeighborBrightness")); - mInitMap.put(new Pair<String, String>("func_149711_c", "setHardness")); - mInitMap.put(new Pair<String, String>("func_149712_f", "getBlockHardness")); - mInitMap.put(new Pair<String, String>("func_149713_g", "setLightOpacity")); - mInitMap.put(new Pair<String, String>("func_149714_e", "onPostBlockPlaced")); - mInitMap.put(new Pair<String, String>("func_149715_a", "setLightLevel")); - mInitMap.put(new Pair<String, String>("func_149716_u", "hasTileEntity")); - mInitMap.put(new Pair<String, String>("func_149717_k", "getLightOpacity")); - mInitMap.put(new Pair<String, String>("func_149718_j", "canBlockStay")); - mInitMap.put(new Pair<String, String>("func_149719_a", "setBlockBoundsBasedOnState")); - mInitMap.put(new Pair<String, String>("func_149720_d", "colorMultiplier")); - mInitMap.put(new Pair<String, String>("func_149721_r", "isNormalCube")); - mInitMap.put(new Pair<String, String>("func_149722_s", "setBlockUnbreakable")); - mInitMap.put(new Pair<String, String>("func_149723_a", "onBlockDestroyedByExplosion")); - mInitMap.put(new Pair<String, String>("func_149724_b", "onEntityWalking")); - mInitMap.put(new Pair<String, String>("func_149725_f", "onBlockPreDestroy")); - mInitMap.put(new Pair<String, String>("func_149726_b", "onBlockAdded")); - mInitMap.put(new Pair<String, String>("func_149727_a", "onBlockActivated")); - mInitMap.put(new Pair<String, String>("func_149728_f", "getMapColor")); - mInitMap.put(new Pair<String, String>("func_149729_e", "getBlockById")); - mInitMap.put(new Pair<String, String>("func_149730_j", "isFullBlock")); - mInitMap.put(new Pair<String, String>("func_149731_a", "collisionRayTrace")); - mInitMap.put(new Pair<String, String>("func_149732_F", "getLocalizedName")); - mInitMap.put(new Pair<String, String>("func_149733_h", "getBlockTextureFromSide")); - mInitMap.put(new Pair<String, String>("func_149734_b", "randomDisplayTick")); - mInitMap.put(new Pair<String, String>("func_149735_b", "getItemIcon")); - mInitMap.put(new Pair<String, String>("func_149736_g", "getComparatorInputOverride")); - mInitMap.put(new Pair<String, String>("func_149737_a", "getPlayerRelativeBlockHardness")); - mInitMap.put(new Pair<String, String>("func_149738_a", "tickRate")); - mInitMap.put(new Pair<String, String>("func_149739_a", "getUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_149740_M", "hasComparatorInputOverride")); - mInitMap.put(new Pair<String, String>("func_149741_i", "getRenderColor")); - mInitMap.put(new Pair<String, String>("func_149742_c", "canPlaceBlockAt")); - mInitMap.put(new Pair<String, String>("func_149743_a", "addCollisionBoxesToList")); - mInitMap.put(new Pair<String, String>("func_149744_f", "canProvidePower")); - mInitMap.put(new Pair<String, String>("func_149745_a", "quantityDropped")); - mInitMap.put(new Pair<String, String>("func_149746_a", "onFallenUpon")); - mInitMap.put(new Pair<String, String>("func_149747_d", "isBlockSolid")); - mInitMap.put(new Pair<String, String>("func_149748_c", "isProvidingStrongPower")); - mInitMap.put(new Pair<String, String>("func_149749_a", "breakBlock")); - mInitMap.put(new Pair<String, String>("func_149750_m", "getLightValue")); - mInitMap.put(new Pair<String, String>("func_149751_l", "isTranslucent")); - mInitMap.put(new Pair<String, String>("func_149752_b", "setResistance")); - mInitMap.put(new Pair<String, String>("func_149753_y", "getBlockBoundsMaxX")); - mInitMap.put(new Pair<String, String>("func_149798_e", "getEffectiveFlowDecay")); - mInitMap.put(new Pair<String, String>("func_149800_f", "getFlowVector")); - mInitMap.put(new Pair<String, String>("func_149801_b", "getLiquidHeightPercent")); - mInitMap.put(new Pair<String, String>("func_149802_a", "getFlowDirection")); - mInitMap.put(new Pair<String, String>("func_149803_e", "getLiquidIcon")); - mInitMap.put(new Pair<String, String>("func_149817_o", "isFlammable")); - mInitMap.put(new Pair<String, String>("func_149818_n", "setNotStationary")); - mInitMap.put(new Pair<String, String>("func_149819_b", "invertMetadata")); - mInitMap.put(new Pair<String, String>("func_149825_a", "isFence")); - mInitMap.put(new Pair<String, String>("func_149826_e", "canConnectFenceTo")); - mInitMap.put(new Pair<String, String>("func_149828_a", "playSoundWhenFallen")); - mInitMap.put(new Pair<String, String>("func_149829_a", "onStartFalling")); - mInitMap.put(new Pair<String, String>("func_149831_e", "canFallBelow")); - mInitMap.put(new Pair<String, String>("func_149840_c", "getFireIcon")); - mInitMap.put(new Pair<String, String>("func_149841_a", "tryCatchFire")); - mInitMap.put(new Pair<String, String>("func_149844_e", "canBlockCatchFire")); - mInitMap.put(new Pair<String, String>("func_149845_m", "getChanceOfNeighborsEncouragingFire")); - mInitMap.put(new Pair<String, String>("func_149847_e", "canNeighborBurn")); - mInitMap.put(new Pair<String, String>("func_149851_a", "canFertilize")); - mInitMap.put(new Pair<String, String>("func_149852_a", "shouldFertilize")); - mInitMap.put(new Pair<String, String>("func_149853_b", "fertilize")); - mInitMap.put(new Pair<String, String>("func_149854_a", "canPlaceBlockOn")); - mInitMap.put(new Pair<String, String>("func_149855_e", "checkAndDropBlock")); - mInitMap.put(new Pair<String, String>("func_149863_m", "fertilize")); - mInitMap.put(new Pair<String, String>("func_149865_P", "getCrop")); - mInitMap.put(new Pair<String, String>("func_149866_i", "getSeed")); - mInitMap.put(new Pair<String, String>("func_149872_i", "getStemIcon")); - mInitMap.put(new Pair<String, String>("func_149873_e", "getState")); - mInitMap.put(new Pair<String, String>("func_149874_m", "fertilizeStem")); - mInitMap.put(new Pair<String, String>("func_149878_d", "growTree")); - mInitMap.put(new Pair<String, String>("func_149879_c", "markOrGrowMarked")); - mInitMap.put(new Pair<String, String>("func_149884_c", "fertilizeMushroom")); - mInitMap.put(new Pair<String, String>("func_149895_l", "getDirection")); - mInitMap.put(new Pair<String, String>("func_149896_b", "isFenceGateOpen")); - mInitMap.put(new Pair<String, String>("func_149898_i", "getBlockUnpowered")); - mInitMap.put(new Pair<String, String>("func_149900_a", "isGettingInput")); - mInitMap.put(new Pair<String, String>("func_149903_h", "getInputStrength")); - mInitMap.put(new Pair<String, String>("func_149906_e", "getBlockPowered")); - mInitMap.put(new Pair<String, String>("func_149909_d", "isRedstoneRepeaterBlockID")); - mInitMap.put(new Pair<String, String>("func_149915_a", "createmInitMap.put(newTileEntity")); - mInitMap.put(new Pair<String, String>("func_149916_e", "getHopperIcon")); - mInitMap.put(new Pair<String, String>("func_149917_c", "getActiveStateFromMetadata")); - mInitMap.put(new Pair<String, String>("func_149918_b", "getDirectionFromMetadata")); - mInitMap.put(new Pair<String, String>("func_149919_e", "updateBlockData")); - mInitMap.put(new Pair<String, String>("func_149931_a", "updateFurnaceBlockState")); - mInitMap.put(new Pair<String, String>("func_149937_b", "getFacingDirection")); - mInitMap.put(new Pair<String, String>("func_149939_a", "getIPositionFromBlockSource")); - mInitMap.put(new Pair<String, String>("func_149951_m", "getInventory")); - mInitMap.put(new Pair<String, String>("func_149952_n", "isDoubleChest")); - mInitMap.put(new Pair<String, String>("func_149953_o", "isOcelotSittingOnTop")); - mInitMap.put(new Pair<String, String>("func_149954_e", "initMetadata")); - mInitMap.put(new Pair<String, String>("func_149959_e", "getIconBrewingStandBase")); - mInitMap.put(new Pair<String, String>("func_149962_a", "getTileEntity")); - mInitMap.put(new Pair<String, String>("func_149965_a", "makeWither")); - mInitMap.put(new Pair<String, String>("func_149970_j", "getOutputStrength")); - mInitMap.put(new Pair<String, String>("func_149971_e", "getTileEntityComparator")); - mInitMap.put(new Pair<String, String>("func_149975_b", "isBlockHeadOfBed")); - mInitMap.put(new Pair<String, String>("func_149976_c", "isBedOccupied")); - mInitMap.put(new Pair<String, String>("func_149977_a", "getSafeExitLocation")); - mInitMap.put(new Pair<String, String>("func_149978_e", "setBedBounds")); - mInitMap.put(new Pair<String, String>("func_149979_a", "setBedOccupied")); - mInitMap.put(new Pair<String, String>("func_149988_b", "getCocoaIcon")); - mInitMap.put(new Pair<String, String>("func_149990_e", "getIconSideOverlay")); - mInitMap.put(new Pair<String, String>("func_150000_e", "tryToCreatePortal")); - mInitMap.put(new Pair<String, String>("func_150002_b", "getFullSlabName")); - mInitMap.put(new Pair<String, String>("func_150012_g", "getFullMetadata")); - mInitMap.put(new Pair<String, String>("func_150020_b", "isEnderEyeInserted")); - mInitMap.put(new Pair<String, String>("func_150021_e", "getIconEndPortalFrameEye")); - mInitMap.put(new Pair<String, String>("func_150024_a", "setWaterLevel")); - mInitMap.put(new Pair<String, String>("func_150025_c", "getRenderLiquidLevel")); - mInitMap.put(new Pair<String, String>("func_150026_e", "getCauldronIcon")); - mInitMap.put(new Pair<String, String>("func_150027_b", "getPowerFromMeta")); - mInitMap.put(new Pair<String, String>("func_150042_a", "updateNeighbor")); - mInitMap.put(new Pair<String, String>("func_150043_b", "setBlockBoundsFromMeta")); - mInitMap.put(new Pair<String, String>("func_150044_m", "canStay")); - mInitMap.put(new Pair<String, String>("func_150045_e", "findSolidSide")); - mInitMap.put(new Pair<String, String>("func_150046_n", "activateButton")); - mInitMap.put(new Pair<String, String>("func_150048_a", "onRedstoneSignal")); - mInitMap.put(new Pair<String, String>("func_150049_b_", "isRailBlockAt")); - mInitMap.put(new Pair<String, String>("func_150050_e", "isPowered")); - mInitMap.put(new Pair<String, String>("func_150051_a", "isRailBlock")); - mInitMap.put(new Pair<String, String>("func_150052_a", "refreshTrackShape")); - mInitMap.put(new Pair<String, String>("func_150060_c", "getPowerFromMeta")); - mInitMap.put(new Pair<String, String>("func_150061_a", "getSensitiveAABB")); - mInitMap.put(new Pair<String, String>("func_150062_a", "setStateIfMobInteractsWithPlate")); - mInitMap.put(new Pair<String, String>("func_150063_b", "setBlockBoundsFromMeta")); - mInitMap.put(new Pair<String, String>("func_150064_a_", "updateNeighbors")); - mInitMap.put(new Pair<String, String>("func_150065_e", "getPlateState")); - mInitMap.put(new Pair<String, String>("func_150066_d", "getMetaFromPower")); - mInitMap.put(new Pair<String, String>("func_150071_a", "determineOrientation")); - mInitMap.put(new Pair<String, String>("func_150072_a", "isIndirectlyPowered")); - mInitMap.put(new Pair<String, String>("func_150073_e", "getPistonExtensionTexture")); - mInitMap.put(new Pair<String, String>("func_150074_e", "getPistonBaseIcon")); - mInitMap.put(new Pair<String, String>("func_150075_c", "isExtended")); - mInitMap.put(new Pair<String, String>("func_150076_b", "getPistonOrientation")); - mInitMap.put(new Pair<String, String>("func_150077_h", "canExtend")); - mInitMap.put(new Pair<String, String>("func_150078_e", "updatePistonState")); - mInitMap.put(new Pair<String, String>("func_150079_i", "tryExtend")); - mInitMap.put(new Pair<String, String>("func_150080_a", "canPushBlock")); - mInitMap.put(new Pair<String, String>("func_150085_b", "getDirectionMeta")); - mInitMap.put(new Pair<String, String>("func_150089_b", "setBlockBoundsFromMeta")); - mInitMap.put(new Pair<String, String>("func_150091_e", "canConnectWallTo")); - mInitMap.put(new Pair<String, String>("func_150098_a", "canPaneConnectToBlock")); - mInitMap.put(new Pair<String, String>("func_150107_m", "canPlaceTorchOn")); - mInitMap.put(new Pair<String, String>("func_150109_e", "dropTorchIfCantStay")); - mInitMap.put(new Pair<String, String>("func_150118_d", "isTrapdoorOpen")); - mInitMap.put(new Pair<String, String>("func_150119_a", "isValidSupportBlock")); - mInitMap.put(new Pair<String, String>("func_150122_b", "setGraphicsLevel")); - mInitMap.put(new Pair<String, String>("func_150126_e", "removeLeaves")); - mInitMap.put(new Pair<String, String>("func_150147_e", "setBaseBounds")); - mInitMap.put(new Pair<String, String>("func_150148_a", "isBlockStairs")); - mInitMap.put(new Pair<String, String>("func_150161_d", "getTopIcon")); - mInitMap.put(new Pair<String, String>("func_150163_b", "getSideIcon")); - mInitMap.put(new Pair<String, String>("func_150173_e", "getRedstomInitMap.put(newireIcon")); - mInitMap.put(new Pair<String, String>("func_150174_f", "isPowerProviderOrWire")); - mInitMap.put(new Pair<String, String>("func_150206_m", "createDeepCopy")); - mInitMap.put(new Pair<String, String>("func_150209_a", "setChatHoverEvent")); - mInitMap.put(new Pair<String, String>("func_150210_i", "getChatHoverEvent")); - mInitMap.put(new Pair<String, String>("func_150215_a", "getColor")); - mInitMap.put(new Pair<String, String>("func_150217_b", "setItalic")); - mInitMap.put(new Pair<String, String>("func_150218_j", "getFormattingCode")); - mInitMap.put(new Pair<String, String>("func_150221_a", "setParentStyle")); - mInitMap.put(new Pair<String, String>("func_150223_b", "getBold")); - mInitMap.put(new Pair<String, String>("func_150224_n", "getParent")); - mInitMap.put(new Pair<String, String>("func_150225_c", "setStrikethrough")); - mInitMap.put(new Pair<String, String>("func_150227_a", "setBold")); - mInitMap.put(new Pair<String, String>("func_150228_d", "setUnderlined")); - mInitMap.put(new Pair<String, String>("func_150229_g", "isEmpty")); - mInitMap.put(new Pair<String, String>("func_150232_l", "createShallowCopy")); - mInitMap.put(new Pair<String, String>("func_150233_f", "getObfuscated")); - mInitMap.put(new Pair<String, String>("func_150234_e", "getUnderlined")); - mInitMap.put(new Pair<String, String>("func_150235_h", "getChatClickEvent")); - mInitMap.put(new Pair<String, String>("func_150236_d", "getStrikethrough")); - mInitMap.put(new Pair<String, String>("func_150237_e", "setObfuscated")); - mInitMap.put(new Pair<String, String>("func_150238_a", "setColor")); - mInitMap.put(new Pair<String, String>("func_150241_a", "setChatClickEvent")); - mInitMap.put(new Pair<String, String>("func_150242_c", "getItalic")); - mInitMap.put(new Pair<String, String>("func_150253_a", "getSiblings")); - mInitMap.put(new Pair<String, String>("func_150254_d", "getFormattedText")); - mInitMap.put(new Pair<String, String>("func_150255_a", "setChatStyle")); - mInitMap.put(new Pair<String, String>("func_150256_b", "getChatStyle")); - mInitMap.put(new Pair<String, String>("func_150257_a", "appendSibling")); - mInitMap.put(new Pair<String, String>("func_150258_a", "appendText")); - mInitMap.put(new Pair<String, String>("func_150259_f", "createCopy")); - mInitMap.put(new Pair<String, String>("func_150260_c", "getUnformattedText")); - mInitMap.put(new Pair<String, String>("func_150261_e", "getUnformattedTextForChat")); - mInitMap.put(new Pair<String, String>("func_150262_a", "createDeepCopyIterator")); - mInitMap.put(new Pair<String, String>("func_150265_g", "getChatComponentText_TextValue")); - mInitMap.put(new Pair<String, String>("func_150268_i", "getKey")); - mInitMap.put(new Pair<String, String>("func_150269_b", "initializeFromFormat")); - mInitMap.put(new Pair<String, String>("func_150270_g", "ensureInitialized")); - mInitMap.put(new Pair<String, String>("func_150271_j", "getFormatArgs")); - mInitMap.put(new Pair<String, String>("func_150272_a", "getFormatArgumentAsComponent")); - mInitMap.put(new Pair<String, String>("func_150284_a", "createmInitMap.put(newByType")); - mInitMap.put(new Pair<String, String>("func_150285_a_", "getString")); - mInitMap.put(new Pair<String, String>("func_150286_g", "getDouble")); - mInitMap.put(new Pair<String, String>("func_150287_d", "getInt")); - mInitMap.put(new Pair<String, String>("func_150288_h", "getFloat")); - mInitMap.put(new Pair<String, String>("func_150289_e", "getShort")); - mInitMap.put(new Pair<String, String>("func_150290_f", "getByte")); - mInitMap.put(new Pair<String, String>("func_150291_c", "getLong")); - mInitMap.put(new Pair<String, String>("func_150292_c", "getByteArray")); - mInitMap.put(new Pair<String, String>("func_150295_c", "getTagList")); - mInitMap.put(new Pair<String, String>("func_150296_c", "getKeySet")); - mInitMap.put(new Pair<String, String>("func_150297_b", "hasKey")); - mInitMap.put(new Pair<String, String>("func_150298_a", "writeEntry")); - mInitMap.put(new Pair<String, String>("func_150299_b", "getTagId")); - mInitMap.put(new Pair<String, String>("func_150302_c", "getIntArray")); - mInitMap.put(new Pair<String, String>("func_150303_d", "getTagType")); - mInitMap.put(new Pair<String, String>("func_150304_a", "setTag")); - mInitMap.put(new Pair<String, String>("func_150305_b", "getCompoundTagAt")); - mInitMap.put(new Pair<String, String>("func_150306_c", "getIntArrayAt")); - mInitMap.put(new Pair<String, String>("func_150307_f", "getStringTagAt")); - mInitMap.put(new Pair<String, String>("func_150308_e", "getFloatAt")); - mInitMap.put(new Pair<String, String>("func_150309_d", "getDoubleAt")); - mInitMap.put(new Pair<String, String>("func_150494_d", "getFrequency")); - mInitMap.put(new Pair<String, String>("func_150495_a", "getDigResourcePath")); - mInitMap.put(new Pair<String, String>("func_150496_b", "getPlaceSound")); - mInitMap.put(new Pair<String, String>("func_150497_c", "getVolume")); - mInitMap.put(new Pair<String, String>("func_150498_e", "getStepSound")); - mInitMap.put(new Pair<String, String>("func_150503_a", "decipher")); - mInitMap.put(new Pair<String, String>("func_150504_a", "cipher")); - mInitMap.put(new Pair<String, String>("func_150510_c", "getLastUpdateTimeInMilliseconds")); - mInitMap.put(new Pair<String, String>("func_150512_a", "decorateChunk")); - mInitMap.put(new Pair<String, String>("func_150513_a", "genDecorations")); - mInitMap.put(new Pair<String, String>("func_150516_a", "setBlockAndNotifyAdequately")); - mInitMap.put(new Pair<String, String>("func_150558_b", "getBiomeGrassColor")); - mInitMap.put(new Pair<String, String>("func_150560_b", "genBiomeTerrain")); - mInitMap.put(new Pair<String, String>("func_150561_m", "getTempCategory")); - mInitMap.put(new Pair<String, String>("func_150562_l", "getBiomeClass")); - mInitMap.put(new Pair<String, String>("func_150564_a", "getFloatTemperature")); - mInitMap.put(new Pair<String, String>("func_150565_n", "getBiomeGenArray")); - mInitMap.put(new Pair<String, String>("func_150566_k", "createMutation")); - mInitMap.put(new Pair<String, String>("func_150568_d", "getBiome")); - mInitMap.put(new Pair<String, String>("func_150569_a", "isEqualTo")); - mInitMap.put(new Pair<String, String>("func_150570_a", "setHeight")); - mInitMap.put(new Pair<String, String>("func_150571_c", "getBiomeFoliageColor")); - mInitMap.put(new Pair<String, String>("func_150573_a", "genTerrainBlocks")); - mInitMap.put(new Pair<String, String>("func_150633_b", "mutateHills")); - mInitMap.put(new Pair<String, String>("func_150646_a", "isRailBlockAt")); - mInitMap.put(new Pair<String, String>("func_150650_a", "countAdjacentRails")); - mInitMap.put(new Pair<String, String>("func_150663_a", "writeTag")); - mInitMap.put(new Pair<String, String>("func_150668_b", "getValue")); - mInitMap.put(new Pair<String, String>("func_150669_a", "getAction")); - mInitMap.put(new Pair<String, String>("func_150672_a", "getValueByCanonicalName")); - mInitMap.put(new Pair<String, String>("func_150673_b", "getCanonicalName")); - mInitMap.put(new Pair<String, String>("func_150674_a", "shouldAllowInChat")); - mInitMap.put(new Pair<String, String>("func_150684_a", "getValueByCanonicalName")); - mInitMap.put(new Pair<String, String>("func_150685_b", "getCanonicalName")); - mInitMap.put(new Pair<String, String>("func_150686_a", "shouldAllowInChat")); - mInitMap.put(new Pair<String, String>("func_150695_a", "serializeChatStyle")); - mInitMap.put(new Pair<String, String>("func_150696_a", "componentToJson")); - mInitMap.put(new Pair<String, String>("func_150699_a", "jsonToComponent")); - mInitMap.put(new Pair<String, String>("func_150701_a", "getAction")); - mInitMap.put(new Pair<String, String>("func_150702_b", "getValue")); - mInitMap.put(new Pair<String, String>("func_150706_a", "generateDispenserContents")); - mInitMap.put(new Pair<String, String>("func_150707_a", "setEnchantable")); - mInitMap.put(new Pair<String, String>("func_150708_a", "getItemStack")); - mInitMap.put(new Pair<String, String>("func_150709_a", "setMaxDamagePercent")); - mInitMap.put(new Pair<String, String>("func_150718_a", "closeChannel")); - mInitMap.put(new Pair<String, String>("func_150719_a", "setNetHandler")); - mInitMap.put(new Pair<String, String>("func_150721_g", "disableAutoRead")); - mInitMap.put(new Pair<String, String>("func_150722_a", "provideLocalClient")); - mInitMap.put(new Pair<String, String>("func_150723_a", "setConnectionState")); - mInitMap.put(new Pair<String, String>("func_150724_d", "isChannelOpen")); - mInitMap.put(new Pair<String, String>("func_150725_a", "scheduleOutboundPacket")); - mInitMap.put(new Pair<String, String>("func_150726_a", "provideLanClient")); - mInitMap.put(new Pair<String, String>("func_150727_a", "enableEncryption")); - mInitMap.put(new Pair<String, String>("func_150729_e", "getNetHandler")); - mInitMap.put(new Pair<String, String>("func_150730_f", "getExitMessage")); - mInitMap.put(new Pair<String, String>("func_150731_c", "isLocalChannel")); - mInitMap.put(new Pair<String, String>("func_150732_b", "dispatchPacket")); - mInitMap.put(new Pair<String, String>("func_150733_h", "flushOutboundQueue")); - mInitMap.put(new Pair<String, String>("func_150752_a", "getFromPacket")); - mInitMap.put(new Pair<String, String>("func_150759_c", "getId")); - mInitMap.put(new Pair<String, String>("func_150760_a", "getById")); - mInitMap.put(new Pair<String, String>("func_150775_a", "attenuate")); - mInitMap.put(new Pair<String, String>("func_150785_a", "writeStringToBuffer")); - mInitMap.put(new Pair<String, String>("func_150786_a", "writeNBTTagCompoundToBuffer")); - mInitMap.put(new Pair<String, String>("func_150787_b", "writeVarIntToBuffer")); - mInitMap.put(new Pair<String, String>("func_150788_a", "writeItemStackToBuffer")); - mInitMap.put(new Pair<String, String>("func_150789_c", "readStringFromBuffer")); - mInitMap.put(new Pair<String, String>("func_150790_a", "getVarIntSize")); - mInitMap.put(new Pair<String, String>("func_150791_c", "readItemStackFromBuffer")); - mInitMap.put(new Pair<String, String>("func_150792_a", "readVarIntFromBuffer")); - mInitMap.put(new Pair<String, String>("func_150793_b", "readNBTTagCompoundFromBuffer")); - mInitMap.put(new Pair<String, String>("func_150795_a", "findBiomePosition")); - mInitMap.put(new Pair<String, String>("func_150803_c", "recheckGaps")); - mInitMap.put(new Pair<String, String>("func_150805_f", "removeTileEntity")); - mInitMap.put(new Pair<String, String>("func_150806_e", "getBlockTileEntityInChunk")); - mInitMap.put(new Pair<String, String>("func_150807_a", "setBlockIDWithMetadata")); - mInitMap.put(new Pair<String, String>("func_150808_b", "getBlockLightOpacity")); - mInitMap.put(new Pair<String, String>("func_150810_a", "getBlock")); - mInitMap.put(new Pair<String, String>("func_150812_a", "setBlockTileEntityInChunk")); - mInitMap.put(new Pair<String, String>("func_150813_a", "addTileEntity")); - mInitMap.put(new Pair<String, String>("func_150818_a", "setExtBlockID")); - mInitMap.put(new Pair<String, String>("func_150819_a", "getBlockByExtId")); - mInitMap.put(new Pair<String, String>("func_150826_b", "translateToFallback")); - mInitMap.put(new Pair<String, String>("func_150827_a", "getLastTranslationUpdateTimeInMilliseconds")); - mInitMap.put(new Pair<String, String>("func_150835_j", "getBlockTileEntity")); - mInitMap.put(new Pair<String, String>("func_150891_b", "getIdFromItem")); - mInitMap.put(new Pair<String, String>("func_150892_m", "isPotionIngredient")); - mInitMap.put(new Pair<String, String>("func_150893_a", "getStrVsBlock")); - mInitMap.put(new Pair<String, String>("func_150894_a", "onBlockDestroyed")); - mInitMap.put(new Pair<String, String>("func_150895_a", "getSubItems")); - mInitMap.put(new Pair<String, String>("func_150896_i", "getPotionEffect")); - mInitMap.put(new Pair<String, String>("func_150897_b", "canItemHarvestBlock")); - mInitMap.put(new Pair<String, String>("func_150898_a", "getItemFromBlock")); - mInitMap.put(new Pair<String, String>("func_150899_d", "getItemById")); - mInitMap.put(new Pair<String, String>("func_150900_l", "registerItems")); - mInitMap.put(new Pair<String, String>("func_150905_g", "getHealAmount")); - mInitMap.put(new Pair<String, String>("func_150906_h", "getSaturationModifier")); - mInitMap.put(new Pair<String, String>("func_150911_c", "createMapDataPacket")); - mInitMap.put(new Pair<String, String>("func_150912_a", "loadMapData")); - mInitMap.put(new Pair<String, String>("func_150913_i", "getToolMaterial")); - mInitMap.put(new Pair<String, String>("func_150924_a", "placeDoorBlock")); - mInitMap.put(new Pair<String, String>("func_150926_b", "getRecord")); - mInitMap.put(new Pair<String, String>("func_150927_i", "getRecordNameLocal")); - mInitMap.put(new Pair<String, String>("func_150930_a", "validBookPageTagContents")); - mInitMap.put(new Pair<String, String>("func_150932_j", "getToolMaterialName")); - mInitMap.put(new Pair<String, String>("func_150951_e", "getStatName")); - mInitMap.put(new Pair<String, String>("func_150967_d", "getUncookedSaturationModifier")); - mInitMap.put(new Pair<String, String>("func_150968_a", "registerIcon")); - mInitMap.put(new Pair<String, String>("func_150970_e", "getCookedHealAmount")); - mInitMap.put(new Pair<String, String>("func_150971_g", "getUncookedIcon")); - mInitMap.put(new Pair<String, String>("func_150972_b", "getUnlocalizedNamePart")); - mInitMap.put(new Pair<String, String>("func_150973_i", "getCookable")); - mInitMap.put(new Pair<String, String>("func_150974_a", "getFishTypeForItemDamage")); - mInitMap.put(new Pair<String, String>("func_150975_c", "getUncookedHealAmount")); - mInitMap.put(new Pair<String, String>("func_150976_a", "getItemDamage")); - mInitMap.put(new Pair<String, String>("func_150977_f", "getCookedSaturationModifier")); - mInitMap.put(new Pair<String, String>("func_150978_a", "getFishTypeForItemStack")); - mInitMap.put(new Pair<String, String>("func_150979_h", "getCookedIcon")); - mInitMap.put(new Pair<String, String>("func_150995_f", "getBaseItemForRepair")); - mInitMap.put(new Pair<String, String>("func_150996_a", "setItem")); - mInitMap.put(new Pair<String, String>("func_150997_a", "getStrVsBlock")); - mInitMap.put(new Pair<String, String>("func_150998_b", "canItemHarvestBlock")); - mInitMap.put(new Pair<String, String>("func_150999_a", "onBlockDestroyed")); - mInitMap.put(new Pair<String, String>("func_151001_c", "setStackDisplayName")); - mInitMap.put(new Pair<String, String>("func_151003_a", "getSerializableElement")); - mInitMap.put(new Pair<String, String>("func_151177_a", "getOneShotStat")); - mInitMap.put(new Pair<String, String>("func_151187_b", "getJsonSerializableValue")); - mInitMap.put(new Pair<String, String>("func_151188_a", "setIntegerValue")); - mInitMap.put(new Pair<String, String>("func_151189_a", "getIntegerValue")); - mInitMap.put(new Pair<String, String>("func_151190_a", "setJsonSerializableValue")); - mInitMap.put(new Pair<String, String>("func_151200_h", "getJsonObjectStringFieldValue")); - mInitMap.put(new Pair<String, String>("func_151201_f", "jsonObjectFieldTypeIsPrimitive")); - mInitMap.put(new Pair<String, String>("func_151202_d", "jsonObjectFieldTypeIsArray")); - mInitMap.put(new Pair<String, String>("func_151203_m", "getJsonObjectIntegerFieldValue")); - mInitMap.put(new Pair<String, String>("func_151204_g", "jsonObjectHasNamedField")); - mInitMap.put(new Pair<String, String>("func_151205_a", "jsonObjectFieldTypeIsString")); - mInitMap.put(new Pair<String, String>("func_151206_a", "getJsonElementStringValue")); - mInitMap.put(new Pair<String, String>("func_151207_m", "getJsonElementAsJsonArray")); - mInitMap.put(new Pair<String, String>("func_151208_a", "getJsonObjectIntegerFieldValueOrDefault")); - mInitMap.put(new Pair<String, String>("func_151209_a", "getJsonObjectBooleanFieldValueOrDefault")); - mInitMap.put(new Pair<String, String>("func_151210_l", "getElementAsJsonObject")); - mInitMap.put(new Pair<String, String>("func_151211_a", "jsonElementTypeIsString")); - mInitMap.put(new Pair<String, String>("func_151212_i", "getJsonObjectBooleanFieldValue")); - mInitMap.put(new Pair<String, String>("func_151213_a", "getJsonObjectJsonArrayFieldOrDefault")); - mInitMap.put(new Pair<String, String>("func_151214_t", "getJsonObjectJsonArrayField")); - mInitMap.put(new Pair<String, String>("func_151215_f", "getJsonElementIntegerValue")); - mInitMap.put(new Pair<String, String>("func_151216_b", "getJsonElementBooleanValue")); - mInitMap.put(new Pair<String, String>("func_151217_k", "getJsonObjectFloatFieldValue")); - mInitMap.put(new Pair<String, String>("func_151218_a", "getJsonObjectFieldOrDefault")); - mInitMap.put(new Pair<String, String>("func_151219_a", "getJsonObjectStringFieldValueOrDefault")); - mInitMap.put(new Pair<String, String>("func_151220_d", "getJsonElementFloatValue")); - mInitMap.put(new Pair<String, String>("func_151221_a", "getJsonObjectFloatFieldValueOrDefault")); - mInitMap.put(new Pair<String, String>("func_151222_d", "getJsonElementTypeDescription")); - mInitMap.put(new Pair<String, String>("func_151223_a", "downloadResourcePack")); - mInitMap.put(new Pair<String, String>("func_151225_a", "post")); - mInitMap.put(new Pair<String, String>("func_151226_a", "postMap")); - mInitMap.put(new Pair<String, String>("func_151235_d", "isPowerOfTwo")); - mInitMap.put(new Pair<String, String>("func_151236_b", "roundUpToPowerOfTwo")); - mInitMap.put(new Pair<String, String>("func_151237_a", "clamp_double")); - mInitMap.put(new Pair<String, String>("func_151238_b", "denormalizeClamp")); - mInitMap.put(new Pair<String, String>("func_151239_c", "calculateLogBaseTwo")); - mInitMap.put(new Pair<String, String>("func_151240_a", "randomFloatClamp")); - mInitMap.put(new Pair<String, String>("func_151241_e", "calculateLogBaseTwoDeBruijn")); - mInitMap.put(new Pair<String, String>("func_151243_f", "getIconItemDamage")); - mInitMap.put(new Pair<String, String>("func_151244_d", "getIconItemStack")); - mInitMap.put(new Pair<String, String>("func_151246_b", "isNullOrEmpty")); - mInitMap.put(new Pair<String, String>("func_151247_a", "sendToAllTrackingEntity")); - mInitMap.put(new Pair<String, String>("func_151250_a", "markBlockForUpdate")); - mInitMap.put(new Pair<String, String>("func_151251_a", "sendToAllPlayersWatchingChunk")); - mInitMap.put(new Pair<String, String>("func_151252_a", "sendTileToAllPlayersWatchingChunk")); - mInitMap.put(new Pair<String, String>("func_151253_a", "flagChunkForUpdate")); - mInitMap.put(new Pair<String, String>("func_151255_a", "getStringBuffer")); - mInitMap.put(new Pair<String, String>("func_151256_a", "writeAndFlush")); - mInitMap.put(new Pair<String, String>("func_151265_a", "addLanEndpoint")); - mInitMap.put(new Pair<String, String>("func_151267_d", "getServer")); - mInitMap.put(new Pair<String, String>("func_151268_b", "terminateEndpoints")); - mInitMap.put(new Pair<String, String>("func_151269_c", "networkTick")); - mInitMap.put(new Pair<String, String>("func_151270_a", "addLocalEndpoint")); - mInitMap.put(new Pair<String, String>("func_151303_a", "getName")); - mInitMap.put(new Pair<String, String>("func_151304_b", "getProtocol")); - mInitMap.put(new Pair<String, String>("func_151315_a", "setServerDescription")); - mInitMap.put(new Pair<String, String>("func_151316_d", "getFavicon")); - mInitMap.put(new Pair<String, String>("func_151317_a", "getServerDescription")); - mInitMap.put(new Pair<String, String>("func_151318_b", "getPlayerCountData")); - mInitMap.put(new Pair<String, String>("func_151319_a", "setPlayerCountData")); - mInitMap.put(new Pair<String, String>("func_151320_a", "setFavicon")); - mInitMap.put(new Pair<String, String>("func_151321_a", "setProtocolVersionInfo")); - mInitMap.put(new Pair<String, String>("func_151322_c", "getProtocolVersionInfo")); - mInitMap.put(new Pair<String, String>("func_151330_a", "setPlayers")); - mInitMap.put(new Pair<String, String>("func_151331_c", "getPlayers")); - mInitMap.put(new Pair<String, String>("func_151332_a", "getMaxPlayers")); - mInitMap.put(new Pair<String, String>("func_151333_b", "getOnlinePlayerCount")); - mInitMap.put(new Pair<String, String>("func_151337_f", "getBlock")); - mInitMap.put(new Pair<String, String>("func_151338_e", "getEventParameter")); - mInitMap.put(new Pair<String, String>("func_151339_d", "getEventID")); - mInitMap.put(new Pair<String, String>("func_151353_a", "registerDispenserBehaviors")); - mInitMap.put(new Pair<String, String>("func_151354_b", "register")); - mInitMap.put(new Pair<String, String>("func_151357_h", "showWorldInfoNotice")); - mInitMap.put(new Pair<String, String>("func_151358_j", "setNotificationData")); - mInitMap.put(new Pair<String, String>("func_151393_a", "addSmeltingRecipeForBlock")); - mInitMap.put(new Pair<String, String>("func_151394_a", "addSmeltingRecipe")); - mInitMap.put(new Pair<String, String>("func_151395_a", "getSmeltingResult")); - mInitMap.put(new Pair<String, String>("func_151396_a", "addSmelting")); - mInitMap.put(new Pair<String, String>("func_151398_b", "getSmeltingExperience")); - mInitMap.put(new Pair<String, String>("func_151426_a", "getEnumChatVisibility")); - mInitMap.put(new Pair<String, String>("func_151428_a", "getChatVisibility")); - mInitMap.put(new Pair<String, String>("func_151429_b", "getResourceKey")); - mInitMap.put(new Pair<String, String>("func_151438_a", "getSoundLevel")); - mInitMap.put(new Pair<String, String>("func_151439_a", "setSoundLevel")); - mInitMap.put(new Pair<String, String>("func_151440_a", "setOptionKeyBinding")); - mInitMap.put(new Pair<String, String>("func_151460_a", "getBlockAtEntityViewpoint")); - mInitMap.put(new Pair<String, String>("func_151461_a", "getChatComponent")); - mInitMap.put(new Pair<String, String>("func_151462_b", "setKeyCode")); - mInitMap.put(new Pair<String, String>("func_151463_i", "getKeyCode")); - mInitMap.put(new Pair<String, String>("func_151464_g", "getKeyDescription")); - mInitMap.put(new Pair<String, String>("func_151466_e", "getKeyCategory")); - mInitMap.put(new Pair<String, String>("func_151467_c", "getKeybinds")); - mInitMap.put(new Pair<String, String>("func_151468_f", "isPressed")); - mInitMap.put(new Pair<String, String>("func_151469_h", "getKeyCodeDefault")); - mInitMap.put(new Pair<String, String>("func_151470_d", "getIsKeyPressed")); - mInitMap.put(new Pair<String, String>("func_151498_a", "isStairOrSlab")); - mInitMap.put(new Pair<String, String>("func_151499_f", "getEatingGrassTimer")); - mInitMap.put(new Pair<String, String>("func_151503_a", "getWoodenDoorBlock")); - mInitMap.put(new Pair<String, String>("func_151507_a", "writeWatchedListToPacketBuffer")); - mInitMap.put(new Pair<String, String>("func_151508_b", "readWatchedListFromPacketBuffer")); - mInitMap.put(new Pair<String, String>("func_151510_a", "writeWatchableObjectToPacketBuffer")); - mInitMap.put(new Pair<String, String>("func_151517_h", "isDamageAbsolute")); - mInitMap.put(new Pair<String, String>("func_151518_m", "setDamageIsAbsolute")); - mInitMap.put(new Pair<String, String>("func_151519_b", "getDeathMessage")); - mInitMap.put(new Pair<String, String>("func_151523_a", "getDifficultyEnum")); - mInitMap.put(new Pair<String, String>("func_151525_a", "getDifficultyId")); - mInitMap.put(new Pair<String, String>("func_151526_b", "getDifficultyResourceKey")); - mInitMap.put(new Pair<String, String>("func_151539_a", "generate")); - mInitMap.put(new Pair<String, String>("func_151545_a", "getNearestInstance")); - mInitMap.put(new Pair<String, String>("func_151548_a", "getBlockAtCurrentPosition")); - mInitMap.put(new Pair<String, String>("func_151549_a", "fillWithBlocks")); - mInitMap.put(new Pair<String, String>("func_151550_a", "placeBlockAtCurrentPosition")); - mInitMap.put(new Pair<String, String>("func_151551_a", "randomlyFillWithBlocks")); - mInitMap.put(new Pair<String, String>("func_151555_a", "getMetadataWithOffset")); - mInitMap.put(new Pair<String, String>("func_151556_a", "fillWithMetadataBlocks")); - mInitMap.put(new Pair<String, String>("func_151565_r", "getMaterialMapColor")); - mInitMap.put(new Pair<String, String>("func_151616_a", "biomesEqualOrMesaPlateau")); - mInitMap.put(new Pair<String, String>("func_151617_b", "selectModeOrRandom")); - mInitMap.put(new Pair<String, String>("func_151618_b", "isBiomeOceanic")); - mInitMap.put(new Pair<String, String>("func_151619_a", "selectRandom")); - mInitMap.put(new Pair<String, String>("func_151624_d", "getIntsHeatIce")); - mInitMap.put(new Pair<String, String>("func_151625_e", "getIntsSpecial")); - mInitMap.put(new Pair<String, String>("func_151626_c", "getIntsCoolWarm")); - mInitMap.put(new Pair<String, String>("func_151634_b", "canBiomesBeNeighbors")); - mInitMap.put(new Pair<String, String>("func_151635_b", "replaceBiomeEdge")); - mInitMap.put(new Pair<String, String>("func_151636_a", "replaceBiomeEdgeIfNecessary")); - mInitMap.put(new Pair<String, String>("func_151644_a", "getMapColorForBlockColored")); - mInitMap.put(new Pair<String, String>("func_151685_b", "getBaseItemForRepair")); - mInitMap.put(new Pair<String, String>("func_151686_a", "addStats")); - mInitMap.put(new Pair<String, String>("func_152121_a", "onSkinAvailable")); - mInitMap.put(new Pair<String, String>("func_152122_n", "hasCape")); - mInitMap.put(new Pair<String, String>("func_152123_o", "hasSkin")); - mInitMap.put(new Pair<String, String>("func_152125_a", "drawScaledCustomSizeModalRect")); - mInitMap.put(new Pair<String, String>("func_152126_a", "renderStreamIndicator")); - mInitMap.put(new Pair<String, String>("func_152340_a", "readImageToBuffer")); - mInitMap.put(new Pair<String, String>("func_152341_N", "getTwitchDetails")); - mInitMap.put(new Pair<String, String>("func_152342_ad", "getSkinManager")); - mInitMap.put(new Pair<String, String>("func_152343_a", "addScheduledTask")); - mInitMap.put(new Pair<String, String>("func_152344_a", "addScheduledTask")); - mInitMap.put(new Pair<String, String>("func_152345_ab", "isCallingFromMinecraftThread")); - mInitMap.put(new Pair<String, String>("func_152346_Z", "getTwitchStream")); - mInitMap.put(new Pair<String, String>("func_152347_ac", "getSessionService")); - mInitMap.put(new Pair<String, String>("func_152348_aa", "dispatchKeypresses")); - mInitMap.put(new Pair<String, String>("func_152349_b", "isUnicode")); - mInitMap.put(new Pair<String, String>("func_152357_F", "getGameProfiles")); - mInitMap.put(new Pair<String, String>("func_152358_ax", "getPlayerProfileCache")); - mInitMap.put(new Pair<String, String>("func_152359_aw", "getGameProfileRepository")); - mInitMap.put(new Pair<String, String>("func_152361_a", "setConfigManager")); - mInitMap.put(new Pair<String, String>("func_152368_aE", "convertFiles")); - mInitMap.put(new Pair<String, String>("func_152369_aG", "sleepFiveSeconds")); - mInitMap.put(new Pair<String, String>("func_152372_a", "notifyOperators")); - mInitMap.put(new Pair<String, String>("func_152373_a", "notifyOperators")); - mInitMap.put(new Pair<String, String>("func_152374_a", "notifyOperators")); - mInitMap.put(new Pair<String, String>("func_152378_a", "getPlayerEntityByUUID")); - mInitMap.put(new Pair<String, String>("func_152379_p", "getRenderDistanceChunks")); - mInitMap.put(new Pair<String, String>("func_152421_a", "setSessionType")); - mInitMap.put(new Pair<String, String>("func_152428_f", "getSessionType")); - mInitMap.put(new Pair<String, String>("func_152436_a", "render")); - mInitMap.put(new Pair<String, String>("func_152437_a", "render")); - mInitMap.put(new Pair<String, String>("func_152446_a", "read")); - mInitMap.put(new Pair<String, String>("func_152447_a", "readType")); - mInitMap.put(new Pair<String, String>("func_152448_b", "readKey")); - mInitMap.put(new Pair<String, String>("func_152449_a", "readNBT")); - mInitMap.put(new Pair<String, String>("func_152450_a", "addSpaceRead")); - mInitMap.put(new Pair<String, String>("func_152457_a", "decompress")); - mInitMap.put(new Pair<String, String>("func_152458_a", "readFromFile")); - mInitMap.put(new Pair<String, String>("func_152459_a", "readGameProfileFromNBT")); - mInitMap.put(new Pair<String, String>("func_152460_a", "writeGameProfileToNBT")); - mInitMap.put(new Pair<String, String>("func_152493_a", "getTotalBytes")); - mInitMap.put(new Pair<String, String>("func_152495_b", "getCount")); - mInitMap.put(new Pair<String, String>("func_152506_a", "getOfflineProfile")); - mInitMap.put(new Pair<String, String>("func_152583_a", "copyFrom")); - mInitMap.put(new Pair<String, String>("func_152584_a", "setResourceMode")); - mInitMap.put(new Pair<String, String>("func_152585_d", "isLanServer")); - mInitMap.put(new Pair<String, String>("func_152586_b", "getResourceMode")); - mInitMap.put(new Pair<String, String>("func_152589_a", "getMotd")); - mInitMap.put(new Pair<String, String>("func_152596_g", "canSendCommands")); - mInitMap.put(new Pair<String, String>("func_152597_c", "removePlayerFromWhitelist")); - mInitMap.put(new Pair<String, String>("func_152598_l", "getWhitelistedPlayerNames")); - mInitMap.put(new Pair<String, String>("func_152599_k", "getWhitelistedPlayers")); - mInitMap.put(new Pair<String, String>("func_152600_g", "getAllProfiles")); - mInitMap.put(new Pair<String, String>("func_152601_d", "addWhitelistedPlayer")); - mInitMap.put(new Pair<String, String>("func_152602_a", "getPlayerStatsFile")); - mInitMap.put(new Pair<String, String>("func_152603_m", "getOppedPlayers")); - mInitMap.put(new Pair<String, String>("func_152605_a", "addOp")); - mInitMap.put(new Pair<String, String>("func_152606_n", "getOppedPlayerNames")); - mInitMap.put(new Pair<String, String>("func_152607_e", "canJoin")); - mInitMap.put(new Pair<String, String>("func_152608_h", "getBannedPlayers")); - mInitMap.put(new Pair<String, String>("func_152609_b", "getPlayerNamesString")); - mInitMap.put(new Pair<String, String>("func_152610_b", "removeOp")); - mInitMap.put(new Pair<String, String>("func_152611_a", "setViewDistance")); - mInitMap.put(new Pair<String, String>("func_152612_a", "getPlayerByUsername")); - mInitMap.put(new Pair<String, String>("func_152617_w", "saveUserBanList")); - mInitMap.put(new Pair<String, String>("func_152618_v", "saveIpBanList")); - mInitMap.put(new Pair<String, String>("func_152619_x", "loadIpBanList")); - mInitMap.put(new Pair<String, String>("func_152620_y", "loadUserBansList")); - mInitMap.put(new Pair<String, String>("func_152640_f", "getValue")); - mInitMap.put(new Pair<String, String>("func_152641_a", "onSerialization")); - mInitMap.put(new Pair<String, String>("func_152655_a", "getGameProfileForUsername")); - mInitMap.put(new Pair<String, String>("func_152678_f", "writeChanges")); - mInitMap.put(new Pair<String, String>("func_152679_g", "readSavedFile")); - mInitMap.put(new Pair<String, String>("func_152680_h", "removeExpired")); - mInitMap.put(new Pair<String, String>("func_152681_a", "getObjectKey")); - mInitMap.put(new Pair<String, String>("func_152682_a", "createEntry")); - mInitMap.put(new Pair<String, String>("func_152683_b", "getEntry")); - mInitMap.put(new Pair<String, String>("func_152684_c", "removeEntry")); - mInitMap.put(new Pair<String, String>("func_152685_a", "getKeys")); - mInitMap.put(new Pair<String, String>("func_152686_a", "setLanServer")); - mInitMap.put(new Pair<String, String>("func_152687_a", "addEntry")); - mInitMap.put(new Pair<String, String>("func_152688_e", "getValues")); - mInitMap.put(new Pair<String, String>("func_152689_b", "isLanServer")); - mInitMap.put(new Pair<String, String>("func_152690_d", "hasEntries")); - mInitMap.put(new Pair<String, String>("func_152691_c", "getSaveFile")); - mInitMap.put(new Pair<String, String>("func_152692_d", "hasEntry")); - mInitMap.put(new Pair<String, String>("func_152700_a", "getGameProfileFromName")); - mInitMap.put(new Pair<String, String>("func_152701_b", "getProfileId")); - mInitMap.put(new Pair<String, String>("func_152702_a", "isBanned")); - mInitMap.put(new Pair<String, String>("func_152703_a", "isUsernameBanned")); - mInitMap.put(new Pair<String, String>("func_152707_c", "addressToString")); - mInitMap.put(new Pair<String, String>("func_152708_a", "isBanned")); - mInitMap.put(new Pair<String, String>("func_152709_b", "getBanEntry")); - mInitMap.put(new Pair<String, String>("func_152710_d", "convertWhitelist")); - mInitMap.put(new Pair<String, String>("func_152711_b", "mkdir")); - mInitMap.put(new Pair<String, String>("func_152712_b", "hasUnconvertableFiles")); - mInitMap.put(new Pair<String, String>("func_152713_b", "parseDate")); - mInitMap.put(new Pair<String, String>("func_152714_a", "tryConvert")); - mInitMap.put(new Pair<String, String>("func_152715_c", "hasUnconvertablePlayerFiles")); - mInitMap.put(new Pair<String, String>("func_152717_a", "lookupNames")); - mInitMap.put(new Pair<String, String>("func_152718_c", "convertOplist")); - mInitMap.put(new Pair<String, String>("func_152721_a", "readFile")); - mInitMap.put(new Pair<String, String>("func_152722_b", "convertIpBanlist")); - mInitMap.put(new Pair<String, String>("func_152723_a", "convertSaveFiles")); - mInitMap.put(new Pair<String, String>("func_152724_a", "convertUserBanlist")); - mInitMap.put(new Pair<String, String>("func_152725_d", "getPlayersDirectory")); - mInitMap.put(new Pair<String, String>("func_152727_c", "backupConverted")); - mInitMap.put(new Pair<String, String>("func_152750_a", "deserializeEntry")); - mInitMap.put(new Pair<String, String>("func_152751_a", "serializeEntry")); - mInitMap.put(new Pair<String, String>("func_152754_s", "getJsonObject")); - mInitMap.put(new Pair<String, String>("func_152755_a", "get")); - mInitMap.put(new Pair<String, String>("func_152764_a", "parsePass")); - mInitMap.put(new Pair<String, String>("func_152765_a", "parseGroup")); - mInitMap.put(new Pair<String, String>("func_152767_b", "addStatToSnooper")); - mInitMap.put(new Pair<String, String>("func_152768_a", "addClientStat")); - mInitMap.put(new Pair<String, String>("func_152788_a", "loadSkinFromCache")); - mInitMap.put(new Pair<String, String>("func_152789_a", "loadSkin")); - mInitMap.put(new Pair<String, String>("func_152792_a", "loadSkin")); - mInitMap.put(new Pair<String, String>("func_152825_o", "isIngestTesting")); - mInitMap.put(new Pair<String, String>("func_152839_p", "isBroadcastPaused")); - mInitMap.put(new Pair<String, String>("func_152850_m", "isBroadcasting")); - mInitMap.put(new Pair<String, String>("func_152856_w", "isReady")); - mInitMap.put(new Pair<String, String>("func_152919_o", "isPaused")); - mInitMap.put(new Pair<String, String>("func_152923_i", "shutdownStream")); - mInitMap.put(new Pair<String, String>("func_153157_c", "glGetShaderi")); - mInitMap.put(new Pair<String, String>("func_153158_d", "glGetShaderInfoLog")); - mInitMap.put(new Pair<String, String>("func_153159_d", "glUniform4")); - mInitMap.put(new Pair<String, String>("func_153160_c", "glUniformMatrix4")); - mInitMap.put(new Pair<String, String>("func_153161_d", "glUseProgram")); - mInitMap.put(new Pair<String, String>("func_153162_d", "glUniform4")); - mInitMap.put(new Pair<String, String>("func_153163_f", "glUniform1i")); - mInitMap.put(new Pair<String, String>("func_153164_b", "glGetAttribLocation")); - mInitMap.put(new Pair<String, String>("func_153166_e", "glGetProgramInfoLog")); - mInitMap.put(new Pair<String, String>("func_153168_a", "glUniform1")); - mInitMap.put(new Pair<String, String>("func_153169_a", "glShaderSource")); - mInitMap.put(new Pair<String, String>("func_153170_c", "glCompileShader")); - mInitMap.put(new Pair<String, String>("func_153173_a", "glUniformMatrix2")); - mInitMap.put(new Pair<String, String>("func_153175_a", "glGetProgrami")); - mInitMap.put(new Pair<String, String>("func_153177_b", "glUniform2")); - mInitMap.put(new Pair<String, String>("func_153178_b", "glAttachShader")); - mInitMap.put(new Pair<String, String>("func_153179_f", "glLinkProgram")); - mInitMap.put(new Pair<String, String>("func_153180_a", "glDeleteShader")); - mInitMap.put(new Pair<String, String>("func_153181_a", "glUniform1")); - mInitMap.put(new Pair<String, String>("func_153182_b", "glUniform2")); - } - - private static void init3() { - mInitMap.put(new Pair<String, String>("func_153183_d", "glCreateProgram")); - mInitMap.put(new Pair<String, String>("func_153187_e", "glDeleteProgram")); - mInitMap.put(new Pair<String, String>("func_153189_b", "glUniformMatrix3")); - mInitMap.put(new Pair<String, String>("func_153191_c", "glUniform3")); - mInitMap.put(new Pair<String, String>("func_153192_c", "glUniform3")); - mInitMap.put(new Pair<String, String>("func_153194_a", "glGetUniformLocation")); - mInitMap.put(new Pair<String, String>("func_153195_b", "glCreateShader")); - mInitMap.put(new Pair<String, String>("func_154310_c", "getButtonHeight")); - mInitMap.put(new Pair<String, String>("func_154311_a", "setText")); - mInitMap.put(new Pair<String, String>("func_154313_b", "setEnabled")); - mInitMap.put(new Pair<String, String>("func_154314_d", "getId")); - mInitMap.put(new Pair<String, String>("func_154315_e", "getEnabled")); - mInitMap.put(new Pair<String, String>("func_154316_f", "getPositionY")); - mInitMap.put(new Pair<String, String>("func_154317_g", "getRealmsButton")); - mInitMap.put(new Pair<String, String>("func_154331_x", "getLastActiveTime")); - mInitMap.put(new Pair<String, String>("func_154346_a", "hasAcceptedEULA")); - mInitMap.put(new Pair<String, String>("func_154347_a", "loadEULAFile")); - mInitMap.put(new Pair<String, String>("func_154348_b", "createEULAFile")); - mInitMap.put(new Pair<String, String>("func_155759_m", "setServerResourcePack")); - mInitMap.put(new Pair<String, String>("func_70000_a", "addServerStatsToSnooper")); - mInitMap.put(new Pair<String, String>("func_70001_b", "addServerTypeToSnooper")); - mInitMap.put(new Pair<String, String>("func_70002_Q", "isSnooperEnabled")); - mInitMap.put(new Pair<String, String>("func_70003_b", "canCommandSenderUseCommand")); - mInitMap.put(new Pair<String, String>("func_70005_c_", "getCommandSenderName")); - mInitMap.put(new Pair<String, String>("func_70007_b", "resetLog")); - mInitMap.put(new Pair<String, String>("func_70008_c", "getLogContents")); - mInitMap.put(new Pair<String, String>("func_70011_f", "getDistance")); - mInitMap.put(new Pair<String, String>("func_70012_b", "setLocationAndAngles")); - mInitMap.put(new Pair<String, String>("func_70013_c", "getBrightness")); - mInitMap.put(new Pair<String, String>("func_70014_b", "writeEntityToNBT")); - mInitMap.put(new Pair<String, String>("func_70015_d", "setFire")); - mInitMap.put(new Pair<String, String>("func_70016_h", "setVelocity")); - mInitMap.put(new Pair<String, String>("func_70018_K", "setBeenAttacked")); - mInitMap.put(new Pair<String, String>("func_70019_c", "setEating")); - mInitMap.put(new Pair<String, String>("func_70020_e", "readFromNBT")); - mInitMap.put(new Pair<String, String>("func_70021_al", "getParts")); - mInitMap.put(new Pair<String, String>("func_70022_Q", "getEntityString")); - mInitMap.put(new Pair<String, String>("func_70024_g", "addVelocity")); - mInitMap.put(new Pair<String, String>("func_70026_G", "isWet")); - mInitMap.put(new Pair<String, String>("func_70027_ad", "isBurning")); - mInitMap.put(new Pair<String, String>("func_70028_i", "isEntityEqual")); - mInitMap.put(new Pair<String, String>("func_70029_a", "setWorld")); - mInitMap.put(new Pair<String, String>("func_70030_z", "onEntityUpdate")); - mInitMap.put(new Pair<String, String>("func_70031_b", "setSprinting")); - mInitMap.put(new Pair<String, String>("func_70032_d", "getDistanceToEntity")); - mInitMap.put(new Pair<String, String>("func_70033_W", "getYOffset")); - mInitMap.put(new Pair<String, String>("func_70034_d", "setRotationYawHead")); - mInitMap.put(new Pair<String, String>("func_70035_c", "getInventory")); - mInitMap.put(new Pair<String, String>("func_70037_a", "readEntityFromNBT")); - mInitMap.put(new Pair<String, String>("func_70038_c", "isOffsetPositionInLiquid")); - mInitMap.put(new Pair<String, String>("func_70039_c", "writeToNBTOptional")); - mInitMap.put(new Pair<String, String>("func_70040_Z", "getLookVec")); - mInitMap.put(new Pair<String, String>("func_70041_e_", "canTriggerWalking")); - mInitMap.put(new Pair<String, String>("func_70042_X", "getMountedYOffset")); - mInitMap.put(new Pair<String, String>("func_70043_V", "updateRiderPosition")); - mInitMap.put(new Pair<String, String>("func_70044_A", "setOnFireFromLava")); - mInitMap.put(new Pair<String, String>("func_70045_F", "isImmuneToFire")); - mInitMap.put(new Pair<String, String>("func_70046_E", "getBoundingBox")); - mInitMap.put(new Pair<String, String>("func_70047_e", "getEyeHeight")); - mInitMap.put(new Pair<String, String>("func_70049_a", "mInitMap.put(newFloatNBTList")); - mInitMap.put(new Pair<String, String>("func_70050_g", "setAir")); - mInitMap.put(new Pair<String, String>("func_70051_ag", "isSprinting")); - mInitMap.put(new Pair<String, String>("func_70052_a", "setFlag")); - mInitMap.put(new Pair<String, String>("func_70053_R", "getShadowSize")); - mInitMap.put(new Pair<String, String>("func_70055_a", "isInsideOfMaterial")); - mInitMap.put(new Pair<String, String>("func_70056_a", "setPositionAndRotation2")); - mInitMap.put(new Pair<String, String>("func_70057_ab", "performHurtAnimation")); - mInitMap.put(new Pair<String, String>("func_70058_J", "handleLavaMovement")); - mInitMap.put(new Pair<String, String>("func_70060_a", "moveFlying")); - mInitMap.put(new Pair<String, String>("func_70062_b", "setCurrentItemOrArmor")); - mInitMap.put(new Pair<String, String>("func_70063_aa", "setInPortal")); - mInitMap.put(new Pair<String, String>("func_70064_a", "updateFallState")); - mInitMap.put(new Pair<String, String>("func_70065_x", "preparePlayerToSpawn")); - mInitMap.put(new Pair<String, String>("func_70066_B", "extinguish")); - mInitMap.put(new Pair<String, String>("func_70067_L", "canBeCollidedWith")); - mInitMap.put(new Pair<String, String>("func_70068_e", "getDistanceSqToEntity")); - mInitMap.put(new Pair<String, String>("func_70069_a", "fall")); - mInitMap.put(new Pair<String, String>("func_70070_b", "getBrightnessForRender")); - mInitMap.put(new Pair<String, String>("func_70071_h_", "onUpdate")); - mInitMap.put(new Pair<String, String>("func_70072_I", "handleWaterMovement")); - mInitMap.put(new Pair<String, String>("func_70074_a", "onKillEntity")); - mInitMap.put(new Pair<String, String>("func_70075_an", "canAttackWithItem")); - mInitMap.put(new Pair<String, String>("func_70076_C", "kill")); - mInitMap.put(new Pair<String, String>("func_70077_a", "onStruckByLightning")); - mInitMap.put(new Pair<String, String>("func_70078_a", "mountEntity")); - mInitMap.put(new Pair<String, String>("func_70079_am", "getRotationYawHead")); - mInitMap.put(new Pair<String, String>("func_70080_a", "setPositionAndRotation")); - mInitMap.put(new Pair<String, String>("func_70081_e", "dealFireDamage")); - mInitMap.put(new Pair<String, String>("func_70082_c", "setAngles")); - mInitMap.put(new Pair<String, String>("func_70083_f", "getFlag")); - mInitMap.put(new Pair<String, String>("func_70084_c", "addToPlayerScore")); - mInitMap.put(new Pair<String, String>("func_70085_c", "interact")); - mInitMap.put(new Pair<String, String>("func_70086_ai", "getAir")); - mInitMap.put(new Pair<String, String>("func_70087_a", "mInitMap.put(newDoubleNBTList")); - mInitMap.put(new Pair<String, String>("func_70088_a", "entityInit")); - mInitMap.put(new Pair<String, String>("func_70089_S", "isEntityAlive")); - mInitMap.put(new Pair<String, String>("func_70090_H", "isInWater")); - mInitMap.put(new Pair<String, String>("func_70091_d", "moveEntity")); - mInitMap.put(new Pair<String, String>("func_70092_e", "getDistanceSq")); - mInitMap.put(new Pair<String, String>("func_70093_af", "isSneaking")); - mInitMap.put(new Pair<String, String>("func_70094_T", "isEntityInsideOpaqueBlock")); - mInitMap.put(new Pair<String, String>("func_70095_a", "setSneaking")); - mInitMap.put(new Pair<String, String>("func_70096_w", "getDataWatcher")); - mInitMap.put(new Pair<String, String>("func_70097_a", "attackEntityFrom")); - mInitMap.put(new Pair<String, String>("func_70098_U", "updateRidden")); - mInitMap.put(new Pair<String, String>("func_70099_a", "entityDropItem")); - mInitMap.put(new Pair<String, String>("func_70100_b_", "onCollideWithPlayer")); - mInitMap.put(new Pair<String, String>("func_70101_b", "setRotation")); - mInitMap.put(new Pair<String, String>("func_70103_a", "handleHealthUpdate")); - mInitMap.put(new Pair<String, String>("func_70104_M", "canBePushed")); - mInitMap.put(new Pair<String, String>("func_70105_a", "setSize")); - mInitMap.put(new Pair<String, String>("func_70106_y", "setDead")); - mInitMap.put(new Pair<String, String>("func_70107_b", "setPosition")); - mInitMap.put(new Pair<String, String>("func_70108_f", "applyEntityCollision")); - mInitMap.put(new Pair<String, String>("func_70109_d", "writeToNBT")); - mInitMap.put(new Pair<String, String>("func_70110_aj", "setInWeb")); - mInitMap.put(new Pair<String, String>("func_70111_Y", "getCollisionBorderSize")); - mInitMap.put(new Pair<String, String>("func_70112_a", "isInRangeToRenderDist")); - mInitMap.put(new Pair<String, String>("func_70113_ah", "isEating")); - mInitMap.put(new Pair<String, String>("func_70114_g", "getCollisionBox")); - mInitMap.put(new Pair<String, String>("func_70115_ae", "isRiding")); - mInitMap.put(new Pair<String, String>("func_70184_a", "onImpact")); - mInitMap.put(new Pair<String, String>("func_70185_h", "getGravityVelocity")); - mInitMap.put(new Pair<String, String>("func_70186_c", "setThrowableHeading")); - mInitMap.put(new Pair<String, String>("func_70196_i", "getPotionDamage")); - mInitMap.put(new Pair<String, String>("func_70220_a", "moveTowards")); - mInitMap.put(new Pair<String, String>("func_70227_a", "onImpact")); - mInitMap.put(new Pair<String, String>("func_70239_b", "setDamage")); - mInitMap.put(new Pair<String, String>("func_70240_a", "setKnockbackStrength")); - mInitMap.put(new Pair<String, String>("func_70241_g", "getIsCritical")); - mInitMap.put(new Pair<String, String>("func_70242_d", "getDamage")); - mInitMap.put(new Pair<String, String>("func_70243_d", "setIsCritical")); - mInitMap.put(new Pair<String, String>("func_70265_b", "setTimeSinceHit")); - mInitMap.put(new Pair<String, String>("func_70266_a", "setDamageTaken")); - mInitMap.put(new Pair<String, String>("func_70267_i", "getForwardDirection")); - mInitMap.put(new Pair<String, String>("func_70268_h", "getTimeSinceHit")); - mInitMap.put(new Pair<String, String>("func_70269_c", "setForwardDirection")); - mInitMap.put(new Pair<String, String>("func_70270_d", "setIsBoatEmpty")); - mInitMap.put(new Pair<String, String>("func_70271_g", "getDamageTaken")); - mInitMap.put(new Pair<String, String>("func_70288_d", "setAgeToCreativeDespawnTime")); - mInitMap.put(new Pair<String, String>("func_70289_a", "combineItems")); - mInitMap.put(new Pair<String, String>("func_70295_k_", "openChest")); - mInitMap.put(new Pair<String, String>("func_70296_d", "markDirty")); - mInitMap.put(new Pair<String, String>("func_70297_j_", "getInventoryStackLimit")); - mInitMap.put(new Pair<String, String>("func_70298_a", "decrStackSize")); - mInitMap.put(new Pair<String, String>("func_70299_a", "setInventorySlotContents")); - mInitMap.put(new Pair<String, String>("func_70300_a", "isUseableByPlayer")); - mInitMap.put(new Pair<String, String>("func_70301_a", "getStackInSlot")); - mInitMap.put(new Pair<String, String>("func_70302_i_", "getSizeInventory")); - mInitMap.put(new Pair<String, String>("func_70304_b", "getStackInSlotOnClosing")); - mInitMap.put(new Pair<String, String>("func_70305_f", "closeChest")); - mInitMap.put(new Pair<String, String>("func_70429_k", "decrementAnimations")); - mInitMap.put(new Pair<String, String>("func_70430_l", "getTotalArmorValue")); - mInitMap.put(new Pair<String, String>("func_70431_c", "hasItemStack")); - mInitMap.put(new Pair<String, String>("func_70432_d", "storeItemStack")); - mInitMap.put(new Pair<String, String>("func_70436_m", "dropAllItems")); - mInitMap.put(new Pair<String, String>("func_70437_b", "setItemStack")); - mInitMap.put(new Pair<String, String>("func_70440_f", "armorItemInSlot")); - mInitMap.put(new Pair<String, String>("func_70441_a", "addItemStackToInventory")); - mInitMap.put(new Pair<String, String>("func_70442_a", "writeToNBT")); - mInitMap.put(new Pair<String, String>("func_70443_b", "readFromNBT")); - mInitMap.put(new Pair<String, String>("func_70445_o", "getItemStack")); - mInitMap.put(new Pair<String, String>("func_70447_i", "getFirstEmptyStack")); - mInitMap.put(new Pair<String, String>("func_70448_g", "getCurrentItem")); - mInitMap.put(new Pair<String, String>("func_70449_g", "damageArmor")); - mInitMap.put(new Pair<String, String>("func_70451_h", "getHotbarSize")); - mInitMap.put(new Pair<String, String>("func_70452_e", "storePartialItemStack")); - mInitMap.put(new Pair<String, String>("func_70453_c", "changeCurrentItem")); - mInitMap.put(new Pair<String, String>("func_70455_b", "copyInventory")); - mInitMap.put(new Pair<String, String>("func_70463_b", "getStackInRowAndColumn")); - mInitMap.put(new Pair<String, String>("func_70468_h", "getCurrentRecipe")); - mInitMap.put(new Pair<String, String>("func_70469_d", "inventoryResetNeededOnSlotChange")); - mInitMap.put(new Pair<String, String>("func_70470_g", "resetRecipeAndSlots")); - mInitMap.put(new Pair<String, String>("func_70471_c", "setCurrentRecipeIndex")); - mInitMap.put(new Pair<String, String>("func_70486_a", "loadInventoryFromNBT")); - mInitMap.put(new Pair<String, String>("func_70487_g", "saveInventoryToNBT")); - mInitMap.put(new Pair<String, String>("func_70491_i", "getDamage")); - mInitMap.put(new Pair<String, String>("func_70492_c", "setDamage")); - mInitMap.put(new Pair<String, String>("func_70493_k", "getRollingDirection")); - mInitMap.put(new Pair<String, String>("func_70494_i", "setRollingDirection")); - mInitMap.put(new Pair<String, String>("func_70496_j", "getRollingAmplitude")); - mInitMap.put(new Pair<String, String>("func_70497_h", "setRollingAmplitude")); - mInitMap.put(new Pair<String, String>("func_70515_d", "explode")); - mInitMap.put(new Pair<String, String>("func_70518_d", "onValidSurface")); - mInitMap.put(new Pair<String, String>("func_70526_d", "getXpValue")); - mInitMap.put(new Pair<String, String>("func_70527_a", "getXPSplit")); - mInitMap.put(new Pair<String, String>("func_70528_g", "getTextureByXP")); - mInitMap.put(new Pair<String, String>("func_70534_d", "getRedColorF")); - mInitMap.put(new Pair<String, String>("func_70535_g", "getBlueColorF")); - mInitMap.put(new Pair<String, String>("func_70536_a", "setParticleTextureIndex")); - mInitMap.put(new Pair<String, String>("func_70537_b", "getFXLayer")); - mInitMap.put(new Pair<String, String>("func_70538_b", "setRBGColorF")); - mInitMap.put(new Pair<String, String>("func_70539_a", "renderParticle")); - mInitMap.put(new Pair<String, String>("func_70541_f", "multipleParticleScaleBy")); - mInitMap.put(new Pair<String, String>("func_70542_f", "getGreenColorF")); - mInitMap.put(new Pair<String, String>("func_70543_e", "multiplyVelocity")); - mInitMap.put(new Pair<String, String>("func_70589_b", "setBaseSpellTextureIndex")); - mInitMap.put(new Pair<String, String>("func_70596_a", "applyColourMultiplier")); - mInitMap.put(new Pair<String, String>("func_70599_aP", "getSoundVolume")); - mInitMap.put(new Pair<String, String>("func_70600_l", "dropRareDrop")); - mInitMap.put(new Pair<String, String>("func_70601_bi", "getCanSpawnHere")); - mInitMap.put(new Pair<String, String>("func_70603_bj", "getRenderSizeModifier")); - mInitMap.put(new Pair<String, String>("func_70604_c", "setRevengeTarget")); - mInitMap.put(new Pair<String, String>("func_70605_aq", "getMoveHelper")); - mInitMap.put(new Pair<String, String>("func_70606_j", "setHealth")); - mInitMap.put(new Pair<String, String>("func_70608_bn", "isPlayerSleeping")); - mInitMap.put(new Pair<String, String>("func_70609_aI", "onDeathUpdate")); - mInitMap.put(new Pair<String, String>("func_70610_aX", "isMovementBlocked")); - mInitMap.put(new Pair<String, String>("func_70612_e", "moveEntityWithHeading")); - mInitMap.put(new Pair<String, String>("func_70613_aW", "isServerWorld")); - mInitMap.put(new Pair<String, String>("func_70614_a", "rayTrace")); - mInitMap.put(new Pair<String, String>("func_70615_aA", "eatGrassBonus")); - mInitMap.put(new Pair<String, String>("func_70617_f_", "isOnLadder")); - mInitMap.put(new Pair<String, String>("func_70618_n", "removePotionEffectClient")); - mInitMap.put(new Pair<String, String>("func_70619_bc", "updateAITasks")); - mInitMap.put(new Pair<String, String>("func_70620_b", "getItemIcon")); - mInitMap.put(new Pair<String, String>("func_70621_aR", "getHurtSound")); - mInitMap.put(new Pair<String, String>("func_70623_bb", "despawnEntity")); - mInitMap.put(new Pair<String, String>("func_70624_b", "setAttackTarget")); - mInitMap.put(new Pair<String, String>("func_70625_a", "faceEntity")); - mInitMap.put(new Pair<String, String>("func_70626_be", "updateEntityActionState")); - mInitMap.put(new Pair<String, String>("func_70627_aG", "getTalkInterval")); - mInitMap.put(new Pair<String, String>("func_70628_a", "dropFewItems")); - mInitMap.put(new Pair<String, String>("func_70629_bd", "updateAITick")); - mInitMap.put(new Pair<String, String>("func_70631_g_", "isChild")); - mInitMap.put(new Pair<String, String>("func_70632_aY", "isBlocking")); - mInitMap.put(new Pair<String, String>("func_70634_a", "setPositionAndUpdate")); - mInitMap.put(new Pair<String, String>("func_70635_at", "getEntitySenses")); - mInitMap.put(new Pair<String, String>("func_70636_d", "onLivingUpdate")); - mInitMap.put(new Pair<String, String>("func_70637_d", "setJumping")); - mInitMap.put(new Pair<String, String>("func_70638_az", "getAttackTarget")); - mInitMap.put(new Pair<String, String>("func_70639_aQ", "getLivingSound")); - mInitMap.put(new Pair<String, String>("func_70641_bl", "getMaxSpawnedInChunk")); - mInitMap.put(new Pair<String, String>("func_70642_aH", "playLivingSound")); - mInitMap.put(new Pair<String, String>("func_70643_av", "getAITarget")); - mInitMap.put(new Pair<String, String>("func_70644_a", "isPotionActive")); - mInitMap.put(new Pair<String, String>("func_70645_a", "onDeath")); - mInitMap.put(new Pair<String, String>("func_70646_bf", "getVerticalFaceSpeed")); - mInitMap.put(new Pair<String, String>("func_70647_i", "getSoundPitch")); - mInitMap.put(new Pair<String, String>("func_70648_aU", "canBreatheUnderwater")); - mInitMap.put(new Pair<String, String>("func_70650_aV", "isAIEnabled")); - mInitMap.put(new Pair<String, String>("func_70651_bq", "getActivePotionEffects")); - mInitMap.put(new Pair<String, String>("func_70652_k", "attackEntityAsMob")); - mInitMap.put(new Pair<String, String>("func_70653_a", "knockBack")); - mInitMap.put(new Pair<String, String>("func_70654_ax", "getAge")); - mInitMap.put(new Pair<String, String>("func_70655_b", "applyArmorCalculations")); - mInitMap.put(new Pair<String, String>("func_70656_aK", "spawnExplosionParticle")); - mInitMap.put(new Pair<String, String>("func_70657_f", "setMoveForward")); - mInitMap.put(new Pair<String, String>("func_70658_aO", "getTotalArmorValue")); - mInitMap.put(new Pair<String, String>("func_70659_e", "setAIMoveSpeed")); - mInitMap.put(new Pair<String, String>("func_70660_b", "getActivePotionEffect")); - mInitMap.put(new Pair<String, String>("func_70661_as", "getNavigator")); - mInitMap.put(new Pair<String, String>("func_70662_br", "isEntityUndead")); - mInitMap.put(new Pair<String, String>("func_70663_b", "updateRotation")); - mInitMap.put(new Pair<String, String>("func_70664_aZ", "jump")); - mInitMap.put(new Pair<String, String>("func_70665_d", "damageEntity")); - mInitMap.put(new Pair<String, String>("func_70666_h", "getPosition")); - mInitMap.put(new Pair<String, String>("func_70668_bt", "getCreatureAttribute")); - mInitMap.put(new Pair<String, String>("func_70669_a", "renderBrokenItemStack")); - mInitMap.put(new Pair<String, String>("func_70670_a", "onmInitMap.put(newPotionEffect")); - mInitMap.put(new Pair<String, String>("func_70671_ap", "getLookHelper")); - mInitMap.put(new Pair<String, String>("func_70672_c", "applyPotionDamageCalculations")); - mInitMap.put(new Pair<String, String>("func_70673_aS", "getDeathSound")); - mInitMap.put(new Pair<String, String>("func_70674_bp", "clearActivePotions")); - mInitMap.put(new Pair<String, String>("func_70675_k", "damageArmor")); - mInitMap.put(new Pair<String, String>("func_70676_i", "getLook")); - mInitMap.put(new Pair<String, String>("func_70678_g", "getSwingProgress")); - mInitMap.put(new Pair<String, String>("func_70679_bo", "updatePotionEffects")); - mInitMap.put(new Pair<String, String>("func_70681_au", "getRNG")); - mInitMap.put(new Pair<String, String>("func_70682_h", "decreaseAirSupply")); - mInitMap.put(new Pair<String, String>("func_70683_ar", "getJumpHelper")); - mInitMap.put(new Pair<String, String>("func_70684_aJ", "isPlayer")); - mInitMap.put(new Pair<String, String>("func_70685_l", "canEntityBeSeen")); - mInitMap.put(new Pair<String, String>("func_70686_a", "canAttackClass")); - mInitMap.put(new Pair<String, String>("func_70687_e", "isPotionApplicable")); - mInitMap.put(new Pair<String, String>("func_70688_c", "onFinishedPotionEffect")); - mInitMap.put(new Pair<String, String>("func_70689_ay", "getAIMoveSpeed")); - mInitMap.put(new Pair<String, String>("func_70690_d", "addPotionEffect")); - mInitMap.put(new Pair<String, String>("func_70691_i", "heal")); - mInitMap.put(new Pair<String, String>("func_70692_ba", "canDespawn")); - mInitMap.put(new Pair<String, String>("func_70693_a", "getExperiencePoints")); - mInitMap.put(new Pair<String, String>("func_70694_bm", "getHeldItem")); - mInitMap.put(new Pair<String, String>("func_70695_b", "onChangedPotionEffect")); - mInitMap.put(new Pair<String, String>("func_70777_m", "getEntityToAttack")); - mInitMap.put(new Pair<String, String>("func_70778_a", "setPathToEntity")); - mInitMap.put(new Pair<String, String>("func_70779_j", "updateWanderPath")); - mInitMap.put(new Pair<String, String>("func_70780_i", "isMovementCeased")); - mInitMap.put(new Pair<String, String>("func_70781_l", "hasPath")); - mInitMap.put(new Pair<String, String>("func_70782_k", "findPlayerToAttack")); - mInitMap.put(new Pair<String, String>("func_70783_a", "getBlockPathWeight")); - mInitMap.put(new Pair<String, String>("func_70784_b", "setTarget")); - mInitMap.put(new Pair<String, String>("func_70785_a", "attackEntity")); - mInitMap.put(new Pair<String, String>("func_70790_a", "isCourseTraversable")); - mInitMap.put(new Pair<String, String>("func_70799_a", "setSlimeSize")); - mInitMap.put(new Pair<String, String>("func_70800_m", "canDamagePlayer")); - mInitMap.put(new Pair<String, String>("func_70801_i", "getSlimeParticle")); - mInitMap.put(new Pair<String, String>("func_70802_j", "createInstance")); - mInitMap.put(new Pair<String, String>("func_70803_o", "getJumpSound")); - mInitMap.put(new Pair<String, String>("func_70804_p", "makesSoundOnLand")); - mInitMap.put(new Pair<String, String>("func_70805_n", "getAttackStrength")); - mInitMap.put(new Pair<String, String>("func_70806_k", "getJumpDelay")); - mInitMap.put(new Pair<String, String>("func_70807_r", "makesSoundOnJump")); - mInitMap.put(new Pair<String, String>("func_70808_l", "alterSquishAmount")); - mInitMap.put(new Pair<String, String>("func_70809_q", "getSlimeSize")); - mInitMap.put(new Pair<String, String>("func_70814_o", "isValidLightLevel")); - mInitMap.put(new Pair<String, String>("func_70816_c", "teleportToEntity")); - mInitMap.put(new Pair<String, String>("func_70817_b", "setCarryingData")); - mInitMap.put(new Pair<String, String>("func_70819_e", "setScreaming")); - mInitMap.put(new Pair<String, String>("func_70820_n", "teleportRandomly")); - mInitMap.put(new Pair<String, String>("func_70821_d", "shouldAttackPlayer")); - mInitMap.put(new Pair<String, String>("func_70823_r", "isScreaming")); - mInitMap.put(new Pair<String, String>("func_70824_q", "getCarryingData")); - mInitMap.put(new Pair<String, String>("func_70825_j", "teleportTo")); - mInitMap.put(new Pair<String, String>("func_70829_a", "setCreeperState")); - mInitMap.put(new Pair<String, String>("func_70830_n", "getPowered")); - mInitMap.put(new Pair<String, String>("func_70831_j", "getCreeperFlashIntensity")); - mInitMap.put(new Pair<String, String>("func_70832_p", "getCreeperState")); - mInitMap.put(new Pair<String, String>("func_70835_c", "becomeAngryAt")); - mInitMap.put(new Pair<String, String>("func_70839_e", "setBesideClimbableBlock")); - mInitMap.put(new Pair<String, String>("func_70841_p", "isBesideClimbableBlock")); - mInitMap.put(new Pair<String, String>("func_70849_f", "setPlayerCreated")); - mInitMap.put(new Pair<String, String>("func_70850_q", "isPlayerCreated")); - mInitMap.put(new Pair<String, String>("func_70851_e", "setHoldingRose")); - mInitMap.put(new Pair<String, String>("func_70852_n", "getVillage")); - mInitMap.put(new Pair<String, String>("func_70853_p", "getHoldRoseTick")); - mInitMap.put(new Pair<String, String>("func_70854_o", "getAttackTimer")); - mInitMap.put(new Pair<String, String>("func_70873_a", "setGrowingAge")); - mInitMap.put(new Pair<String, String>("func_70874_b", "getGrowingAge")); - mInitMap.put(new Pair<String, String>("func_70875_t", "resetInLove")); - mInitMap.put(new Pair<String, String>("func_70876_c", "procreate")); - mInitMap.put(new Pair<String, String>("func_70877_b", "isBreedingItem")); - mInitMap.put(new Pair<String, String>("func_70878_b", "canMateWith")); - mInitMap.put(new Pair<String, String>("func_70880_s", "isInLove")); - mInitMap.put(new Pair<String, String>("func_70890_k", "getHeadRotationAngleX")); - mInitMap.put(new Pair<String, String>("func_70891_b", "setFleeceColor")); - mInitMap.put(new Pair<String, String>("func_70892_o", "getSheared")); - mInitMap.put(new Pair<String, String>("func_70893_e", "setSheared")); - mInitMap.put(new Pair<String, String>("func_70894_j", "getHeadRotationPointY")); - mInitMap.put(new Pair<String, String>("func_70895_a", "getRandomFleeceColor")); - mInitMap.put(new Pair<String, String>("func_70896_n", "getFleeceColor")); - mInitMap.put(new Pair<String, String>("func_70900_e", "setSaddled")); - mInitMap.put(new Pair<String, String>("func_70901_n", "getSaddled")); - mInitMap.put(new Pair<String, String>("func_70902_q", "getOwner")); - mInitMap.put(new Pair<String, String>("func_70903_f", "setTamed")); - mInitMap.put(new Pair<String, String>("func_70904_g", "setSitting")); - mInitMap.put(new Pair<String, String>("func_70906_o", "isSitting")); - mInitMap.put(new Pair<String, String>("func_70907_r", "getAISit")); - mInitMap.put(new Pair<String, String>("func_70908_e", "playTameEffect")); - mInitMap.put(new Pair<String, String>("func_70909_n", "isTamed")); - mInitMap.put(new Pair<String, String>("func_70912_b", "setTameSkin")); - mInitMap.put(new Pair<String, String>("func_70913_u", "getTameSkin")); - mInitMap.put(new Pair<String, String>("func_70915_j", "getShadingWhileWet")); - mInitMap.put(new Pair<String, String>("func_70916_h", "setAngry")); - mInitMap.put(new Pair<String, String>("func_70917_k", "getInterestedAngle")); - mInitMap.put(new Pair<String, String>("func_70919_bu", "isAngry")); - mInitMap.put(new Pair<String, String>("func_70920_v", "getTailRotation")); - mInitMap.put(new Pair<String, String>("func_70921_u", "isWolfWet")); - mInitMap.put(new Pair<String, String>("func_70923_f", "getShakeAngle")); - mInitMap.put(new Pair<String, String>("func_70930_a", "setRecipes")); - mInitMap.put(new Pair<String, String>("func_70931_l_", "getCustomer")); - mInitMap.put(new Pair<String, String>("func_70932_a_", "setCustomer")); - mInitMap.put(new Pair<String, String>("func_70933_a", "useRecipe")); - mInitMap.put(new Pair<String, String>("func_70934_b", "getRecipes")); - mInitMap.put(new Pair<String, String>("func_70938_b", "setProfession")); - mInitMap.put(new Pair<String, String>("func_70939_f", "setPlaying")); - mInitMap.put(new Pair<String, String>("func_70940_q", "isTrading")); - mInitMap.put(new Pair<String, String>("func_70941_o", "isMating")); - mInitMap.put(new Pair<String, String>("func_70942_a", "generateRandomParticles")); - mInitMap.put(new Pair<String, String>("func_70945_p", "isPlaying")); - mInitMap.put(new Pair<String, String>("func_70946_n", "getProfession")); - mInitMap.put(new Pair<String, String>("func_70947_e", "setMating")); - mInitMap.put(new Pair<String, String>("func_70950_c", "addDefaultEquipmentAndRecipies")); - mInitMap.put(new Pair<String, String>("func_70965_a", "attackEntityFromPart")); - mInitMap.put(new Pair<String, String>("func_70967_k", "setmInitMap.put(newTarget")); - mInitMap.put(new Pair<String, String>("func_70969_j", "updateDragonEnderCrystal")); - mInitMap.put(new Pair<String, String>("func_70970_a", "collideWithEntities")); - mInitMap.put(new Pair<String, String>("func_70971_b", "attackEntitiesInList")); - mInitMap.put(new Pair<String, String>("func_70972_a", "destroyBlocksInAABB")); - mInitMap.put(new Pair<String, String>("func_70973_b", "simplifyAngle")); - mInitMap.put(new Pair<String, String>("func_70974_a", "getMovementOffsets")); - mInitMap.put(new Pair<String, String>("func_70975_a", "createEnderPortal")); - mInitMap.put(new Pair<String, String>("func_70996_bM", "shouldHeal")); - mInitMap.put(new Pair<String, String>("func_70997_bJ", "getBedLocation")); - mInitMap.put(new Pair<String, String>("func_70998_m", "interactWith")); - mInitMap.put(new Pair<String, String>("func_70999_a", "wakeUpPlayer")); - mInitMap.put(new Pair<String, String>("func_71000_j", "addMovementStat")); - mInitMap.put(new Pair<String, String>("func_71001_a", "onItemPickup")); - mInitMap.put(new Pair<String, String>("func_71002_c", "displayGUIEnchantment")); - mInitMap.put(new Pair<String, String>("func_71004_bE", "respawnPlayer")); - mInitMap.put(new Pair<String, String>("func_71005_bN", "getInventoryEnderChest")); - mInitMap.put(new Pair<String, String>("func_71007_a", "displayGUIChest")); - mInitMap.put(new Pair<String, String>("func_71008_a", "setItemInUse")); - mInitMap.put(new Pair<String, String>("func_71009_b", "onCriticalHit")); - mInitMap.put(new Pair<String, String>("func_71010_c", "updateItemUse")); - mInitMap.put(new Pair<String, String>("func_71011_bu", "getItemInUse")); - mInitMap.put(new Pair<String, String>("func_71012_a", "joinEntityItemWithWorld")); - mInitMap.put(new Pair<String, String>("func_71015_k", "addMountedMovementStat")); - mInitMap.put(new Pair<String, String>("func_71016_p", "sendPlayerAbilities")); - mInitMap.put(new Pair<String, String>("func_71018_a", "sleepInBedAt")); - mInitMap.put(new Pair<String, String>("func_71019_a", "dropPlayerItemWithRandomChoice")); - mInitMap.put(new Pair<String, String>("func_71020_j", "addExhaustion")); - mInitMap.put(new Pair<String, String>("func_71023_q", "addExperience")); - mInitMap.put(new Pair<String, String>("func_71024_bL", "getFoodStats")); - mInitMap.put(new Pair<String, String>("func_71026_bH", "isPlayerFullyAsleep")); - mInitMap.put(new Pair<String, String>("func_71027_c", "travelToDimension")); - mInitMap.put(new Pair<String, String>("func_71028_bD", "destroyCurrentEquippedItem")); - mInitMap.put(new Pair<String, String>("func_71029_a", "triggerAchievement")); - mInitMap.put(new Pair<String, String>("func_71030_a", "displayGUIMerchant")); - mInitMap.put(new Pair<String, String>("func_71033_a", "setGameType")); - mInitMap.put(new Pair<String, String>("func_71034_by", "stopUsingItem")); - mInitMap.put(new Pair<String, String>("func_71036_o", "onItemUseFinish")); - mInitMap.put(new Pair<String, String>("func_71037_bA", "getScore")); - mInitMap.put(new Pair<String, String>("func_71038_i", "swingItem")); - mInitMap.put(new Pair<String, String>("func_71039_bw", "isUsingItem")); - mInitMap.put(new Pair<String, String>("func_71040_bB", "dropOneItem")); - mInitMap.put(new Pair<String, String>("func_71041_bz", "clearItemInUse")); - mInitMap.put(new Pair<String, String>("func_71043_e", "canEat")); - mInitMap.put(new Pair<String, String>("func_71044_o", "collideWithPlayer")); - mInitMap.put(new Pair<String, String>("func_71045_bC", "getCurrentEquippedItem")); - mInitMap.put(new Pair<String, String>("func_71047_c", "onEnchantmentCritical")); - mInitMap.put(new Pair<String, String>("func_71048_c", "displayGUIBook")); - mInitMap.put(new Pair<String, String>("func_71049_a", "clonePlayer")); - mInitMap.put(new Pair<String, String>("func_71050_bK", "xpBarCap")); - mInitMap.put(new Pair<String, String>("func_71051_bG", "getBedOrientationInDegrees")); - mInitMap.put(new Pair<String, String>("func_71052_bv", "getItemInUseCount")); - mInitMap.put(new Pair<String, String>("func_71053_j", "closeScreen")); - mInitMap.put(new Pair<String, String>("func_71056_a", "verifyRespawnCoordinates")); - mInitMap.put(new Pair<String, String>("func_71057_bx", "getItemInUseDuration")); - mInitMap.put(new Pair<String, String>("func_71058_b", "displayGUIWorkbench")); - mInitMap.put(new Pair<String, String>("func_71059_n", "attackTargetEntityWithCurrentItem")); - mInitMap.put(new Pair<String, String>("func_71060_bI", "getSleepTimer")); - mInitMap.put(new Pair<String, String>("func_71061_d_", "resetHeight")); - mInitMap.put(new Pair<String, String>("func_71063_a", "setSpawnChunk")); - mInitMap.put(new Pair<String, String>("func_71064_a", "addStat")); - mInitMap.put(new Pair<String, String>("func_71065_l", "isInBed")); - mInitMap.put(new Pair<String, String>("func_71110_a", "updateCraftingInventory")); - mInitMap.put(new Pair<String, String>("func_71111_a", "sendSlotContents")); - mInitMap.put(new Pair<String, String>("func_71112_a", "sendProgressBarUpdate")); - mInitMap.put(new Pair<String, String>("func_71113_k", "updateHeldItem")); - mInitMap.put(new Pair<String, String>("func_71114_r", "getPlayerIP")); - mInitMap.put(new Pair<String, String>("func_71116_b", "addSelfToInternalCraftingInventory")); - mInitMap.put(new Pair<String, String>("func_71117_bO", "getNextWindowId")); - mInitMap.put(new Pair<String, String>("func_71118_n", "setPlayerHealthUpdated")); - mInitMap.put(new Pair<String, String>("func_71120_a", "sendContainerToPlayer")); - mInitMap.put(new Pair<String, String>("func_71121_q", "getServerForPlayer")); - mInitMap.put(new Pair<String, String>("func_71122_b", "handleFalling")); - mInitMap.put(new Pair<String, String>("func_71123_m", "mountEntityAndWakeUp")); - mInitMap.put(new Pair<String, String>("func_71124_b", "getEquipmentInSlot")); - mInitMap.put(new Pair<String, String>("func_71127_g", "onUpdateEntity")); - mInitMap.put(new Pair<String, String>("func_71128_l", "closeContainer")); - mInitMap.put(new Pair<String, String>("func_71150_b", "setPlayerSPHealth")); - mInitMap.put(new Pair<String, String>("func_71151_f", "getFOVMultiplier")); - mInitMap.put(new Pair<String, String>("func_71152_a", "setXPStats")); - mInitMap.put(new Pair<String, String>("func_71153_f", "isBlockNormal")); - mInitMap.put(new Pair<String, String>("func_71165_d", "sendChatMessage")); - mInitMap.put(new Pair<String, String>("func_71166_b", "sendMotionUpdates")); - mInitMap.put(new Pair<String, String>("func_71187_D", "getCommandManager")); - mInitMap.put(new Pair<String, String>("func_71188_g", "setAllowPvp")); - mInitMap.put(new Pair<String, String>("func_71189_e", "setHostname")); - mInitMap.put(new Pair<String, String>("func_71190_q", "updateTimeLightAndEntities")); - mInitMap.put(new Pair<String, String>("func_71191_d", "setBuildLimit")); - mInitMap.put(new Pair<String, String>("func_71192_d", "setUserMessage")); - mInitMap.put(new Pair<String, String>("func_71193_K", "allowSpawnMonsters")); - mInitMap.put(new Pair<String, String>("func_71194_c", "canCreateBonusChest")); - mInitMap.put(new Pair<String, String>("func_71195_b_", "getUserMessage")); - mInitMap.put(new Pair<String, String>("func_71197_b", "startServer")); - mInitMap.put(new Pair<String, String>("func_71198_k", "logDebug")); - mInitMap.put(new Pair<String, String>("func_71199_h", "isHardcore")); - mInitMap.put(new Pair<String, String>("func_71200_ad", "serverIsInRunLoop")); - mInitMap.put(new Pair<String, String>("func_71201_j", "logSevere")); - mInitMap.put(new Pair<String, String>("func_71203_ab", "getConfigurationManager")); - mInitMap.put(new Pair<String, String>("func_71204_b", "setDemo")); - mInitMap.put(new Pair<String, String>("func_71205_p", "setMOTD")); - mInitMap.put(new Pair<String, String>("func_71206_a", "shareToLAN")); - mInitMap.put(new Pair<String, String>("func_71207_Z", "getBuildLimit")); - mInitMap.put(new Pair<String, String>("func_71208_b", "setServerPort")); - mInitMap.put(new Pair<String, String>("func_71209_f", "getFile")); - mInitMap.put(new Pair<String, String>("func_71211_k", "getServerHostname")); - mInitMap.put(new Pair<String, String>("func_71213_z", "getAllUsernames")); - mInitMap.put(new Pair<String, String>("func_71214_G", "getServerOwner")); - mInitMap.put(new Pair<String, String>("func_71215_F", "getServerPort")); - mInitMap.put(new Pair<String, String>("func_71216_a_", "outputPercentRemaining")); - mInitMap.put(new Pair<String, String>("func_71217_p", "tick")); - mInitMap.put(new Pair<String, String>("func_71218_a", "worldServerForDimension")); - mInitMap.put(new Pair<String, String>("func_71219_W", "isPVPEnabled")); - mInitMap.put(new Pair<String, String>("func_71220_V", "getCanSpawnNPCs")); - mInitMap.put(new Pair<String, String>("func_71221_J", "getWorldName")); - mInitMap.put(new Pair<String, String>("func_71222_d", "initialWorldChunkLoad")); - mInitMap.put(new Pair<String, String>("func_71223_ag", "enableProfiling")); - mInitMap.put(new Pair<String, String>("func_71224_l", "setServerOwner")); - mInitMap.put(new Pair<String, String>("func_71225_e", "canStructuresSpawn")); - mInitMap.put(new Pair<String, String>("func_71228_a", "finalTick")); - mInitMap.put(new Pair<String, String>("func_71229_d", "setOnlineMode")); - mInitMap.put(new Pair<String, String>("func_71230_b", "addServerInfoToCrashReport")); - mInitMap.put(new Pair<String, String>("func_71231_X", "isFlightAllowed")); - mInitMap.put(new Pair<String, String>("func_71233_x", "getCurrentPlayerCount")); - mInitMap.put(new Pair<String, String>("func_71234_u", "getPort")); - mInitMap.put(new Pair<String, String>("func_71235_a", "setGameType")); - mInitMap.put(new Pair<String, String>("func_71236_h", "logWarning")); - mInitMap.put(new Pair<String, String>("func_71237_c", "convertMapIfNeeded")); - mInitMap.put(new Pair<String, String>("func_71238_n", "getDataDirectory")); - mInitMap.put(new Pair<String, String>("func_71239_B", "isDebuggingEnabled")); - mInitMap.put(new Pair<String, String>("func_71240_o", "systemExitNow")); - mInitMap.put(new Pair<String, String>("func_71241_aa", "isServerStopped")); - mInitMap.put(new Pair<String, String>("func_71242_L", "isDemo")); - mInitMap.put(new Pair<String, String>("func_71243_i", "clearCurrentTask")); - mInitMap.put(new Pair<String, String>("func_71244_g", "logInfo")); - mInitMap.put(new Pair<String, String>("func_71245_h", "setAllowFlight")); - mInitMap.put(new Pair<String, String>("func_71246_n", "setWorldName")); - mInitMap.put(new Pair<String, String>("func_71247_a", "loadAllWorlds")); - mInitMap.put(new Pair<String, String>("func_71248_a", "getPossibleCompletions")); - mInitMap.put(new Pair<String, String>("func_71249_w", "getMinecraftVersion")); - mInitMap.put(new Pair<String, String>("func_71250_E", "getKeyPair")); - mInitMap.put(new Pair<String, String>("func_71251_e", "setCanSpawnAnimals")); - mInitMap.put(new Pair<String, String>("func_71252_i", "handleRConCommand")); - mInitMap.put(new Pair<String, String>("func_71253_a", "setKeyPair")); - mInitMap.put(new Pair<String, String>("func_71254_M", "getActiveAnvilConverter")); - mInitMap.put(new Pair<String, String>("func_71255_r", "getAllowNether")); - mInitMap.put(new Pair<String, String>("func_71256_s", "startServerThread")); - mInitMap.put(new Pair<String, String>("func_71257_f", "setCanSpawnNPCs")); - mInitMap.put(new Pair<String, String>("func_71258_A", "getPlugins")); - mInitMap.put(new Pair<String, String>("func_71259_af", "getTickCounter")); - mInitMap.put(new Pair<String, String>("func_71260_j", "stopServer")); - mInitMap.put(new Pair<String, String>("func_71261_m", "setFolderName")); - mInitMap.put(new Pair<String, String>("func_71262_S", "isDedicatedServer")); - mInitMap.put(new Pair<String, String>("func_71263_m", "initiateShutdown")); - mInitMap.put(new Pair<String, String>("func_71264_H", "isSinglePlayer")); - mInitMap.put(new Pair<String, String>("func_71265_f", "getGameType")); - mInitMap.put(new Pair<String, String>("func_71266_T", "isServerInOnlineMode")); - mInitMap.put(new Pair<String, String>("func_71267_a", "saveAllWorlds")); - mInitMap.put(new Pair<String, String>("func_71268_U", "getCanSpawnAnimals")); - mInitMap.put(new Pair<String, String>("func_71270_I", "getFolderName")); - mInitMap.put(new Pair<String, String>("func_71272_O", "deleteWorldAndStopServer")); - mInitMap.put(new Pair<String, String>("func_71273_Y", "getMOTD")); - mInitMap.put(new Pair<String, String>("func_71274_v", "getMotd")); - mInitMap.put(new Pair<String, String>("func_71275_y", "getMaxPlayers")); - mInitMap.put(new Pair<String, String>("func_71276_C", "getServer")); - mInitMap.put(new Pair<String, String>("func_71277_t", "getHostname")); - mInitMap.put(new Pair<String, String>("func_71278_l", "isServerRunning")); - mInitMap.put(new Pair<String, String>("func_71279_ae", "getGuiEnabled")); - mInitMap.put(new Pair<String, String>("func_71326_a", "saveProperties")); - mInitMap.put(new Pair<String, String>("func_71327_a", "getIntProperty")); - mInitMap.put(new Pair<String, String>("func_71328_a", "setProperty")); - mInitMap.put(new Pair<String, String>("func_71329_c", "getSettingsFilename")); - mInitMap.put(new Pair<String, String>("func_71330_a", "getStringProperty")); - mInitMap.put(new Pair<String, String>("func_71331_a", "addPendingCommand")); - mInitMap.put(new Pair<String, String>("func_71332_a", "getBooleanProperty")); - mInitMap.put(new Pair<String, String>("func_71333_ah", "executePendingCommands")); - mInitMap.put(new Pair<String, String>("func_71344_c", "getPublic")); - mInitMap.put(new Pair<String, String>("func_71351_a", "setServerData")); - mInitMap.put(new Pair<String, String>("func_71352_k", "toggleFullscreen")); - mInitMap.put(new Pair<String, String>("func_71353_a", "loadWorld")); - mInitMap.put(new Pair<String, String>("func_71354_a", "setDimensionAndSpawnPlayer")); - mInitMap.put(new Pair<String, String>("func_71355_q", "isDemo")); - mInitMap.put(new Pair<String, String>("func_71356_B", "isSingleplayer")); - mInitMap.put(new Pair<String, String>("func_71357_I", "loadScreen")); - mInitMap.put(new Pair<String, String>("func_71359_d", "getSaveLoader")); - mInitMap.put(new Pair<String, String>("func_71361_d", "checkGLError")); - mInitMap.put(new Pair<String, String>("func_71363_D", "stopIntegratedServer")); - mInitMap.put(new Pair<String, String>("func_71364_i", "setIngameNotInFocus")); - mInitMap.put(new Pair<String, String>("func_71366_a", "displayDebugInfo")); - mInitMap.put(new Pair<String, String>("func_71367_a", "setServer")); - mInitMap.put(new Pair<String, String>("func_71369_N", "getGLMaximumTextureSize")); - mInitMap.put(new Pair<String, String>("func_71370_a", "resize")); - mInitMap.put(new Pair<String, String>("func_71371_a", "launchIntegratedServer")); - mInitMap.put(new Pair<String, String>("func_71372_G", "isFullScreen")); - mInitMap.put(new Pair<String, String>("func_71374_p", "debugInfoEntities")); - mInitMap.put(new Pair<String, String>("func_71375_t", "isFancyGraphicsEnabled")); - mInitMap.put(new Pair<String, String>("func_71377_b", "displayCrashReport")); - mInitMap.put(new Pair<String, String>("func_71378_E", "getPlayerUsageSnooper")); - mInitMap.put(new Pair<String, String>("func_71379_u", "isAmbientOcclusionEnabled")); - mInitMap.put(new Pair<String, String>("func_71381_h", "setIngameFocus")); - mInitMap.put(new Pair<String, String>("func_71382_s", "isGuiEnabled")); - mInitMap.put(new Pair<String, String>("func_71383_b", "updateDebugProfilerName")); - mInitMap.put(new Pair<String, String>("func_71384_a", "startGame")); - mInitMap.put(new Pair<String, String>("func_71385_j", "displayInGameMenu")); - mInitMap.put(new Pair<String, String>("func_71386_F", "getSystemTime")); - mInitMap.put(new Pair<String, String>("func_71387_A", "isIntegratedServerRunning")); - mInitMap.put(new Pair<String, String>("func_71388_o", "getWorldProviderName")); - mInitMap.put(new Pair<String, String>("func_71389_H", "startTimerHackThread")); - mInitMap.put(new Pair<String, String>("func_71392_a", "scaledTessellator")); - mInitMap.put(new Pair<String, String>("func_71393_m", "debugInfoRenders")); - mInitMap.put(new Pair<String, String>("func_71396_d", "addGraphicsAndWorldToCrashReport")); - mInitMap.put(new Pair<String, String>("func_71398_f", "freeMemory")); - mInitMap.put(new Pair<String, String>("func_71400_g", "shutdown")); - mInitMap.put(new Pair<String, String>("func_71401_C", "getIntegratedServer")); - mInitMap.put(new Pair<String, String>("func_71403_a", "loadWorld")); - mInitMap.put(new Pair<String, String>("func_71404_a", "crashed")); - mInitMap.put(new Pair<String, String>("func_71405_e", "shutdownMinecraftApplet")); - mInitMap.put(new Pair<String, String>("func_71407_l", "runTick")); - mInitMap.put(new Pair<String, String>("func_71408_n", "getEntityDebug")); - mInitMap.put(new Pair<String, String>("func_71410_x", "getMinecraft")); - mInitMap.put(new Pair<String, String>("func_71411_J", "runGameLoop")); - mInitMap.put(new Pair<String, String>("func_71497_f", "getFile")); - mInitMap.put(new Pair<String, String>("func_71498_d", "getCauseStackTraceOrString")); - mInitMap.put(new Pair<String, String>("func_71499_a", "addCrashSectionThrowable")); - mInitMap.put(new Pair<String, String>("func_71500_a", "addCrashSectionCallable")); - mInitMap.put(new Pair<String, String>("func_71501_a", "getDescription")); - mInitMap.put(new Pair<String, String>("func_71502_e", "getCompleteReport")); - mInitMap.put(new Pair<String, String>("func_71503_h", "getWittyComment")); - mInitMap.put(new Pair<String, String>("func_71504_g", "populateEnvironment")); - mInitMap.put(new Pair<String, String>("func_71505_b", "getCrashCause")); - mInitMap.put(new Pair<String, String>("func_71506_a", "getSectionsInStringBuilder")); - mInitMap.put(new Pair<String, String>("func_71507_a", "addCrashSection")); - mInitMap.put(new Pair<String, String>("func_71514_a", "getCommandAliases")); - mInitMap.put(new Pair<String, String>("func_71515_b", "processCommand")); - mInitMap.put(new Pair<String, String>("func_71516_a", "addTabCompletionOptions")); - mInitMap.put(new Pair<String, String>("func_71517_b", "getCommandName")); - mInitMap.put(new Pair<String, String>("func_71518_a", "getCommandUsage")); - mInitMap.put(new Pair<String, String>("func_71519_b", "canCommandSenderUseCommand")); - mInitMap.put(new Pair<String, String>("func_71521_c", "getCommandSenderAsPlayer")); - mInitMap.put(new Pair<String, String>("func_71523_a", "doesStringStartWith")); - mInitMap.put(new Pair<String, String>("func_71526_a", "parseInt")); - mInitMap.put(new Pair<String, String>("func_71527_a", "joinNiceString")); - mInitMap.put(new Pair<String, String>("func_71528_a", "parseIntWithMin")); - mInitMap.put(new Pair<String, String>("func_71529_a", "setAdminCommander")); - mInitMap.put(new Pair<String, String>("func_71530_a", "getListOfStringsMatchingLastWord")); - mInitMap.put(new Pair<String, String>("func_71531_a", "getListOfStringsFromIterableMatchingLastWord")); - mInitMap.put(new Pair<String, String>("func_71532_a", "parseIntBounded")); - mInitMap.put(new Pair<String, String>("func_71534_d", "getSortedPossibleCommands")); - mInitMap.put(new Pair<String, String>("func_71535_c", "getCommands")); - mInitMap.put(new Pair<String, String>("func_71536_c", "getPlayers")); - mInitMap.put(new Pair<String, String>("func_71538_c", "getListOfPlayerUsernames")); - mInitMap.put(new Pair<String, String>("func_71539_b", "getGameModeFromCommand")); - mInitMap.put(new Pair<String, String>("func_71541_a", "setGameType")); - mInitMap.put(new Pair<String, String>("func_71542_c", "getAllUsernames")); - mInitMap.put(new Pair<String, String>("func_71552_a", "setTime")); - mInitMap.put(new Pair<String, String>("func_71553_b", "addTime")); - mInitMap.put(new Pair<String, String>("func_71554_c", "toggleDownfall")); - mInitMap.put(new Pair<String, String>("func_71555_a", "getCommands")); - mInitMap.put(new Pair<String, String>("func_71556_a", "executeCommand")); - mInitMap.put(new Pair<String, String>("func_71557_a", "getPossibleCommands")); - mInitMap.put(new Pair<String, String>("func_71558_b", "getPossibleCommands")); - mInitMap.put(new Pair<String, String>("func_71559_a", "dropFirstString")); - mInitMap.put(new Pair<String, String>("func_71560_a", "registerCommand")); - mInitMap.put(new Pair<String, String>("func_71565_a", "filterAllowedCharacters")); - mInitMap.put(new Pair<String, String>("func_71566_a", "isAllowedCharacter")); - mInitMap.put(new Pair<String, String>("func_71569_e", "getDistanceSquared")); - mInitMap.put(new Pair<String, String>("func_71571_b", "set")); - mInitMap.put(new Pair<String, String>("func_71575_a", "getCrashReport")); - mInitMap.put(new Pair<String, String>("func_72314_b", "expand")); - mInitMap.put(new Pair<String, String>("func_72315_c", "isVecInXZ")); - mInitMap.put(new Pair<String, String>("func_72316_a", "calculateXOffset")); - mInitMap.put(new Pair<String, String>("func_72317_d", "offset")); - mInitMap.put(new Pair<String, String>("func_72318_a", "isVecInside")); - mInitMap.put(new Pair<String, String>("func_72319_d", "isVecInXY")); - mInitMap.put(new Pair<String, String>("func_72320_b", "getAverageEdgeLength")); - mInitMap.put(new Pair<String, String>("func_72321_a", "addCoord")); - mInitMap.put(new Pair<String, String>("func_72322_c", "calculateZOffset")); - mInitMap.put(new Pair<String, String>("func_72323_b", "calculateYOffset")); - mInitMap.put(new Pair<String, String>("func_72324_b", "setBounds")); - mInitMap.put(new Pair<String, String>("func_72325_c", "getOffsetBoundingBox")); - mInitMap.put(new Pair<String, String>("func_72326_a", "intersectsWith")); - mInitMap.put(new Pair<String, String>("func_72327_a", "calculateIntercept")); - mInitMap.put(new Pair<String, String>("func_72328_c", "setBB")); - mInitMap.put(new Pair<String, String>("func_72329_c", "copy")); - mInitMap.put(new Pair<String, String>("func_72330_a", "getBoundingBox")); - mInitMap.put(new Pair<String, String>("func_72331_e", "contract")); - mInitMap.put(new Pair<String, String>("func_72333_b", "isVecInYZ")); - mInitMap.put(new Pair<String, String>("func_72352_l", "getMaxPlayers")); - mInitMap.put(new Pair<String, String>("func_72354_b", "updateTimeAndWeatherForPlayer")); - mInitMap.put(new Pair<String, String>("func_72355_a", "initializeConnectionToPlayer")); - mInitMap.put(new Pair<String, String>("func_72356_a", "transferPlayerToDimension")); - mInitMap.put(new Pair<String, String>("func_72358_d", "serverUpdateMountedMovingPlayer")); - mInitMap.put(new Pair<String, String>("func_72362_j", "loadWhiteList")); - mInitMap.put(new Pair<String, String>("func_72363_f", "getBannedIPs")); - mInitMap.put(new Pair<String, String>("func_72364_a", "setPlayerManager")); - mInitMap.put(new Pair<String, String>("func_72365_p", "getServerInstance")); - mInitMap.put(new Pair<String, String>("func_72367_e", "playerLoggedOut")); - mInitMap.put(new Pair<String, String>("func_72368_a", "recreatePlayerEntity")); - mInitMap.put(new Pair<String, String>("func_72369_d", "getAllUsernames")); - mInitMap.put(new Pair<String, String>("func_72371_a", "setWhiteListEnabled")); - mInitMap.put(new Pair<String, String>("func_72372_a", "getEntityViewDistance")); - mInitMap.put(new Pair<String, String>("func_72373_m", "getAvailablePlayerDat")); - mInitMap.put(new Pair<String, String>("func_72374_b", "onTick")); - mInitMap.put(new Pair<String, String>("func_72377_c", "playerLoggedIn")); - mInitMap.put(new Pair<String, String>("func_72378_q", "getHostPlayerData")); - mInitMap.put(new Pair<String, String>("func_72380_a", "readPlayerDataFromFile")); - mInitMap.put(new Pair<String, String>("func_72382_j", "getPlayersMatchingAddress")); - mInitMap.put(new Pair<String, String>("func_72383_n", "isWhiteListEnabled")); - mInitMap.put(new Pair<String, String>("func_72385_f", "syncPlayerInventory")); - mInitMap.put(new Pair<String, String>("func_72387_b", "setCommandsAllowedForAll")); - mInitMap.put(new Pair<String, String>("func_72389_g", "saveAllPlayerData")); - mInitMap.put(new Pair<String, String>("func_72391_b", "writePlayerData")); - mInitMap.put(new Pair<String, String>("func_72392_r", "removeAllPlayers")); - mInitMap.put(new Pair<String, String>("func_72394_k", "getCurrentPlayerCount")); - mInitMap.put(new Pair<String, String>("func_72395_o", "getViewDistance")); - mInitMap.put(new Pair<String, String>("func_72417_t", "loadOpsList")); - mInitMap.put(new Pair<String, String>("func_72418_v", "readWhiteList")); - mInitMap.put(new Pair<String, String>("func_72419_u", "saveOpsList")); - mInitMap.put(new Pair<String, String>("func_72421_w", "saveWhiteList")); - mInitMap.put(new Pair<String, String>("func_72429_b", "getIntermediateWithXValue")); - mInitMap.put(new Pair<String, String>("func_72430_b", "dotProduct")); - mInitMap.put(new Pair<String, String>("func_72431_c", "crossProduct")); - mInitMap.put(new Pair<String, String>("func_72432_b", "normalize")); - mInitMap.put(new Pair<String, String>("func_72433_c", "lengthVector")); - mInitMap.put(new Pair<String, String>("func_72434_d", "getIntermediateWithZValue")); - mInitMap.put(new Pair<String, String>("func_72435_c", "getIntermediateWithYValue")); - mInitMap.put(new Pair<String, String>("func_72436_e", "squareDistanceTo")); - mInitMap.put(new Pair<String, String>("func_72438_d", "distanceTo")); - mInitMap.put(new Pair<String, String>("func_72439_b", "setComponents")); - mInitMap.put(new Pair<String, String>("func_72440_a", "rotateAroundX")); - mInitMap.put(new Pair<String, String>("func_72441_c", "addVector")); - mInitMap.put(new Pair<String, String>("func_72442_b", "rotateAroundY")); - mInitMap.put(new Pair<String, String>("func_72443_a", "createVectorHelper")); - mInitMap.put(new Pair<String, String>("func_72444_a", "subtract")); - mInitMap.put(new Pair<String, String>("func_72445_d", "squareDistanceTo")); - mInitMap.put(new Pair<String, String>("func_72446_c", "rotateAroundZ")); - mInitMap.put(new Pair<String, String>("func_72591_c", "getRequestId")); - mInitMap.put(new Pair<String, String>("func_72592_a", "getRandomChallenge")); - mInitMap.put(new Pair<String, String>("func_72593_a", "hasExpired")); - mInitMap.put(new Pair<String, String>("func_72594_b", "getChallengeValue")); - mInitMap.put(new Pair<String, String>("func_72601_a", "registerSocket")); - mInitMap.put(new Pair<String, String>("func_72602_a", "startThread")); - mInitMap.put(new Pair<String, String>("func_72603_d", "getNumberOfPlayers")); - mInitMap.put(new Pair<String, String>("func_72604_a", "closeSocket")); - mInitMap.put(new Pair<String, String>("func_72605_a", "closeServerSocket_do")); - mInitMap.put(new Pair<String, String>("func_72606_c", "logWarning")); - mInitMap.put(new Pair<String, String>("func_72607_a", "logDebug")); - mInitMap.put(new Pair<String, String>("func_72608_b", "closeServerSocket")); - mInitMap.put(new Pair<String, String>("func_72609_b", "logInfo")); - mInitMap.put(new Pair<String, String>("func_72610_d", "logSevere")); - mInitMap.put(new Pair<String, String>("func_72611_e", "closeAllSockets")); - mInitMap.put(new Pair<String, String>("func_72612_a", "closeAllSockets_do")); - mInitMap.put(new Pair<String, String>("func_72613_c", "isRunning")); - mInitMap.put(new Pair<String, String>("func_72620_a", "sendResponsePacket")); - mInitMap.put(new Pair<String, String>("func_72621_a", "parseIncomingPacket")); - mInitMap.put(new Pair<String, String>("func_72622_d", "sendAuthChallenge")); - mInitMap.put(new Pair<String, String>("func_72623_a", "stopWithException")); - mInitMap.put(new Pair<String, String>("func_72624_b", "createQueryResponse")); - mInitMap.put(new Pair<String, String>("func_72625_a", "getRequestID")); - mInitMap.put(new Pair<String, String>("func_72626_g", "initQuerySystem")); - mInitMap.put(new Pair<String, String>("func_72627_c", "verifyClientAuth")); - mInitMap.put(new Pair<String, String>("func_72628_f", "cleanQueryClientsMap")); - mInitMap.put(new Pair<String, String>("func_72645_g", "cleanClientThreadsMap")); - mInitMap.put(new Pair<String, String>("func_72646_f", "initClientThreadList")); - mInitMap.put(new Pair<String, String>("func_72653_g", "closeSocket")); - mInitMap.put(new Pair<String, String>("func_72654_a", "sendResponse")); - mInitMap.put(new Pair<String, String>("func_72655_a", "sendMultipacketResponse")); - mInitMap.put(new Pair<String, String>("func_72656_f", "sendLoginFailedResponse")); - mInitMap.put(new Pair<String, String>("func_72661_a", "getBytesAsString")); - mInitMap.put(new Pair<String, String>("func_72662_b", "getRemainingBytesAsLEInt")); - mInitMap.put(new Pair<String, String>("func_72663_a", "getByteAsHexString")); - mInitMap.put(new Pair<String, String>("func_72664_c", "getBytesAsBEint")); - mInitMap.put(new Pair<String, String>("func_72665_b", "getBytesAsLEInt")); - mInitMap.put(new Pair<String, String>("func_72667_a", "writeInt")); - mInitMap.put(new Pair<String, String>("func_72668_a", "writeShort")); - mInitMap.put(new Pair<String, String>("func_72669_b", "reset")); - mInitMap.put(new Pair<String, String>("func_72670_a", "writeByteArray")); - mInitMap.put(new Pair<String, String>("func_72671_a", "writeString")); - mInitMap.put(new Pair<String, String>("func_72672_a", "toByteArray")); - mInitMap.put(new Pair<String, String>("func_72683_a", "addPlayer")); - mInitMap.put(new Pair<String, String>("func_72684_a", "overlaps")); - mInitMap.put(new Pair<String, String>("func_72685_d", "updateMountedMovingPlayer")); - mInitMap.put(new Pair<String, String>("func_72686_a", "getFurthestViewableBlock")); - mInitMap.put(new Pair<String, String>("func_72688_a", "getMinecraftServer")); - mInitMap.put(new Pair<String, String>("func_72690_a", "getPlayerInstance")); - mInitMap.put(new Pair<String, String>("func_72691_b", "filterChunkLoadQueue")); - mInitMap.put(new Pair<String, String>("func_72693_b", "updatePlayerInstances")); - mInitMap.put(new Pair<String, String>("func_72694_a", "isPlayerWatchingChunk")); - mInitMap.put(new Pair<String, String>("func_72695_c", "removePlayer")); - mInitMap.put(new Pair<String, String>("func_72702_a", "playRecord")); - mInitMap.put(new Pair<String, String>("func_72703_a", "onEntityCreate")); - mInitMap.put(new Pair<String, String>("func_72704_a", "playSound")); - mInitMap.put(new Pair<String, String>("func_72706_a", "playAuxSFX")); - mInitMap.put(new Pair<String, String>("func_72708_a", "spawnParticle")); - mInitMap.put(new Pair<String, String>("func_72709_b", "onEntityDestroy")); - mInitMap.put(new Pair<String, String>("func_72712_a", "loadRenderers")); - mInitMap.put(new Pair<String, String>("func_72714_a", "renderSky")); - mInitMap.put(new Pair<String, String>("func_72716_a", "updateRenderers")); - mInitMap.put(new Pair<String, String>("func_72717_a", "drawBlockDamageTexture")); - mInitMap.put(new Pair<String, String>("func_72718_b", "renderClouds")); - mInitMap.put(new Pair<String, String>("func_72719_a", "sortAndRender")); - mInitMap.put(new Pair<String, String>("func_72720_a", "checkOcclusionQueryResult")); - mInitMap.put(new Pair<String, String>("func_72721_a", "hasCloudFog")); - mInitMap.put(new Pair<String, String>("func_72722_c", "markRenderersFormInitMap.put(newPosition")); - mInitMap.put(new Pair<String, String>("func_72723_d", "getDebugInfoEntities")); - mInitMap.put(new Pair<String, String>("func_72724_a", "renderSortedRenderers")); - mInitMap.put(new Pair<String, String>("func_72725_b", "markBlocksForUpdate")); - mInitMap.put(new Pair<String, String>("func_72726_b", "doSpawnParticle")); - mInitMap.put(new Pair<String, String>("func_72728_f", "deleteAllDisplayLists")); - mInitMap.put(new Pair<String, String>("func_72729_a", "clipRenderersByFrustum")); - mInitMap.put(new Pair<String, String>("func_72730_g", "renderStars")); - mInitMap.put(new Pair<String, String>("func_72731_b", "drawSelectionBox")); - mInitMap.put(new Pair<String, String>("func_72732_a", "setWorldAndLoadRenderers")); - mInitMap.put(new Pair<String, String>("func_72733_a", "renderAllRenderLists")); - mInitMap.put(new Pair<String, String>("func_72734_e", "updateClouds")); - mInitMap.put(new Pair<String, String>("func_72735_c", "getDebugInfoRenders")); - mInitMap.put(new Pair<String, String>("func_72736_c", "renderCloudsFancy")); - mInitMap.put(new Pair<String, String>("func_72785_a", "addEntityToTracker")); - mInitMap.put(new Pair<String, String>("func_72786_a", "trackEntity")); - mInitMap.put(new Pair<String, String>("func_72787_a", "removePlayerFromTrackers")); - mInitMap.put(new Pair<String, String>("func_72788_a", "updateTrackedEntities")); - mInitMap.put(new Pair<String, String>("func_72790_b", "untrackEntity")); - mInitMap.put(new Pair<String, String>("func_72791_a", "trackEntity")); - mInitMap.put(new Pair<String, String>("func_72800_K", "getHeight")); - mInitMap.put(new Pair<String, String>("func_72801_o", "getLightBrightness")); - mInitMap.put(new Pair<String, String>("func_72802_i", "getLightBrightnessForSkyBlocks")); - mInitMap.put(new Pair<String, String>("func_72805_g", "getBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_72806_N", "extendedLevelsInChunkCache")); - mInitMap.put(new Pair<String, String>("func_72807_a", "getBiomeGenForCoords")); - mInitMap.put(new Pair<String, String>("func_72810_a", "getSkyBlockTypeBrightness")); - mInitMap.put(new Pair<String, String>("func_72812_b", "getSpecialBlockBrightness")); - mInitMap.put(new Pair<String, String>("func_72819_i", "getWeightedThunderStrength")); - mInitMap.put(new Pair<String, String>("func_72820_D", "getWorldTime")); - mInitMap.put(new Pair<String, String>("func_72823_a", "setItemData")); - mInitMap.put(new Pair<String, String>("func_72824_f", "getCloudColour")); - mInitMap.put(new Pair<String, String>("func_72825_h", "getTopSolidOrLiquidBlock")); - mInitMap.put(new Pair<String, String>("func_72826_c", "getCelestialAngle")); - mInitMap.put(new Pair<String, String>("func_72827_u", "getProviderName")); - mInitMap.put(new Pair<String, String>("func_72828_b", "unloadEntities")); - mInitMap.put(new Pair<String, String>("func_72829_c", "checkBlockCollision")); - mInitMap.put(new Pair<String, String>("func_72830_b", "isAABBInMaterial")); - mInitMap.put(new Pair<String, String>("func_72833_a", "getSkyColor")); - mInitMap.put(new Pair<String, String>("func_72834_c", "canBlockFreeze")); - mInitMap.put(new Pair<String, String>("func_72835_b", "tick")); - mInitMap.put(new Pair<String, String>("func_72838_d", "spawnEntityInWorld")); - mInitMap.put(new Pair<String, String>("func_72839_b", "getEntitiesWithinAABBExcludingEntity")); - mInitMap.put(new Pair<String, String>("func_72841_b", "getUniqueDataId")); - mInitMap.put(new Pair<String, String>("func_72842_a", "getBlockDensity")); - mInitMap.put(new Pair<String, String>("func_72843_D", "setRandomSeed")); - mInitMap.put(new Pair<String, String>("func_72844_a", "getEntityPathToXYZ")); - mInitMap.put(new Pair<String, String>("func_72846_b", "getClosestVulnerablePlayer")); - mInitMap.put(new Pair<String, String>("func_72847_b", "onEntityRemoved")); - mInitMap.put(new Pair<String, String>("func_72848_b", "removeWorldAccess")); - mInitMap.put(new Pair<String, String>("func_72849_a", "getBlockLightValue_do")); - mInitMap.put(new Pair<String, String>("func_72850_v", "isBlockFreezableNaturally")); - mInitMap.put(new Pair<String, String>("func_72853_d", "getMoonPhase")); - mInitMap.put(new Pair<String, String>("func_72854_c", "updateAllPlayersSleepingFlag")); - mInitMap.put(new Pair<String, String>("func_72855_b", "checkNoEntityCollision")); - mInitMap.put(new Pair<String, String>("func_72856_b", "getClosestVulnerablePlayerToEntity")); - mInitMap.put(new Pair<String, String>("func_72857_a", "findNearestEntityWithinAABB")); - mInitMap.put(new Pair<String, String>("func_72860_G", "getSaveHandler")); - mInitMap.put(new Pair<String, String>("func_72861_E", "getSpawnPoint")); - mInitMap.put(new Pair<String, String>("func_72863_F", "getChunkProvider")); - mInitMap.put(new Pair<String, String>("func_72864_z", "isBlockIndirectlyGettingPowered")); - mInitMap.put(new Pair<String, String>("func_72865_a", "getPathEntityToEntity")); - mInitMap.put(new Pair<String, String>("func_72866_a", "updateEntityWithOptionalForce")); - mInitMap.put(new Pair<String, String>("func_72867_j", "getRainStrength")); - mInitMap.put(new Pair<String, String>("func_72868_a", "addLoadedEntities")); - mInitMap.put(new Pair<String, String>("func_72869_a", "spawnParticle")); - mInitMap.put(new Pair<String, String>("func_72870_g", "updateEntity")); - mInitMap.put(new Pair<String, String>("func_72872_a", "getEntitiesWithinAABB")); - mInitMap.put(new Pair<String, String>("func_72873_a", "doChunksNearChunkExist")); - mInitMap.put(new Pair<String, String>("func_72874_g", "getPrecipitationHeight")); - mInitMap.put(new Pair<String, String>("func_72875_a", "isMaterialInBB")); - mInitMap.put(new Pair<String, String>("func_72876_a", "createExplosion")); - mInitMap.put(new Pair<String, String>("func_72877_b", "setWorldTime")); - mInitMap.put(new Pair<String, String>("func_72878_l", "getIndirectPowerLevelTo")); - mInitMap.put(new Pair<String, String>("func_72879_k", "isBlockProvidingPowerTo")); - mInitMap.put(new Pair<String, String>("func_72880_h", "getStarBrightness")); - mInitMap.put(new Pair<String, String>("func_72882_A", "sendQuittingDisconnectingPacket")); - mInitMap.put(new Pair<String, String>("func_72883_k", "getFullBlockLightValue")); - mInitMap.put(new Pair<String, String>("func_72884_u", "isBlockFreezable")); - mInitMap.put(new Pair<String, String>("func_72885_a", "mInitMap.put(newExplosion")); - mInitMap.put(new Pair<String, String>("func_72886_a", "extinguishFire")); - mInitMap.put(new Pair<String, String>("func_72889_a", "playAuxSFXAtEntity")); - mInitMap.put(new Pair<String, String>("func_72890_a", "getClosestPlayerToEntity")); - mInitMap.put(new Pair<String, String>("func_72891_a", "setAllowedSpawnTypes")); - mInitMap.put(new Pair<String, String>("func_72894_k", "setRainStrength")); - mInitMap.put(new Pair<String, String>("func_72896_J", "isRaining")); - mInitMap.put(new Pair<String, String>("func_72897_h", "joinEntityInSurroundings")); - mInitMap.put(new Pair<String, String>("func_72899_e", "blockExists")); - mInitMap.put(new Pair<String, String>("func_72900_e", "removeEntity")); - mInitMap.put(new Pair<String, String>("func_72901_a", "rayTraceBlocks")); - mInitMap.put(new Pair<String, String>("func_72903_x", "setActivePlayerChunksAndCheckLight")); - mInitMap.put(new Pair<String, String>("func_72904_c", "checkChunksExist")); - mInitMap.put(new Pair<String, String>("func_72905_C", "getSeed")); - mInitMap.put(new Pair<String, String>("func_72906_B", "checkSessionLock")); - mInitMap.put(new Pair<String, String>("func_72907_a", "countEntities")); - mInitMap.put(new Pair<String, String>("func_72908_a", "playSoundEffect")); - mInitMap.put(new Pair<String, String>("func_72910_y", "getLoadedEntityList")); - mInitMap.put(new Pair<String, String>("func_72911_I", "isThundering")); - mInitMap.put(new Pair<String, String>("func_72912_H", "getWorldInfo")); - mInitMap.put(new Pair<String, String>("func_72914_a", "addWorldInfoToCrashReport")); - mInitMap.put(new Pair<String, String>("func_72915_b", "setLightValue")); - mInitMap.put(new Pair<String, String>("func_72916_c", "chunkExists")); - mInitMap.put(new Pair<String, String>("func_72917_a", "checkNoEntityCollision")); - mInitMap.put(new Pair<String, String>("func_72918_a", "handleMaterialAcceleration")); - mInitMap.put(new Pair<String, String>("func_72919_O", "getHorizon")); - mInitMap.put(new Pair<String, String>("func_72920_a", "getPendingBlockUpdates")); - mInitMap.put(new Pair<String, String>("func_72921_c", "setBlockMetadataWithNotify")); - mInitMap.put(new Pair<String, String>("func_72923_a", "onEntityAdded")); - mInitMap.put(new Pair<String, String>("func_72924_a", "getPlayerEntityByName")); - mInitMap.put(new Pair<String, String>("func_72925_a", "getSkyBlockTypeBrightness")); - mInitMap.put(new Pair<String, String>("func_72926_e", "playAuxSFX")); - mInitMap.put(new Pair<String, String>("func_72929_e", "getCelestialAngleRadians")); - mInitMap.put(new Pair<String, String>("func_72933_a", "rayTraceBlocks")); - mInitMap.put(new Pair<String, String>("func_72934_a", "playRecord")); - mInitMap.put(new Pair<String, String>("func_72935_r", "isDaytime")); - mInitMap.put(new Pair<String, String>("func_72937_j", "canBlockSeeTheSky")); - mInitMap.put(new Pair<String, String>("func_72938_d", "getChunkFromBlockCoords")); - mInitMap.put(new Pair<String, String>("func_72939_s", "updateEntities")); - mInitMap.put(new Pair<String, String>("func_72940_L", "getActualHeight")); - mInitMap.put(new Pair<String, String>("func_72942_c", "addWeatherEffect")); - mInitMap.put(new Pair<String, String>("func_72943_a", "loadItemData")); - mInitMap.put(new Pair<String, String>("func_72945_a", "getCollidingBoundingBoxes")); - mInitMap.put(new Pair<String, String>("func_72947_a", "calculateInitialWeather")); - mInitMap.put(new Pair<String, String>("func_72948_g", "getFogColor")); - mInitMap.put(new Pair<String, String>("func_72950_A", "setSpawnLocation")); - mInitMap.put(new Pair<String, String>("func_72951_B", "isRainingAt")); - mInitMap.put(new Pair<String, String>("func_72953_d", "isAnyLiquid")); - mInitMap.put(new Pair<String, String>("func_72954_a", "addWorldAccess")); - mInitMap.put(new Pair<String, String>("func_72955_a", "tickUpdates")); - mInitMap.put(new Pair<String, String>("func_72956_a", "playSoundAtEntity")); - mInitMap.put(new Pair<String, String>("func_72957_l", "getBlockLightValue")); - mInitMap.put(new Pair<String, String>("func_72958_C", "isBlockHighHumidity")); - mInitMap.put(new Pair<String, String>("func_72959_q", "getWorldChunkManager")); - mInitMap.put(new Pair<String, String>("func_72960_a", "setEntityState")); - mInitMap.put(new Pair<String, String>("func_72962_a", "canMineBlock")); - mInitMap.put(new Pair<String, String>("func_72963_a", "initialize")); - mInitMap.put(new Pair<String, String>("func_72964_e", "getChunkFromChunkCoords")); - mInitMap.put(new Pair<String, String>("func_72966_v", "calculateInitialSkylight")); - mInitMap.put(new Pair<String, String>("func_72967_a", "calculateSkylightSubtracted")); - mInitMap.put(new Pair<String, String>("func_72970_h", "createChunkProvider")); - mInitMap.put(new Pair<String, String>("func_72971_b", "getSunBrightness")); - mInitMap.put(new Pair<String, String>("func_72972_b", "getSavedLightValue")); - mInitMap.put(new Pair<String, String>("func_72973_f", "removePlayerEntityDangerously")); - mInitMap.put(new Pair<String, String>("func_72974_f", "setSpawnLocation")); - mInitMap.put(new Pair<String, String>("func_72975_g", "markBlocksDirtyVertical")); - mInitMap.put(new Pair<String, String>("func_72976_f", "getHeightValue")); - mInitMap.put(new Pair<String, String>("func_72977_a", "getClosestPlayer")); - mInitMap.put(new Pair<String, String>("func_72979_l", "updateWeather")); - mInitMap.put(new Pair<String, String>("func_72980_b", "playSound")); - mInitMap.put(new Pair<String, String>("func_72981_t", "getDebugLoadedEntities")); - mInitMap.put(new Pair<String, String>("func_73022_a", "removeAllEntities")); - mInitMap.put(new Pair<String, String>("func_73025_a", "doPreChunk")); - mInitMap.put(new Pair<String, String>("func_73027_a", "addEntityToWorld")); - mInitMap.put(new Pair<String, String>("func_73028_b", "removeEntityFromWorld")); - mInitMap.put(new Pair<String, String>("func_73029_E", "doVoidFogParticles")); - mInitMap.put(new Pair<String, String>("func_73031_a", "invalidateBlockReceiveRegion")); - mInitMap.put(new Pair<String, String>("func_73039_n", "getEntityTracker")); - mInitMap.put(new Pair<String, String>("func_73040_p", "getPlayerManager")); - mInitMap.put(new Pair<String, String>("func_73041_k", "flush")); - mInitMap.put(new Pair<String, String>("func_73042_a", "saveLevel")); - mInitMap.put(new Pair<String, String>("func_73044_a", "saveAllChunks")); - mInitMap.put(new Pair<String, String>("func_73045_a", "getEntityByID")); - mInitMap.put(new Pair<String, String>("func_73047_i", "createBonusChest")); - mInitMap.put(new Pair<String, String>("func_73051_P", "resetRainAndThunder")); - mInitMap.put(new Pair<String, String>("func_73052_b", "createSpawnPosition")); - mInitMap.put(new Pair<String, String>("func_73053_d", "wakeAllPlayers")); - mInitMap.put(new Pair<String, String>("func_73054_j", "getEntrancePortalLocation")); - mInitMap.put(new Pair<String, String>("func_73056_e", "areAllPlayersAsleep")); - mInitMap.put(new Pair<String, String>("func_73057_a", "spawnRandomCreature")); - mInitMap.put(new Pair<String, String>("func_73073_c", "cancelDestroyingBlock")); - mInitMap.put(new Pair<String, String>("func_73074_a", "onBlockClicked")); - mInitMap.put(new Pair<String, String>("func_73075_a", "updateBlockRemoving")); - mInitMap.put(new Pair<String, String>("func_73076_a", "setGameType")); - mInitMap.put(new Pair<String, String>("func_73077_b", "initializeGameType")); - mInitMap.put(new Pair<String, String>("func_73078_a", "activateBlockOrUseItem")); - mInitMap.put(new Pair<String, String>("func_73079_d", "removeBlock")); - mInitMap.put(new Pair<String, String>("func_73080_a", "setWorld")); - mInitMap.put(new Pair<String, String>("func_73081_b", "getGameType")); - mInitMap.put(new Pair<String, String>("func_73082_a", "blockRemoving")); - mInitMap.put(new Pair<String, String>("func_73083_d", "isCreative")); - mInitMap.put(new Pair<String, String>("func_73084_b", "tryHarvestBlock")); - mInitMap.put(new Pair<String, String>("func_73085_a", "tryUseItem")); - mInitMap.put(new Pair<String, String>("func_73101_e", "sendDemoReminder")); - mInitMap.put(new Pair<String, String>("func_73106_e", "getPartialBlockDamage")); - mInitMap.put(new Pair<String, String>("func_73107_a", "setPartialBlockDamage")); - mInitMap.put(new Pair<String, String>("func_73108_d", "getPartialBlockZ")); - mInitMap.put(new Pair<String, String>("func_73109_c", "getPartialBlockY")); - mInitMap.put(new Pair<String, String>("func_73110_b", "getPartialBlockX")); - mInitMap.put(new Pair<String, String>("func_73117_b", "updatePlayerEntity")); - mInitMap.put(new Pair<String, String>("func_73118_a", "removeFromTrackedPlayers")); - mInitMap.put(new Pair<String, String>("func_73119_a", "sendDestroyEntityPacketToTrackedPlayers")); - mInitMap.put(new Pair<String, String>("func_73121_d", "isPlayerWatchingThisChunk")); - mInitMap.put(new Pair<String, String>("func_73122_a", "updatePlayerList")); - mInitMap.put(new Pair<String, String>("func_73123_c", "removeTrackedPlayerSymmetric")); - mInitMap.put(new Pair<String, String>("func_73125_b", "updatePlayerEntities")); - mInitMap.put(new Pair<String, String>("func_73148_d", "makeString")); - mInitMap.put(new Pair<String, String>("func_73149_a", "chunkExists")); - mInitMap.put(new Pair<String, String>("func_73151_a", "saveChunks")); - mInitMap.put(new Pair<String, String>("func_73152_e", "getLoadedChunkCount")); - mInitMap.put(new Pair<String, String>("func_73153_a", "populate")); - mInitMap.put(new Pair<String, String>("func_73154_d", "provideChunk")); - mInitMap.put(new Pair<String, String>("func_73155_a", "getPossibleCreatures")); - mInitMap.put(new Pair<String, String>("func_73156_b", "unloadQueuedChunks")); - mInitMap.put(new Pair<String, String>("func_73157_c", "canSave")); - mInitMap.put(new Pair<String, String>("func_73158_c", "loadChunk")); - mInitMap.put(new Pair<String, String>("func_73164_a", "initializeNoiseField")); - mInitMap.put(new Pair<String, String>("func_73187_a", "initializeNoiseField")); - mInitMap.put(new Pair<String, String>("func_73234_b", "unloadChunk")); - mInitMap.put(new Pair<String, String>("func_73239_e", "loadChunkFromFile")); - mInitMap.put(new Pair<String, String>("func_73240_a", "unloadAllChunks")); - mInitMap.put(new Pair<String, String>("func_73241_b", "dropChunk")); - mInitMap.put(new Pair<String, String>("func_73242_b", "saveChunkData")); - mInitMap.put(new Pair<String, String>("func_73243_a", "saveChunkExtraData")); - mInitMap.put(new Pair<String, String>("func_73252_b", "removePlayer")); - mInitMap.put(new Pair<String, String>("func_73254_a", "onUpdate")); - mInitMap.put(new Pair<String, String>("func_73255_a", "addPlayer")); - mInitMap.put(new Pair<String, String>("func_73660_a", "update")); - mInitMap.put(new Pair<String, String>("func_73665_c", "getPropertiesFile")); - mInitMap.put(new Pair<String, String>("func_73666_a", "generatemInitMap.put(newProperties")); - mInitMap.put(new Pair<String, String>("func_73667_a", "setProperty")); - mInitMap.put(new Pair<String, String>("func_73668_b", "saveProperties")); - mInitMap.put(new Pair<String, String>("func_73669_a", "getIntProperty")); - mInitMap.put(new Pair<String, String>("func_73670_a", "getBooleanProperty")); - mInitMap.put(new Pair<String, String>("func_73671_a", "getStringProperty")); - mInitMap.put(new Pair<String, String>("func_73680_d", "getBanEndDate")); - mInitMap.put(new Pair<String, String>("func_73682_e", "hasBanExpired")); - mInitMap.put(new Pair<String, String>("func_73686_f", "getBanReason")); - mInitMap.put(new Pair<String, String>("func_73718_a", "setLoadingProgress")); - mInitMap.put(new Pair<String, String>("func_73719_c", "displayLoadingString")); - mInitMap.put(new Pair<String, String>("func_73720_a", "displaySavingString")); - mInitMap.put(new Pair<String, String>("func_73721_b", "resetProgressAndMessage")); - mInitMap.put(new Pair<String, String>("func_73728_b", "drawVerticalLine")); - mInitMap.put(new Pair<String, String>("func_73729_b", "drawTexturedModalRect")); - mInitMap.put(new Pair<String, String>("func_73730_a", "drawHorizontalLine")); - mInitMap.put(new Pair<String, String>("func_73731_b", "drawString")); - mInitMap.put(new Pair<String, String>("func_73732_a", "drawCenteredString")); - mInitMap.put(new Pair<String, String>("func_73733_a", "drawGradientRect")); - mInitMap.put(new Pair<String, String>("func_73734_a", "drawRect")); - mInitMap.put(new Pair<String, String>("func_73828_d", "renderBossHealth")); - mInitMap.put(new Pair<String, String>("func_73829_a", "renderVignette")); - mInitMap.put(new Pair<String, String>("func_73830_a", "renderGameOverlay")); - mInitMap.put(new Pair<String, String>("func_73831_a", "updateTick")); - mInitMap.put(new Pair<String, String>("func_73832_a", "renderInventorySlot")); - mInitMap.put(new Pair<String, String>("func_73833_a", "setRecordPlayingMessage")); - mInitMap.put(new Pair<String, String>("func_73834_c", "getUpdateCounter")); - mInitMap.put(new Pair<String, String>("func_73836_a", "renderPumpkinBlur")); - mInitMap.put(new Pair<String, String>("func_73863_a", "drawScreen")); - mInitMap.put(new Pair<String, String>("func_73864_a", "mouseClicked")); - mInitMap.put(new Pair<String, String>("func_73866_w_", "initGui")); - mInitMap.put(new Pair<String, String>("func_73868_f", "doesGuiPauseGame")); - mInitMap.put(new Pair<String, String>("func_73869_a", "keyTyped")); - mInitMap.put(new Pair<String, String>("func_73876_c", "updateScreen")); - mInitMap.put(new Pair<String, String>("func_73878_a", "confirmClicked")); - mInitMap.put(new Pair<String, String>("func_73968_a", "rotateAndBlurSkybox")); - mInitMap.put(new Pair<String, String>("func_73969_a", "addSingleplayerMultiplayerButtons")); - mInitMap.put(new Pair<String, String>("func_73970_b", "drawPanorama")); - mInitMap.put(new Pair<String, String>("func_73971_c", "renderSkybox")); - mInitMap.put(new Pair<String, String>("func_73972_b", "addDemoButtons")); - mInitMap.put(new Pair<String, String>("func_74275_a", "updateTimer")); - mInitMap.put(new Pair<String, String>("func_74290_a", "getTimestampedPNGFileForDirectory")); - mInitMap.put(new Pair<String, String>("func_74296_a", "getOptionFloatValue")); - mInitMap.put(new Pair<String, String>("func_74297_c", "getKeyBinding")); - mInitMap.put(new Pair<String, String>("func_74298_c", "getKeyDisplayString")); - mInitMap.put(new Pair<String, String>("func_74299_a", "getTranslation")); - mInitMap.put(new Pair<String, String>("func_74300_a", "loadOptions")); - mInitMap.put(new Pair<String, String>("func_74303_b", "saveOptions")); - mInitMap.put(new Pair<String, String>("func_74304_a", "setOptionFloatValue")); - mInitMap.put(new Pair<String, String>("func_74305_a", "parseFloat")); - mInitMap.put(new Pair<String, String>("func_74306_a", "setOptionValue")); - mInitMap.put(new Pair<String, String>("func_74308_b", "getOptionOrdinalValue")); - mInitMap.put(new Pair<String, String>("func_74309_c", "shouldRenderClouds")); - mInitMap.put(new Pair<String, String>("func_74371_a", "checkARBOcclusion")); - mInitMap.put(new Pair<String, String>("func_74372_a", "grabMouseCursor")); - mInitMap.put(new Pair<String, String>("func_74373_b", "ungrabMouseCursor")); - mInitMap.put(new Pair<String, String>("func_74374_c", "mouseXYChange")); - mInitMap.put(new Pair<String, String>("func_74378_d", "getEnumString")); - mInitMap.put(new Pair<String, String>("func_74379_a", "getEnumOptions")); - mInitMap.put(new Pair<String, String>("func_74380_a", "getEnumFloat")); - mInitMap.put(new Pair<String, String>("func_74381_c", "returnEnumOrdinal")); - mInitMap.put(new Pair<String, String>("func_74382_b", "getEnumBoolean")); - mInitMap.put(new Pair<String, String>("func_74428_b", "processReceivedPackets")); - mInitMap.put(new Pair<String, String>("func_74430_c", "getRemoteAddress")); - mInitMap.put(new Pair<String, String>("func_74505_d", "unpressKey")); - mInitMap.put(new Pair<String, String>("func_74506_a", "unPressAllKeys")); - mInitMap.put(new Pair<String, String>("func_74507_a", "onTick")); - mInitMap.put(new Pair<String, String>("func_74508_b", "resetKeyBindingArrayAndHash")); - mInitMap.put(new Pair<String, String>("func_74510_a", "setKeyBindState")); - mInitMap.put(new Pair<String, String>("func_74517_a", "setColorBuffer")); - mInitMap.put(new Pair<String, String>("func_74518_a", "disableStandardItemLighting")); - mInitMap.put(new Pair<String, String>("func_74519_b", "enableStandardItemLighting")); - mInitMap.put(new Pair<String, String>("func_74520_c", "enableGUIStandardItemLighting")); - mInitMap.put(new Pair<String, String>("func_74521_a", "setColorBuffer")); - mInitMap.put(new Pair<String, String>("func_74523_b", "deleteDisplayLists")); - mInitMap.put(new Pair<String, String>("func_74524_c", "createDirectByteBuffer")); - mInitMap.put(new Pair<String, String>("func_74525_a", "deleteTexturesAndDisplayLists")); - mInitMap.put(new Pair<String, String>("func_74526_a", "generateDisplayLists")); - mInitMap.put(new Pair<String, String>("func_74527_f", "createDirectIntBuffer")); - mInitMap.put(new Pair<String, String>("func_74529_h", "createDirectFloatBuffer")); - mInitMap.put(new Pair<String, String>("func_74535_a", "formatString")); - mInitMap.put(new Pair<String, String>("func_74539_c", "getChatLineID")); - mInitMap.put(new Pair<String, String>("func_74540_b", "getUpdatedCounter")); - mInitMap.put(new Pair<String, String>("func_74583_a", "updateRenderInfo")); - mInitMap.put(new Pair<String, String>("func_74585_b", "projectViewFromEntity")); - mInitMap.put(new Pair<String, String>("func_74732_a", "getId")); - mInitMap.put(new Pair<String, String>("func_74734_a", "write")); - mInitMap.put(new Pair<String, String>("func_74737_b", "copy")); - mInitMap.put(new Pair<String, String>("func_74742_a", "appendTag")); - mInitMap.put(new Pair<String, String>("func_74744_a", "removeTag")); - mInitMap.put(new Pair<String, String>("func_74745_c", "tagCount")); - mInitMap.put(new Pair<String, String>("func_74757_a", "setBoolean")); - mInitMap.put(new Pair<String, String>("func_74759_k", "getIntArray")); - mInitMap.put(new Pair<String, String>("func_74760_g", "getFloat")); - mInitMap.put(new Pair<String, String>("func_74762_e", "getInteger")); - mInitMap.put(new Pair<String, String>("func_74763_f", "getLong")); - mInitMap.put(new Pair<String, String>("func_74764_b", "hasKey")); - mInitMap.put(new Pair<String, String>("func_74765_d", "getShort")); - mInitMap.put(new Pair<String, String>("func_74767_n", "getBoolean")); - mInitMap.put(new Pair<String, String>("func_74768_a", "setInteger")); - mInitMap.put(new Pair<String, String>("func_74769_h", "getDouble")); - mInitMap.put(new Pair<String, String>("func_74770_j", "getByteArray")); - mInitMap.put(new Pair<String, String>("func_74771_c", "getByte")); - mInitMap.put(new Pair<String, String>("func_74772_a", "setLong")); - mInitMap.put(new Pair<String, String>("func_74773_a", "setByteArray")); - mInitMap.put(new Pair<String, String>("func_74774_a", "setByte")); - mInitMap.put(new Pair<String, String>("func_74775_l", "getCompoundTag")); - mInitMap.put(new Pair<String, String>("func_74776_a", "setFloat")); - mInitMap.put(new Pair<String, String>("func_74777_a", "setShort")); - mInitMap.put(new Pair<String, String>("func_74778_a", "setString")); - mInitMap.put(new Pair<String, String>("func_74779_i", "getString")); - mInitMap.put(new Pair<String, String>("func_74780_a", "setDouble")); - mInitMap.put(new Pair<String, String>("func_74781_a", "getTag")); - mInitMap.put(new Pair<String, String>("func_74782_a", "setTag")); - mInitMap.put(new Pair<String, String>("func_74783_a", "setIntArray")); - mInitMap.put(new Pair<String, String>("func_74793_a", "safeWrite")); - mInitMap.put(new Pair<String, String>("func_74794_a", "read")); - mInitMap.put(new Pair<String, String>("func_74795_b", "write")); - mInitMap.put(new Pair<String, String>("func_74796_a", "readCompressed")); - mInitMap.put(new Pair<String, String>("func_74797_a", "read")); - mInitMap.put(new Pair<String, String>("func_74798_a", "compress")); - mInitMap.put(new Pair<String, String>("func_74799_a", "writeCompressed")); - mInitMap.put(new Pair<String, String>("func_74800_a", "write")); - mInitMap.put(new Pair<String, String>("func_74803_a", "translateKeyFormat")); - mInitMap.put(new Pair<String, String>("func_74805_b", "translateKey")); - mInitMap.put(new Pair<String, String>("func_74808_a", "getInstance")); - mInitMap.put(new Pair<String, String>("func_74837_a", "translateToLocalFormatted")); - mInitMap.put(new Pair<String, String>("func_74838_a", "translateToLocal")); - mInitMap.put(new Pair<String, String>("func_74844_a", "getErrorOjbects")); - mInitMap.put(new Pair<String, String>("func_74860_a", "isLiquidInStructureBoundingBox")); - mInitMap.put(new Pair<String, String>("func_74861_a", "buildComponent")); - mInitMap.put(new Pair<String, String>("func_74862_a", "getYWithOffset")); - mInitMap.put(new Pair<String, String>("func_74865_a", "getXWithOffset")); - mInitMap.put(new Pair<String, String>("func_74869_a", "generateStructureDispenserContents")); - mInitMap.put(new Pair<String, String>("func_74871_b", "clearCurrentPositionBlocksUpwards")); - mInitMap.put(new Pair<String, String>("func_74873_b", "getZWithOffset")); - mInitMap.put(new Pair<String, String>("func_74874_b", "getBoundingBox")); - mInitMap.put(new Pair<String, String>("func_74875_a", "addComponentParts")); - mInitMap.put(new Pair<String, String>("func_74877_c", "getComponentType")); - mInitMap.put(new Pair<String, String>("func_74878_a", "fillWithAir")); - mInitMap.put(new Pair<String, String>("func_74879_a", "generateStructureChestContents")); - mInitMap.put(new Pair<String, String>("func_74881_a", "placeDoorAtCurrentPosition")); - mInitMap.put(new Pair<String, String>("func_74882_a", "fillWithRandomizedBlocks")); - mInitMap.put(new Pair<String, String>("func_74883_a", "findIntersecting")); - mInitMap.put(new Pair<String, String>("func_74888_b", "getVillagerType")); - mInitMap.put(new Pair<String, String>("func_74889_b", "getAverageGroundLevel")); - mInitMap.put(new Pair<String, String>("func_74891_a", "getNextComponentNN")); - mInitMap.put(new Pair<String, String>("func_74893_a", "spawnVillagers")); - mInitMap.put(new Pair<String, String>("func_74894_b", "getNextComponentPP")); - mInitMap.put(new Pair<String, String>("func_74895_a", "canVillageGoDeeper")); - mInitMap.put(new Pair<String, String>("func_74925_d", "getWorldChunkManager")); - mInitMap.put(new Pair<String, String>("func_74950_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_74951_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_74954_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_74959_a", "getNextComponent")); - mInitMap.put(new Pair<String, String>("func_74960_a", "getTotalWeight")); - mInitMap.put(new Pair<String, String>("func_74961_b", "getNextComponentX")); - mInitMap.put(new Pair<String, String>("func_74962_a", "getNextComponent")); - mInitMap.put(new Pair<String, String>("func_74963_a", "getNextComponentNormal")); - mInitMap.put(new Pair<String, String>("func_74964_a", "isAboveGround")); - mInitMap.put(new Pair<String, String>("func_74965_c", "getNextComponentZ")); - mInitMap.put(new Pair<String, String>("func_74966_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74973_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74974_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74975_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74977_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74978_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74979_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74980_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74981_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74982_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74983_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74984_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74985_a", "createValidComponent")); - mInitMap.put(new Pair<String, String>("func_74986_a", "getNextComponentNormal")); - mInitMap.put(new Pair<String, String>("func_74987_c", "getNextComponentZ")); - mInitMap.put(new Pair<String, String>("func_74988_a", "getRandomDoor")); - mInitMap.put(new Pair<String, String>("func_74989_b", "getNextComponentX")); - mInitMap.put(new Pair<String, String>("func_74990_a", "placeDoor")); - mInitMap.put(new Pair<String, String>("func_74991_a", "canStrongholdGoDeeper")); - mInitMap.put(new Pair<String, String>("func_74994_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75000_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75004_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75006_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75010_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75012_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75016_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75018_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75022_a", "getStrongholdStairsComponent")); - mInitMap.put(new Pair<String, String>("func_75028_a", "findValidPlacement")); - mInitMap.put(new Pair<String, String>("func_75047_a", "canSpawnStructureAtCoords")); - mInitMap.put(new Pair<String, String>("func_75048_a", "hasStructureAt")); - mInitMap.put(new Pair<String, String>("func_75049_b", "getStructureStart")); - mInitMap.put(new Pair<String, String>("func_75051_a", "generateStructuresInChunk")); - mInitMap.put(new Pair<String, String>("func_75052_o_", "getCoordList")); - mInitMap.put(new Pair<String, String>("func_75059_a", "getSpawnList")); - mInitMap.put(new Pair<String, String>("func_75062_a", "selectBlocks")); - mInitMap.put(new Pair<String, String>("func_75064_b", "getSelectedBlockMetaData")); - mInitMap.put(new Pair<String, String>("func_75067_a", "markAvailableHeight")); - mInitMap.put(new Pair<String, String>("func_75068_a", "generateStructure")); - mInitMap.put(new Pair<String, String>("func_75069_d", "isSizeableStructure")); - mInitMap.put(new Pair<String, String>("func_75070_a", "setRandomHeight")); - mInitMap.put(new Pair<String, String>("func_75071_a", "getBoundingBox")); - mInitMap.put(new Pair<String, String>("func_75072_c", "updateBoundingBox")); - mInitMap.put(new Pair<String, String>("func_75073_b", "getComponents")); - mInitMap.put(new Pair<String, String>("func_75077_d", "getNextVillageStructureComponent")); - mInitMap.put(new Pair<String, String>("func_75080_e", "getNextComponentVillagePath")); - mInitMap.put(new Pair<String, String>("func_75081_c", "getNextVillageComponent")); - mInitMap.put(new Pair<String, String>("func_75084_a", "getStructureVillageWeightedPieceList")); - mInitMap.put(new Pair<String, String>("func_75085_a", "canSpawnMoreVillagePiecesOfType")); - mInitMap.put(new Pair<String, String>("func_75086_a", "canSpawnMoreVillagePieces")); - mInitMap.put(new Pair<String, String>("func_75091_a", "writeCapabilitiesToNBT")); - mInitMap.put(new Pair<String, String>("func_75092_a", "setFlySpeed")); - mInitMap.put(new Pair<String, String>("func_75093_a", "getFlySpeed")); - mInitMap.put(new Pair<String, String>("func_75094_b", "getWalkSpeed")); - mInitMap.put(new Pair<String, String>("func_75095_b", "readCapabilitiesFromNBT")); - mInitMap.put(new Pair<String, String>("func_75112_a", "readNBT")); - mInitMap.put(new Pair<String, String>("func_75113_a", "addExhaustion")); - mInitMap.put(new Pair<String, String>("func_75114_a", "setFoodLevel")); - mInitMap.put(new Pair<String, String>("func_75115_e", "getSaturationLevel")); - mInitMap.put(new Pair<String, String>("func_75116_a", "getFoodLevel")); - mInitMap.put(new Pair<String, String>("func_75117_b", "writeNBT")); - mInitMap.put(new Pair<String, String>("func_75118_a", "onUpdate")); - mInitMap.put(new Pair<String, String>("func_75119_b", "setFoodSaturationLevel")); - mInitMap.put(new Pair<String, String>("func_75120_b", "getPrevFoodLevel")); - mInitMap.put(new Pair<String, String>("func_75121_c", "needFood")); - mInitMap.put(new Pair<String, String>("func_75122_a", "addStats")); - mInitMap.put(new Pair<String, String>("func_75128_a", "setCanCraft")); - mInitMap.put(new Pair<String, String>("func_75129_b", "getCanCraft")); - mInitMap.put(new Pair<String, String>("func_75130_a", "onCraftMatrixChanged")); - mInitMap.put(new Pair<String, String>("func_75131_a", "putStacksInSlots")); - mInitMap.put(new Pair<String, String>("func_75132_a", "onCraftGuiOpened")); - mInitMap.put(new Pair<String, String>("func_75133_b", "retrySlotClick")); - mInitMap.put(new Pair<String, String>("func_75134_a", "onContainerClosed")); - mInitMap.put(new Pair<String, String>("func_75135_a", "mergeItemStack")); - mInitMap.put(new Pair<String, String>("func_75136_a", "getNextTransactionID")); - mInitMap.put(new Pair<String, String>("func_75137_b", "updateProgressBar")); - mInitMap.put(new Pair<String, String>("func_75138_a", "getInventory")); - mInitMap.put(new Pair<String, String>("func_75139_a", "getSlot")); - mInitMap.put(new Pair<String, String>("func_75140_a", "enchantItem")); - mInitMap.put(new Pair<String, String>("func_75141_a", "putStackInSlot")); - mInitMap.put(new Pair<String, String>("func_75142_b", "detectAndSendChanges")); - mInitMap.put(new Pair<String, String>("func_75144_a", "slotClick")); - mInitMap.put(new Pair<String, String>("func_75145_c", "canInteractWith")); - mInitMap.put(new Pair<String, String>("func_75146_a", "addSlotToContainer")); - mInitMap.put(new Pair<String, String>("func_75147_a", "getSlotFromInventory")); - mInitMap.put(new Pair<String, String>("func_75174_d", "getMerchantInventory")); - mInitMap.put(new Pair<String, String>("func_75175_c", "setCurrentRecipeIndex")); - mInitMap.put(new Pair<String, String>("func_75189_a", "canSpawnMoreStructuresOfType")); - mInitMap.put(new Pair<String, String>("func_75190_a", "canSpawnMoreStructures")); - mInitMap.put(new Pair<String, String>("func_75196_c", "getNextValidComponent")); - mInitMap.put(new Pair<String, String>("func_75198_a", "prepareStructurePieces")); - mInitMap.put(new Pair<String, String>("func_75200_a", "getStrongholdComponentFromWeightedPiece")); - mInitMap.put(new Pair<String, String>("func_75201_b", "getNextComponent")); - mInitMap.put(new Pair<String, String>("func_75202_c", "canAddStructurePieces")); - mInitMap.put(new Pair<String, String>("func_75208_c", "onCrafting")); - mInitMap.put(new Pair<String, String>("func_75209_a", "decrStackSize")); - mInitMap.put(new Pair<String, String>("func_75210_a", "onCrafting")); - mInitMap.put(new Pair<String, String>("func_75211_c", "getStack")); - mInitMap.put(new Pair<String, String>("func_75212_b", "getBackgroundIconIndex")); - mInitMap.put(new Pair<String, String>("func_75214_a", "isItemValid")); - mInitMap.put(new Pair<String, String>("func_75215_d", "putStack")); - mInitMap.put(new Pair<String, String>("func_75216_d", "getHasStack")); - mInitMap.put(new Pair<String, String>("func_75217_a", "isHere")); - mInitMap.put(new Pair<String, String>("func_75218_e", "onSlotChanged")); - mInitMap.put(new Pair<String, String>("func_75219_a", "getSlotStackLimit")); - mInitMap.put(new Pair<String, String>("func_75220_a", "onSlotChange")); - mInitMap.put(new Pair<String, String>("func_75230_a", "doTrade")); - mInitMap.put(new Pair<String, String>("func_75243_a_", "canHoldPotion")); - mInitMap.put(new Pair<String, String>("func_75246_d", "updateTask")); - mInitMap.put(new Pair<String, String>("func_75247_h", "getMutexBits")); - mInitMap.put(new Pair<String, String>("func_75248_a", "setMutexBits")); - mInitMap.put(new Pair<String, String>("func_75249_e", "startExecuting")); - mInitMap.put(new Pair<String, String>("func_75250_a", "shouldExecute")); - mInitMap.put(new Pair<String, String>("func_75251_c", "resetTask")); - mInitMap.put(new Pair<String, String>("func_75252_g", "isInterruptible")); - mInitMap.put(new Pair<String, String>("func_75253_b", "continueExecuting")); - mInitMap.put(new Pair<String, String>("func_75270_a", "setSitting")); - mInitMap.put(new Pair<String, String>("func_75277_f", "isRunning")); - mInitMap.put(new Pair<String, String>("func_75295_a", "canEasilyReach")); - mInitMap.put(new Pair<String, String>("func_75296_a", "isSuitableTarget")); - mInitMap.put(new Pair<String, String>("func_75366_f", "findPossibleShelter")); - mInitMap.put(new Pair<String, String>("func_75382_a", "hasPlayerGotBoneInHand")); - mInitMap.put(new Pair<String, String>("func_75388_i", "spawnBaby")); - mInitMap.put(new Pair<String, String>("func_75389_f", "getNearbyMate")); - mInitMap.put( - new Pair<String, String>("func_75446_f", "checkSufficientDoorsPresentFormInitMap.put(newVillager")); - mInitMap.put(new Pair<String, String>("func_75447_i", "giveBirth")); - mInitMap.put(new Pair<String, String>("func_75461_b", "findRandomTargetBlockAwayFrom")); - mInitMap.put(new Pair<String, String>("func_75462_c", "findRandomTargetBlock")); - mInitMap.put(new Pair<String, String>("func_75463_a", "findRandomTarget")); - mInitMap.put(new Pair<String, String>("func_75464_a", "findRandomTargetBlockTowards")); - mInitMap.put(new Pair<String, String>("func_75466_d", "resetDoorOpeningRestrictionCounter")); - mInitMap.put(new Pair<String, String>("func_75467_a", "isInside")); - mInitMap.put(new Pair<String, String>("func_75468_f", "getDoorOpeningRestrictionCounter")); - mInitMap.put(new Pair<String, String>("func_75469_c", "getInsideDistanceSquare")); - mInitMap.put(new Pair<String, String>("func_75470_e", "incrementDoorOpeningRestrictionCounter")); - mInitMap.put(new Pair<String, String>("func_75471_a", "getInsidePosX")); - mInitMap.put(new Pair<String, String>("func_75472_c", "getInsidePosZ")); - mInitMap.put(new Pair<String, String>("func_75473_b", "getInsidePosY")); - mInitMap.put(new Pair<String, String>("func_75474_b", "getDistanceSquared")); - mInitMap.put(new Pair<String, String>("func_75483_a", "isSafeToStandAt")); - mInitMap.put(new Pair<String, String>("func_75484_a", "setPath")); - mInitMap.put(new Pair<String, String>("func_75485_k", "canNavigate")); - mInitMap.put(new Pair<String, String>("func_75486_a", "getAvoidsWater")); - mInitMap.put(new Pair<String, String>("func_75487_m", "removeSunnyPath")); - mInitMap.put(new Pair<String, String>("func_75488_a", "getPathToXYZ")); - mInitMap.put(new Pair<String, String>("func_75489_a", "setSpeed")); - mInitMap.put(new Pair<String, String>("func_75490_c", "setEnterDoors")); - mInitMap.put(new Pair<String, String>("func_75491_a", "setAvoidsWater")); - mInitMap.put(new Pair<String, String>("func_75492_a", "tryMoveToXYZ")); - mInitMap.put(new Pair<String, String>("func_75493_a", "isDirectPathBetweenPoints")); - mInitMap.put(new Pair<String, String>("func_75494_a", "getPathToEntityLiving")); - mInitMap.put(new Pair<String, String>("func_75495_e", "setCanSwim")); - mInitMap.put(new Pair<String, String>("func_75496_b", "isPositionClear")); - mInitMap.put(new Pair<String, String>("func_75497_a", "tryMoveToEntityLiving")); - mInitMap.put(new Pair<String, String>("func_75498_b", "setBreakDoors")); - mInitMap.put(new Pair<String, String>("func_75499_g", "clearPathEntity")); - mInitMap.put(new Pair<String, String>("func_75500_f", "noPath")); - mInitMap.put(new Pair<String, String>("func_75501_e", "onUpdateNavigation")); - mInitMap.put(new Pair<String, String>("func_75502_i", "getEntityPosition")); - mInitMap.put(new Pair<String, String>("func_75503_j", "getPathableYPos")); - mInitMap.put(new Pair<String, String>("func_75504_d", "setAvoidSun")); - mInitMap.put(new Pair<String, String>("func_75505_d", "getPath")); - mInitMap.put(new Pair<String, String>("func_75506_l", "isInLiquid")); - mInitMap.put(new Pair<String, String>("func_75507_c", "getCanBreakDoors")); - mInitMap.put(new Pair<String, String>("func_75508_h", "pathFollow")); - mInitMap.put(new Pair<String, String>("func_75522_a", "canSee")); - mInitMap.put(new Pair<String, String>("func_75523_a", "clearSensingCache")); - mInitMap.put(new Pair<String, String>("func_75528_a", "tick")); - mInitMap.put(new Pair<String, String>("func_75530_c", "spawnZombie")); - mInitMap.put(new Pair<String, String>("func_75540_b", "getVillageList")); - mInitMap.put(new Pair<String, String>("func_75541_e", "isWoodenDoorAt")); - mInitMap.put(new Pair<String, String>("func_75542_c", "addDoorTomInitMap.put(newListIfAppropriate")); - mInitMap.put(new Pair<String, String>("func_75543_d", "dropOldestVillagerPosition")); - mInitMap.put(new Pair<String, String>("func_75544_a", "tick")); - mInitMap.put(new Pair<String, String>("func_75545_e", "addmInitMap.put(newDoorsToVillageOrCreateVillage")); - mInitMap.put( - new Pair<String, String>( - "func_75546_a", - "addUnassignedWoodenDoorsAroundTomInitMap.put(newDoorsList")); - mInitMap.put(new Pair<String, String>("func_75547_b", "getVillageDoorAt")); - mInitMap.put(new Pair<String, String>("func_75548_d", "isVillagerPositionPresent")); - mInitMap.put(new Pair<String, String>("func_75549_c", "removeAnnihilatedVillages")); - mInitMap.put(new Pair<String, String>("func_75550_a", "findNearestVillage")); - mInitMap.put(new Pair<String, String>("func_75551_a", "addVillagerPosition")); - mInitMap.put(new Pair<String, String>("func_75557_k", "removeDeadAndOutOfRangeDoors")); - mInitMap.put(new Pair<String, String>("func_75558_f", "getVillageDoorInfoList")); - mInitMap.put(new Pair<String, String>("func_75559_a", "tryGetIronGolemSpawningLocation")); - mInitMap.put(new Pair<String, String>("func_75560_a", "tick")); - mInitMap.put(new Pair<String, String>("func_75561_d", "getTicksSinceLastDoorAdding")); - mInitMap.put(new Pair<String, String>("func_75562_e", "getNumVillagers")); - mInitMap.put(new Pair<String, String>("func_75563_b", "isValidIronGolemSpawningLocation")); - mInitMap.put(new Pair<String, String>("func_75564_b", "findNearestDoor")); - mInitMap.put(new Pair<String, String>("func_75565_j", "removeDeadAndOldAgressors")); - mInitMap.put(new Pair<String, String>("func_75566_g", "isAnnihilated")); - mInitMap.put(new Pair<String, String>("func_75567_c", "getNumVillageDoors")); - mInitMap.put(new Pair<String, String>("func_75568_b", "getVillageRadius")); - mInitMap.put(new Pair<String, String>("func_75569_c", "findNearestDoorUnrestricted")); - mInitMap.put(new Pair<String, String>("func_75570_a", "isInRange")); - mInitMap.put(new Pair<String, String>("func_75571_b", "findNearestVillageAggressor")); - mInitMap.put(new Pair<String, String>("func_75572_i", "updateNumVillagers")); - mInitMap.put(new Pair<String, String>("func_75573_l", "updateVillageRadiusAndCenter")); - mInitMap.put(new Pair<String, String>("func_75574_f", "isBlockDoor")); - mInitMap.put(new Pair<String, String>("func_75575_a", "addOrRemInitMap.put(newAgressor")); - mInitMap.put(new Pair<String, String>("func_75576_a", "addVillageDoorInfo")); - mInitMap.put(new Pair<String, String>("func_75577_a", "getCenter")); - mInitMap.put(new Pair<String, String>("func_75578_e", "getVillageDoorAt")); - mInitMap.put(new Pair<String, String>("func_75579_h", "updateNumIronGolems")); - mInitMap.put(new Pair<String, String>("func_75598_a", "getCreatureClass")); - mInitMap.put(new Pair<String, String>("func_75599_d", "getPeacefulCreature")); - mInitMap.put(new Pair<String, String>("func_75600_c", "getCreatureMaterial")); - mInitMap.put(new Pair<String, String>("func_75601_b", "getMaxNumberOfCreature")); - mInitMap.put(new Pair<String, String>("func_75614_a", "addMapping")); - mInitMap.put(new Pair<String, String>("func_75615_a", "createEntityFromNBT")); - mInitMap.put(new Pair<String, String>("func_75616_a", "createEntityByID")); - mInitMap.put(new Pair<String, String>("func_75617_a", "getStringFromID")); - mInitMap.put(new Pair<String, String>("func_75618_a", "addMapping")); - mInitMap.put(new Pair<String, String>("func_75619_a", "getEntityID")); - mInitMap.put(new Pair<String, String>("func_75620_a", "createEntityByName")); - mInitMap.put(new Pair<String, String>("func_75621_b", "getEntityString")); - mInitMap.put(new Pair<String, String>("func_75630_a", "multiplyBy32AndRound")); - mInitMap.put(new Pair<String, String>("func_75638_b", "getSpeed")); - mInitMap.put(new Pair<String, String>("func_75639_a", "limitAngle")); - mInitMap.put(new Pair<String, String>("func_75640_a", "isUpdating")); - mInitMap.put(new Pair<String, String>("func_75641_c", "onUpdateMoveHelper")); - mInitMap.put(new Pair<String, String>("func_75642_a", "setMoveTo")); - mInitMap.put(new Pair<String, String>("func_75649_a", "onUpdateLook")); - mInitMap.put(new Pair<String, String>("func_75650_a", "setLookPosition")); - mInitMap.put(new Pair<String, String>("func_75651_a", "setLookPositionWithEntity")); - mInitMap.put(new Pair<String, String>("func_75652_a", "updateRotation")); - mInitMap.put(new Pair<String, String>("func_75660_a", "setJumping")); - mInitMap.put(new Pair<String, String>("func_75661_b", "doJump")); - mInitMap.put(new Pair<String, String>("func_75664_a", "updateRenderAngles")); - mInitMap.put(new Pair<String, String>("func_75665_a", "computeAngleWithBound")); - mInitMap.put(new Pair<String, String>("func_75669_b", "getObject")); - mInitMap.put(new Pair<String, String>("func_75670_d", "isWatched")); - mInitMap.put(new Pair<String, String>("func_75671_a", "setWatched")); - mInitMap.put(new Pair<String, String>("func_75672_a", "getDataValueId")); - mInitMap.put(new Pair<String, String>("func_75673_a", "setObject")); - mInitMap.put(new Pair<String, String>("func_75674_c", "getObjectType")); - mInitMap.put(new Pair<String, String>("func_75679_c", "getWatchableObjectInt")); - mInitMap.put(new Pair<String, String>("func_75681_e", "getWatchableObjectString")); - mInitMap.put(new Pair<String, String>("func_75682_a", "addObject")); - mInitMap.put(new Pair<String, String>("func_75683_a", "getWatchableObjectByte")); - mInitMap.put(new Pair<String, String>("func_75684_a", "hasObjectChanged")); - mInitMap.put(new Pair<String, String>("func_75685_c", "getAllWatched")); - mInitMap.put(new Pair<String, String>("func_75687_a", "updateWatchedObjectsFromList")); - mInitMap.put(new Pair<String, String>("func_75688_b", "getChanged")); - mInitMap.put(new Pair<String, String>("func_75691_i", "getWatchedObject")); - mInitMap.put(new Pair<String, String>("func_75692_b", "updateObject")); - mInitMap.put(new Pair<String, String>("func_75693_b", "getWatchableObjectShort")); - mInitMap.put(new Pair<String, String>("func_75734_a", "waitForFinish")); - mInitMap.put(new Pair<String, String>("func_75735_a", "queueIO")); - mInitMap.put(new Pair<String, String>("func_75736_b", "processQueue")); - mInitMap.put(new Pair<String, String>("func_75742_a", "loadData")); - mInitMap.put(new Pair<String, String>("func_75743_a", "getUniqueDataId")); - mInitMap.put(new Pair<String, String>("func_75744_a", "saveAllData")); - mInitMap.put(new Pair<String, String>("func_75745_a", "setData")); - mInitMap.put(new Pair<String, String>("func_75746_b", "loadIdCounts")); - mInitMap.put(new Pair<String, String>("func_75747_a", "saveData")); - mInitMap.put(new Pair<String, String>("func_75752_b", "readPlayerData")); - mInitMap.put(new Pair<String, String>("func_75753_a", "writePlayerData")); - mInitMap.put(new Pair<String, String>("func_75754_f", "getAvailablePlayerDat")); - mInitMap.put(new Pair<String, String>("func_75755_a", "saveWorldInfoWithPlayer")); - mInitMap.put(new Pair<String, String>("func_75756_e", "getPlayerNBTManager")); - mInitMap.put(new Pair<String, String>("func_75757_d", "loadWorldInfo")); - mInitMap.put(new Pair<String, String>("func_75758_b", "getMapFileFromName")); - mInitMap.put(new Pair<String, String>("func_75759_a", "flush")); - mInitMap.put(new Pair<String, String>("func_75760_g", "getWorldDirectoryName")); - mInitMap.put(new Pair<String, String>("func_75761_a", "saveWorldInfo")); - mInitMap.put(new Pair<String, String>("func_75762_c", "checkSessionLock")); - mInitMap.put(new Pair<String, String>("func_75763_a", "getChunkLoader")); - mInitMap.put(new Pair<String, String>("func_75765_b", "getWorldDirectory")); - mInitMap.put(new Pair<String, String>("func_75766_h", "setSessionLock")); - mInitMap.put(new Pair<String, String>("func_75773_a", "canContinue")); - mInitMap.put(new Pair<String, String>("func_75774_a", "onUpdateTasks")); - mInitMap.put(new Pair<String, String>("func_75775_b", "canUse")); - mInitMap.put(new Pair<String, String>("func_75776_a", "addTask")); - mInitMap.put(new Pair<String, String>("func_75777_a", "areTasksCompatible")); - mInitMap.put(new Pair<String, String>("func_75783_h", "getCheatsEnabled")); - mInitMap.put(new Pair<String, String>("func_75784_e", "getLastTimePlayed")); - mInitMap.put(new Pair<String, String>("func_75785_d", "requiresConversion")); - mInitMap.put(new Pair<String, String>("func_75786_a", "getFileName")); - mInitMap.put(new Pair<String, String>("func_75788_b", "getDisplayName")); - mInitMap.put(new Pair<String, String>("func_75789_g", "isHardcoreModeEnabled")); - mInitMap.put(new Pair<String, String>("func_75790_f", "getEnumGameType")); - mInitMap.put(new Pair<String, String>("func_75799_b", "getSaveList")); - mInitMap.put(new Pair<String, String>("func_75800_d", "flushCache")); - mInitMap.put(new Pair<String, String>("func_75801_b", "isOldMapFormat")); - mInitMap.put(new Pair<String, String>("func_75802_e", "deleteWorldDirectory")); - mInitMap.put(new Pair<String, String>("func_75803_c", "getWorldInfo")); - mInitMap.put(new Pair<String, String>("func_75804_a", "getSaveLoader")); - mInitMap.put(new Pair<String, String>("func_75805_a", "convertMapFormat")); - mInitMap.put(new Pair<String, String>("func_75806_a", "renameWorld")); - mInitMap.put(new Pair<String, String>("func_75807_a", "deleteFiles")); - mInitMap.put(new Pair<String, String>("func_75809_f", "createFile")); - mInitMap.put(new Pair<String, String>("func_75810_a", "addRegionFilesToCollection")); - mInitMap.put(new Pair<String, String>("func_75811_a", "convertChunks")); - mInitMap.put(new Pair<String, String>("func_75812_c", "getSaveVersion")); - mInitMap.put(new Pair<String, String>("func_75813_a", "convertFile")); - mInitMap.put(new Pair<String, String>("func_75814_c", "writeNextIO")); - mInitMap.put(new Pair<String, String>("func_75815_a", "loadChunk")); - mInitMap.put(new Pair<String, String>("func_75816_a", "saveChunk")); - mInitMap.put(new Pair<String, String>("func_75817_a", "chunkTick")); - mInitMap.put(new Pair<String, String>("func_75818_b", "saveExtraData")); - mInitMap.put(new Pair<String, String>("func_75819_b", "saveExtraChunkData")); - mInitMap.put(new Pair<String, String>("func_75820_a", "writeChunkToNBT")); - mInitMap.put(new Pair<String, String>("func_75821_a", "writeChunkNBTTags")); - mInitMap.put(new Pair<String, String>("func_75822_a", "checkedReadChunkFromNBT")); - mInitMap.put(new Pair<String, String>("func_75823_a", "readChunkFromNBT")); - mInitMap.put(new Pair<String, String>("func_75824_a", "addChunkToPending")); - mInitMap.put(new Pair<String, String>("func_75829_a", "distanceTo")); - mInitMap.put(new Pair<String, String>("func_75830_a", "makeHash")); - mInitMap.put(new Pair<String, String>("func_75831_a", "isAssigned")); - mInitMap.put(new Pair<String, String>("func_75832_b", "distanceToSquared")); - mInitMap.put(new Pair<String, String>("func_75843_a", "format")); - mInitMap.put(new Pair<String, String>("func_75844_c", "dequeue")); - mInitMap.put(new Pair<String, String>("func_75845_e", "isPathEmpty")); - mInitMap.put(new Pair<String, String>("func_75846_b", "sortForward")); - mInitMap.put(new Pair<String, String>("func_75847_a", "sortBack")); - mInitMap.put(new Pair<String, String>("func_75848_a", "clearPath")); - mInitMap.put(new Pair<String, String>("func_75849_a", "addPoint")); - mInitMap.put(new Pair<String, String>("func_75850_a", "changeDistance")); - mInitMap.put(new Pair<String, String>("func_75853_a", "createEntityPath")); - mInitMap.put(new Pair<String, String>("func_75854_a", "openPoint")); - mInitMap.put(new Pair<String, String>("func_75855_a", "canEntityStandAt")); - mInitMap.put(new Pair<String, String>("func_75856_a", "createEntityPathTo")); - mInitMap.put(new Pair<String, String>("func_75857_a", "createEntityPathTo")); - mInitMap.put(new Pair<String, String>("func_75858_a", "getSafePoint")); - mInitMap.put(new Pair<String, String>("func_75859_a", "createEntityPathTo")); - mInitMap.put(new Pair<String, String>("func_75860_b", "findPathOptions")); - mInitMap.put(new Pair<String, String>("func_75861_a", "addToPath")); - mInitMap.put(new Pair<String, String>("func_75870_c", "getFinalPathPoint")); - mInitMap.put(new Pair<String, String>("func_75871_b", "setCurrentPathLength")); - mInitMap.put(new Pair<String, String>("func_75872_c", "setCurrentPathIndex")); - mInitMap.put(new Pair<String, String>("func_75873_e", "getCurrentPathIndex")); - mInitMap.put(new Pair<String, String>("func_75874_d", "getCurrentPathLength")); - mInitMap.put(new Pair<String, String>("func_75875_a", "incrementPathIndex")); - mInitMap.put(new Pair<String, String>("func_75876_a", "isSamePath")); - mInitMap.put(new Pair<String, String>("func_75877_a", "getPathPointFromIndex")); - mInitMap.put(new Pair<String, String>("func_75878_a", "getPosition")); - mInitMap.put(new Pair<String, String>("func_75879_b", "isFinished")); - mInitMap.put(new Pair<String, String>("func_75880_b", "isDestinationSame")); - mInitMap.put(new Pair<String, String>("func_75881_a", "getVectorFromIndex")); - mInitMap.put(new Pair<String, String>("func_75885_a", "cipherOperation")); - mInitMap.put(new Pair<String, String>("func_75886_a", "createTheCipherInstance")); - mInitMap.put(new Pair<String, String>("func_75887_a", "decryptSharedKey")); - mInitMap.put(new Pair<String, String>("func_75889_b", "decryptData")); - mInitMap.put(new Pair<String, String>("func_75890_a", "createmInitMap.put(newSharedKey")); - mInitMap.put(new Pair<String, String>("func_75891_b", "generateKeyPair")); - mInitMap.put(new Pair<String, String>("func_75893_a", "digestOperation")); - mInitMap.put(new Pair<String, String>("func_75894_a", "encryptData")); - mInitMap.put(new Pair<String, String>("func_75895_a", "getServerIdHash")); - mInitMap.put(new Pair<String, String>("func_75896_a", "decodePublicKey")); - mInitMap.put(new Pair<String, String>("func_75901_a", "initializeAllBiomeGenerators")); - mInitMap.put(new Pair<String, String>("func_75902_a", "nextInt")); - mInitMap.put(new Pair<String, String>("func_75903_a", "initChunkSeed")); - mInitMap.put(new Pair<String, String>("func_75904_a", "getInts")); - mInitMap.put(new Pair<String, String>("func_75905_a", "initWorldGenSeed")); - mInitMap.put(new Pair<String, String>("func_75915_a", "magnify")); - mInitMap.put(new Pair<String, String>("func_75918_d", "initCraftableStats")); - mInitMap.put(new Pair<String, String>("func_75924_a", "replaceAllSimilarBlocks")); - mInitMap.put(new Pair<String, String>("func_75925_c", "initStats")); - mInitMap.put(new Pair<String, String>("func_75966_h", "initIndependentStat")); - mInitMap.put(new Pair<String, String>("func_75967_d", "isAchievement")); - mInitMap.put(new Pair<String, String>("func_75971_g", "registerStat")); - mInitMap.put(new Pair<String, String>("func_75984_f", "getSpecial")); - mInitMap.put(new Pair<String, String>("func_75987_b", "setSpecial")); - mInitMap.put(new Pair<String, String>("func_75988_a", "setStatStringFormatter")); - mInitMap.put(new Pair<String, String>("func_75989_e", "getDescription")); - mInitMap.put(new Pair<String, String>("func_75997_a", "init")); - mInitMap.put(new Pair<String, String>("func_76030_b", "getValue")); - mInitMap.put(new Pair<String, String>("func_76031_a", "getHash")); - mInitMap.put(new Pair<String, String>("func_76036_e", "removeEntry")); - mInitMap.put(new Pair<String, String>("func_76037_b", "containsItem")); - mInitMap.put(new Pair<String, String>("func_76038_a", "addKey")); - mInitMap.put(new Pair<String, String>("func_76040_a", "insert")); - mInitMap.put(new Pair<String, String>("func_76041_a", "lookup")); - mInitMap.put(new Pair<String, String>("func_76043_a", "getSlotIndex")); - mInitMap.put(new Pair<String, String>("func_76044_g", "computeHash")); - mInitMap.put(new Pair<String, String>("func_76045_c", "lookupEntry")); - mInitMap.put(new Pair<String, String>("func_76046_c", "clearMap")); - mInitMap.put(new Pair<String, String>("func_76047_h", "grow")); - mInitMap.put(new Pair<String, String>("func_76048_a", "copyTo")); - mInitMap.put(new Pair<String, String>("func_76049_d", "removeObject")); - mInitMap.put(new Pair<String, String>("func_76056_b", "setSpawnY")); - mInitMap.put(new Pair<String, String>("func_76057_l", "getLastTimePlayed")); - mInitMap.put(new Pair<String, String>("func_76058_a", "setSpawnX")); - mInitMap.put(new Pair<String, String>("func_76059_o", "isRaining")); - mInitMap.put(new Pair<String, String>("func_76060_a", "setGameType")); - mInitMap.put(new Pair<String, String>("func_76061_m", "isThundering")); - mInitMap.put(new Pair<String, String>("func_76062_a", "setWorldName")); - mInitMap.put(new Pair<String, String>("func_76063_b", "getSeed")); - mInitMap.put(new Pair<String, String>("func_76064_a", "updateTagCompound")); - mInitMap.put(new Pair<String, String>("func_76065_j", "getWorldName")); - mInitMap.put(new Pair<String, String>("func_76066_a", "getNBTTagCompound")); - mInitMap.put(new Pair<String, String>("func_76067_t", "getTerrainType")); - mInitMap.put(new Pair<String, String>("func_76068_b", "setWorldTime")); - mInitMap.put(new Pair<String, String>("func_76069_a", "setThundering")); - mInitMap.put(new Pair<String, String>("func_76070_v", "isInitialized")); - mInitMap.put(new Pair<String, String>("func_76071_n", "getThunderTime")); - mInitMap.put(new Pair<String, String>("func_76072_h", "getPlayerNBTTagCompound")); - mInitMap.put(new Pair<String, String>("func_76073_f", "getWorldTime")); - mInitMap.put(new Pair<String, String>("func_76074_e", "getSpawnZ")); - mInitMap.put(new Pair<String, String>("func_76075_d", "getSpawnY")); - mInitMap.put(new Pair<String, String>("func_76076_i", "getDimension")); - mInitMap.put(new Pair<String, String>("func_76077_q", "getGameType")); - mInitMap.put(new Pair<String, String>("func_76078_e", "setSaveVersion")); - mInitMap.put(new Pair<String, String>("func_76079_c", "getSpawnX")); - mInitMap.put(new Pair<String, String>("func_76080_g", "setRainTime")); - mInitMap.put(new Pair<String, String>("func_76081_a", "setSpawnPosition")); - mInitMap.put(new Pair<String, String>("func_76082_a", "cloneNBTCompound")); - mInitMap.put(new Pair<String, String>("func_76083_p", "getRainTime")); - mInitMap.put(new Pair<String, String>("func_76084_b", "setRaining")); - mInitMap.put(new Pair<String, String>("func_76085_a", "setTerrainType")); - mInitMap.put(new Pair<String, String>("func_76086_u", "areCommandsAllowed")); - mInitMap.put(new Pair<String, String>("func_76087_c", "setSpawnZ")); - mInitMap.put(new Pair<String, String>("func_76088_k", "getSaveVersion")); - mInitMap.put(new Pair<String, String>("func_76089_r", "isMapFeaturesEnabled")); - mInitMap.put(new Pair<String, String>("func_76090_f", "setThunderTime")); - mInitMap.put(new Pair<String, String>("func_76091_d", "setServerInitialized")); - mInitMap.put(new Pair<String, String>("func_76092_g", "getSizeOnDisk")); - mInitMap.put(new Pair<String, String>("func_76093_s", "isHardcoreModeEnabled")); - mInitMap.put(new Pair<String, String>("func_76123_f", "ceiling_float_int")); - mInitMap.put(new Pair<String, String>("func_76124_d", "floor_double_long")); - mInitMap.put(new Pair<String, String>("func_76125_a", "clamp_int")); - mInitMap.put(new Pair<String, String>("func_76126_a", "sin")); - mInitMap.put(new Pair<String, String>("func_76127_a", "average")); - mInitMap.put(new Pair<String, String>("func_76128_c", "floor_double")); - mInitMap.put(new Pair<String, String>("func_76129_c", "sqrt_float")); - mInitMap.put(new Pair<String, String>("func_76130_a", "abs_int")); - mInitMap.put(new Pair<String, String>("func_76131_a", "clamp_float")); - mInitMap.put(new Pair<String, String>("func_76132_a", "abs_max")); - mInitMap.put(new Pair<String, String>("func_76133_a", "sqrt_double")); - mInitMap.put(new Pair<String, String>("func_76134_b", "cos")); - mInitMap.put(new Pair<String, String>("func_76135_e", "abs")); - mInitMap.put(new Pair<String, String>("func_76136_a", "getRandomIntegerInRange")); - mInitMap.put(new Pair<String, String>("func_76137_a", "bucketInt")); - mInitMap.put(new Pair<String, String>("func_76138_g", "wrapAngleTo180_double")); - mInitMap.put(new Pair<String, String>("func_76139_a", "stringNullOrLengthZero")); - mInitMap.put(new Pair<String, String>("func_76140_b", "truncateDoubleToInt")); - mInitMap.put(new Pair<String, String>("func_76141_d", "floor_float")); - mInitMap.put(new Pair<String, String>("func_76142_g", "wrapAngleTo180_float")); - mInitMap.put(new Pair<String, String>("func_76143_f", "ceiling_double_int")); - mInitMap.put(new Pair<String, String>("func_76145_b", "getValue")); - mInitMap.put(new Pair<String, String>("func_76146_a", "getKey")); - mInitMap.put(new Pair<String, String>("func_76152_e", "removeKey")); - mInitMap.put(new Pair<String, String>("func_76153_b", "resizeTable")); - mInitMap.put(new Pair<String, String>("func_76154_a", "copyHashTableTo")); - mInitMap.put(new Pair<String, String>("func_76155_g", "getHashedKey")); - mInitMap.put(new Pair<String, String>("func_76156_a", "createKey")); - mInitMap.put(new Pair<String, String>("func_76157_a", "hash")); - mInitMap.put(new Pair<String, String>("func_76158_a", "getHashIndex")); - mInitMap.put(new Pair<String, String>("func_76159_d", "remove")); - mInitMap.put(new Pair<String, String>("func_76160_c", "getEntry")); - mInitMap.put(new Pair<String, String>("func_76161_b", "containsItem")); - mInitMap.put(new Pair<String, String>("func_76162_a", "getNumHashElements")); - mInitMap.put(new Pair<String, String>("func_76163_a", "add")); - mInitMap.put(new Pair<String, String>("func_76164_a", "getValueByKey")); - mInitMap.put(new Pair<String, String>("func_76179_a", "buildPostString")); - mInitMap.put(new Pair<String, String>("func_76181_a", "getSuitableLanPort")); - mInitMap.put(new Pair<String, String>("func_76184_a", "readFromNBT")); - mInitMap.put(new Pair<String, String>("func_76185_a", "markDirty")); - mInitMap.put(new Pair<String, String>("func_76186_a", "setDirty")); - mInitMap.put(new Pair<String, String>("func_76187_b", "writeToNBT")); - mInitMap.put(new Pair<String, String>("func_76188_b", "isDirty")); - mInitMap.put(new Pair<String, String>("func_76191_a", "updateVisiblePlayers")); - mInitMap.put(new Pair<String, String>("func_76192_a", "updateMPMapData")); - mInitMap.put(new Pair<String, String>("func_76193_a", "getUpdatePacketData")); - mInitMap.put(new Pair<String, String>("func_76194_a", "setColumnDirty")); - mInitMap.put(new Pair<String, String>("func_76204_a", "getPlayersOnMap")); - mInitMap.put(new Pair<String, String>("func_76217_h", "getCanBurn")); - mInitMap.put(new Pair<String, String>("func_76218_k", "isOpaque")); - mInitMap.put(new Pair<String, String>("func_76219_n", "setNoPushMobility")); - mInitMap.put(new Pair<String, String>("func_76220_a", "isSolid")); - mInitMap.put(new Pair<String, String>("func_76221_f", "setRequiresTool")); - mInitMap.put(new Pair<String, String>("func_76222_j", "isReplaceable")); - mInitMap.put(new Pair<String, String>("func_76223_p", "setTranslucent")); - mInitMap.put(new Pair<String, String>("func_76224_d", "isLiquid")); - mInitMap.put(new Pair<String, String>("func_76225_o", "setImmovableMobility")); - mInitMap.put(new Pair<String, String>("func_76226_g", "setBurning")); - mInitMap.put(new Pair<String, String>("func_76227_m", "getMaterialMobility")); - mInitMap.put(new Pair<String, String>("func_76228_b", "blocksLight")); - mInitMap.put(new Pair<String, String>("func_76229_l", "isToolNotRequired")); - mInitMap.put(new Pair<String, String>("func_76230_c", "blocksMovement")); - mInitMap.put(new Pair<String, String>("func_76231_i", "setReplaceable")); - mInitMap.put(new Pair<String, String>("func_76269_a", "getRandomItem")); - mInitMap.put(new Pair<String, String>("func_76270_a", "getTotalWeight")); - mInitMap.put(new Pair<String, String>("func_76271_a", "getRandomItem")); - mInitMap.put(new Pair<String, String>("func_76272_a", "getTotalWeight")); - mInitMap.put(new Pair<String, String>("func_76273_a", "getRandomItem")); - mInitMap.put(new Pair<String, String>("func_76274_a", "getRandomItem")); - mInitMap.put(new Pair<String, String>("func_76293_a", "generateChestContents")); - mInitMap.put(new Pair<String, String>("func_76304_a", "generateNoiseOctaves")); - mInitMap.put(new Pair<String, String>("func_76305_a", "generateNoiseOctaves")); - mInitMap.put(new Pair<String, String>("func_76308_a", "populateNoiseArray")); - mInitMap.put(new Pair<String, String>("func_76310_a", "grad")); - mInitMap.put(new Pair<String, String>("func_76311_b", "lerp")); - mInitMap.put(new Pair<String, String>("func_76316_a", "onInventoryChanged")); - mInitMap.put(new Pair<String, String>("func_76317_a", "clearProfiling")); - mInitMap.put(new Pair<String, String>("func_76318_c", "endStartSection")); - mInitMap.put(new Pair<String, String>("func_76319_b", "endSection")); - mInitMap.put(new Pair<String, String>("func_76320_a", "startSection")); - mInitMap.put(new Pair<String, String>("func_76321_b", "getProfilingData")); - mInitMap.put(new Pair<String, String>("func_76322_c", "getNameOfLastSection")); - mInitMap.put(new Pair<String, String>("func_76333_a", "smooth")); - mInitMap.put(new Pair<String, String>("func_76337_a", "ticksToElapsedTime")); - mInitMap.put(new Pair<String, String>("func_76338_a", "stripControlCodes")); - mInitMap.put(new Pair<String, String>("func_76340_b", "getSecond")); - mInitMap.put(new Pair<String, String>("func_76341_a", "getFirst")); - mInitMap.put(new Pair<String, String>("func_76345_d", "getHungerDamage")); - mInitMap.put(new Pair<String, String>("func_76346_g", "getEntity")); - mInitMap.put(new Pair<String, String>("func_76347_k", "isFireDamage")); - mInitMap.put(new Pair<String, String>("func_76348_h", "setDamageBypassesArmor")); - mInitMap.put(new Pair<String, String>("func_76349_b", "setProjectile")); - mInitMap.put(new Pair<String, String>("func_76350_n", "isDifficultyScaled")); - mInitMap.put(new Pair<String, String>("func_76351_m", "setDifficultyScaled")); - mInitMap.put(new Pair<String, String>("func_76352_a", "isProjectile")); - mInitMap.put(new Pair<String, String>("func_76353_a", "causeArrowDamage")); - mInitMap.put(new Pair<String, String>("func_76354_b", "causeIndirectMagicDamage")); - mInitMap.put(new Pair<String, String>("func_76355_l", "getDamageType")); - mInitMap.put(new Pair<String, String>("func_76356_a", "causeThrownDamage")); - mInitMap.put(new Pair<String, String>("func_76357_e", "canHarmInCreative")); - mInitMap.put(new Pair<String, String>("func_76358_a", "causeMobDamage")); - mInitMap.put(new Pair<String, String>("func_76359_i", "setDamageAllowedInCreativeMode")); - mInitMap.put(new Pair<String, String>("func_76361_j", "setFireDamage")); - mInitMap.put(new Pair<String, String>("func_76362_a", "causeFireballDamage")); - mInitMap.put(new Pair<String, String>("func_76363_c", "isUnblockable")); - mInitMap.put(new Pair<String, String>("func_76364_f", "getSourceOfDamage")); - mInitMap.put(new Pair<String, String>("func_76365_a", "causePlayerDamage")); - mInitMap.put(new Pair<String, String>("func_76388_g", "getEffectiveness")); - mInitMap.put(new Pair<String, String>("func_76389_a", "getDurationString")); - mInitMap.put(new Pair<String, String>("func_76390_b", "setPotionName")); - mInitMap.put(new Pair<String, String>("func_76392_e", "getStatusIconIndex")); - mInitMap.put(new Pair<String, String>("func_76393_a", "getName")); - mInitMap.put(new Pair<String, String>("func_76394_a", "performEffect")); - mInitMap.put(new Pair<String, String>("func_76395_i", "isUsable")); - mInitMap.put(new Pair<String, String>("func_76396_c", "getId")); - mInitMap.put(new Pair<String, String>("func_76397_a", "isReady")); - mInitMap.put(new Pair<String, String>("func_76398_f", "isBadEffect")); - mInitMap.put(new Pair<String, String>("func_76399_b", "setIconIndex")); - mInitMap.put(new Pair<String, String>("func_76400_d", "hasStatusIcon")); - mInitMap.put(new Pair<String, String>("func_76401_j", "getLiquidColor")); - mInitMap.put(new Pair<String, String>("func_76402_a", "affectEntity")); - mInitMap.put(new Pair<String, String>("func_76403_b", "isInstant")); - mInitMap.put(new Pair<String, String>("func_76404_a", "setEffectiveness")); - mInitMap.put(new Pair<String, String>("func_76445_a", "getIntCache")); - mInitMap.put(new Pair<String, String>("func_76446_a", "resetIntCache")); - mInitMap.put(new Pair<String, String>("func_76452_a", "combine")); - mInitMap.put(new Pair<String, String>("func_76453_d", "getEffectName")); - mInitMap.put(new Pair<String, String>("func_76454_e", "deincrementDuration")); - mInitMap.put(new Pair<String, String>("func_76455_a", "onUpdate")); - mInitMap.put(new Pair<String, String>("func_76456_a", "getPotionID")); - mInitMap.put(new Pair<String, String>("func_76457_b", "performEffect")); - mInitMap.put(new Pair<String, String>("func_76458_c", "getAmplifier")); - mInitMap.put(new Pair<String, String>("func_76459_b", "getDuration")); - mInitMap.put(new Pair<String, String>("func_76463_a", "startSnooper")); - mInitMap.put(new Pair<String, String>("func_76465_c", "getCurrentStats")); - mInitMap.put(new Pair<String, String>("func_76467_g", "addJvmArgsToSnooper")); - mInitMap.put(new Pair<String, String>("func_76468_d", "isSnooperRunning")); - mInitMap.put(new Pair<String, String>("func_76470_e", "stopSnooper")); - mInitMap.put(new Pair<String, String>("func_76471_b", "addMemoryStatsToSnooper")); - mInitMap.put(new Pair<String, String>("func_76484_a", "generate")); - mInitMap.put(new Pair<String, String>("func_76487_a", "setScale")); - mInitMap.put(new Pair<String, String>("func_76489_a", "generateLeafNodeList")); - mInitMap.put(new Pair<String, String>("func_76490_a", "layerSize")); - mInitMap.put(new Pair<String, String>("func_76491_a", "generateLeafNode")); - mInitMap.put(new Pair<String, String>("func_76493_c", "leafNodeNeedsBase")); - mInitMap.put(new Pair<String, String>("func_76494_d", "generateLeafNodeBases")); - mInitMap.put(new Pair<String, String>("func_76495_b", "leafSize")); - mInitMap.put(new Pair<String, String>("func_76496_a", "checkBlockLine")); - mInitMap.put(new Pair<String, String>("func_76497_e", "validTreeLocation")); - mInitMap.put(new Pair<String, String>("func_76498_b", "generateLeaves")); - mInitMap.put(new Pair<String, String>("func_76499_c", "generateTrunk")); - mInitMap.put(new Pair<String, String>("func_76529_b", "growVines")); - mInitMap.put(new Pair<String, String>("func_76536_b", "generateVines")); - mInitMap.put(new Pair<String, String>("func_76543_b", "pickMobSpawner")); - mInitMap.put(new Pair<String, String>("func_76549_c", "getChunkInputStream")); - mInitMap.put(new Pair<String, String>("func_76550_a", "createOrLoadRegionFile")); - mInitMap.put(new Pair<String, String>("func_76551_a", "clearRegionFileReferences")); - mInitMap.put(new Pair<String, String>("func_76552_d", "getChunkOutputStream")); - mInitMap.put(new Pair<String, String>("func_76554_h", "getEntrancePortalLocation")); - mInitMap.put(new Pair<String, String>("func_76555_c", "createChunkGenerator")); - mInitMap.put(new Pair<String, String>("func_76556_a", "generateLightBrightnessTable")); - mInitMap.put(new Pair<String, String>("func_76557_i", "getAverageGroundLevel")); - mInitMap.put(new Pair<String, String>("func_76558_a", "registerWorld")); - mInitMap.put(new Pair<String, String>("func_76559_b", "getMoonPhase")); - mInitMap.put(new Pair<String, String>("func_76560_a", "calcSunriseSunsetColors")); - mInitMap.put(new Pair<String, String>("func_76561_g", "isSkyColored")); - mInitMap.put(new Pair<String, String>("func_76562_b", "getFogColor")); - mInitMap.put(new Pair<String, String>("func_76563_a", "calculateCelestialAngle")); - mInitMap.put(new Pair<String, String>("func_76564_j", "getWorldHasVoidParticles")); - mInitMap.put(new Pair<String, String>("func_76565_k", "getVoidFogYFactor")); - mInitMap.put(new Pair<String, String>("func_76566_a", "canCoordinateBeSpawn")); - mInitMap.put(new Pair<String, String>("func_76567_e", "canRespawnHere")); - mInitMap.put(new Pair<String, String>("func_76568_b", "doesXZShowFog")); - mInitMap.put(new Pair<String, String>("func_76569_d", "isSurfaceWorld")); - mInitMap.put(new Pair<String, String>("func_76570_a", "getProviderForDimension")); - mInitMap.put(new Pair<String, String>("func_76571_f", "getCloudHeight")); - mInitMap.put(new Pair<String, String>("func_76572_b", "registerWorldChunkManager")); - mInitMap.put(new Pair<String, String>("func_76581_a", "set")); - mInitMap.put(new Pair<String, String>("func_76582_a", "get")); - mInitMap.put(new Pair<String, String>("func_76587_i", "getBlockStorageArray")); - mInitMap.put(new Pair<String, String>("func_76588_a", "getEntitiesWithinAABBForEntity")); - mInitMap.put(new Pair<String, String>("func_76589_b", "setBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_76590_a", "generateHeightMap")); - mInitMap.put(new Pair<String, String>("func_76591_a", "getBiomeGenForWorldCoords")); - mInitMap.put(new Pair<String, String>("func_76594_o", "enqueueRelightChecks")); - mInitMap.put(new Pair<String, String>("func_76595_e", "propagateSkylightOcclusion")); - mInitMap.put(new Pair<String, String>("func_76599_g", "checkSkylightNeighborHeight")); - mInitMap.put(new Pair<String, String>("func_76600_a", "isAtLocation")); - mInitMap.put(new Pair<String, String>("func_76601_a", "needsSaving")); - mInitMap.put(new Pair<String, String>("func_76602_a", "setStorageArrays")); - mInitMap.put(new Pair<String, String>("func_76603_b", "generateSkylightMap")); - mInitMap.put(new Pair<String, String>("func_76605_m", "getBiomeArray")); - mInitMap.put(new Pair<String, String>("func_76606_c", "getAreLevelsEmpty")); - mInitMap.put(new Pair<String, String>("func_76607_a", "fillChunk")); - mInitMap.put(new Pair<String, String>("func_76608_a", "removeEntityAtIndex")); - mInitMap.put(new Pair<String, String>("func_76609_d", "updateSkylightNeighborHeight")); - mInitMap.put(new Pair<String, String>("func_76611_b", "getHeightValue")); - mInitMap.put(new Pair<String, String>("func_76612_a", "addEntity")); - mInitMap.put(new Pair<String, String>("func_76613_n", "resetRelightChecks")); - mInitMap.put(new Pair<String, String>("func_76614_a", "getSavedLightValue")); - mInitMap.put(new Pair<String, String>("func_76615_h", "relightBlock")); - mInitMap.put(new Pair<String, String>("func_76616_a", "setBiomeArray")); - mInitMap.put(new Pair<String, String>("func_76617_a", "getRandomWithSeed")); - mInitMap.put(new Pair<String, String>("func_76618_a", "getEntitiesOfTypeWithinAAAB")); - mInitMap.put(new Pair<String, String>("func_76619_d", "canBlockSeeTheSky")); - mInitMap.put(new Pair<String, String>("func_76621_g", "isEmpty")); - mInitMap.put(new Pair<String, String>("func_76622_b", "removeEntity")); - mInitMap.put(new Pair<String, String>("func_76623_d", "onChunkUnload")); - mInitMap.put(new Pair<String, String>("func_76624_a", "populateChunk")); - mInitMap.put(new Pair<String, String>("func_76625_h", "getTopFilledSegment")); - mInitMap.put(new Pair<String, String>("func_76626_d", "getPrecipitationHeight")); - mInitMap.put(new Pair<String, String>("func_76628_c", "getBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_76629_c", "getBlockLightValue")); - mInitMap.put(new Pair<String, String>("func_76630_e", "setChunkModified")); - mInitMap.put(new Pair<String, String>("func_76631_c", "onChunkLoad")); - mInitMap.put(new Pair<String, String>("func_76632_l", "getChunkCoordIntPair")); - mInitMap.put(new Pair<String, String>("func_76633_a", "setLightValue")); - mInitMap.put(new Pair<String, String>("func_76654_b", "setExtBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_76657_c", "setExtSkylightValue")); - mInitMap.put(new Pair<String, String>("func_76658_g", "getBlockLSBArray")); - mInitMap.put(new Pair<String, String>("func_76659_c", "setBlocklightArray")); - mInitMap.put(new Pair<String, String>("func_76660_i", "getBlockMSBArray")); - mInitMap.put(new Pair<String, String>("func_76661_k", "getBlocklightArray")); - mInitMap.put(new Pair<String, String>("func_76662_d", "getYLocation")); - mInitMap.put(new Pair<String, String>("func_76663_a", "isEmpty")); - mInitMap.put(new Pair<String, String>("func_76664_a", "setBlockLSBArray")); - mInitMap.put(new Pair<String, String>("func_76665_b", "getExtBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_76666_d", "setSkylightArray")); - mInitMap.put(new Pair<String, String>("func_76667_m", "createBlockMSBArray")); - mInitMap.put(new Pair<String, String>("func_76668_b", "setBlockMetadataArray")); - mInitMap.put(new Pair<String, String>("func_76669_j", "getMetadataArray")); - mInitMap.put(new Pair<String, String>("func_76670_c", "getExtSkylightValue")); - mInitMap.put(new Pair<String, String>("func_76671_l", "getSkylightArray")); - mInitMap.put(new Pair<String, String>("func_76672_e", "removeInvalidBlocks")); - mInitMap.put(new Pair<String, String>("func_76673_a", "setBlockMSBArray")); - mInitMap.put(new Pair<String, String>("func_76674_d", "getExtBlocklightValue")); - mInitMap.put(new Pair<String, String>("func_76675_b", "getNeedsRandomTick")); - mInitMap.put(new Pair<String, String>("func_76676_h", "clearMSBArray")); - mInitMap.put(new Pair<String, String>("func_76677_d", "setExtBlocklightValue")); - mInitMap.put(new Pair<String, String>("func_76686_a", "get")); - mInitMap.put(new Pair<String, String>("func_76690_a", "convertToAnvilFormat")); - mInitMap.put(new Pair<String, String>("func_76691_a", "load")); - mInitMap.put(new Pair<String, String>("func_76704_a", "getChunkDataInputStream")); - mInitMap.put(new Pair<String, String>("func_76705_d", "outOfBounds")); - mInitMap.put(new Pair<String, String>("func_76706_a", "write")); - mInitMap.put(new Pair<String, String>("func_76707_e", "getOffset")); - mInitMap.put(new Pair<String, String>("func_76708_c", "close")); - mInitMap.put(new Pair<String, String>("func_76709_c", "isChunkSaved")); - mInitMap.put(new Pair<String, String>("func_76710_b", "getChunkDataOutputStream")); - mInitMap.put(new Pair<String, String>("func_76711_a", "setOffset")); - mInitMap.put(new Pair<String, String>("func_76712_a", "write")); - mInitMap.put(new Pair<String, String>("func_76713_b", "setChunkTimestamp")); - mInitMap.put(new Pair<String, String>("func_76727_i", "getFloatRainfall")); - mInitMap.put(new Pair<String, String>("func_76728_a", "decorate")); - mInitMap.put(new Pair<String, String>("func_76729_a", "createBiomeDecorator")); - mInitMap.put(new Pair<String, String>("func_76730_b", "getRandomWorldGenForGrass")); - mInitMap.put(new Pair<String, String>("func_76731_a", "getSkyColorByTemp")); - mInitMap.put(new Pair<String, String>("func_76732_a", "setTemperatureRainfall")); - mInitMap.put(new Pair<String, String>("func_76735_a", "setBiomeName")); - mInitMap.put(new Pair<String, String>("func_76736_e", "isHighHumidity")); - mInitMap.put(new Pair<String, String>("func_76738_d", "canSpawnLightningBolt")); - mInitMap.put(new Pair<String, String>("func_76739_b", "setColor")); - mInitMap.put(new Pair<String, String>("func_76741_f", "getSpawningChance")); - mInitMap.put(new Pair<String, String>("func_76742_b", "setEnableSnow")); - mInitMap.put(new Pair<String, String>("func_76744_g", "getIntRainfall")); - mInitMap.put(new Pair<String, String>("func_76745_m", "setDisableRain")); - mInitMap.put(new Pair<String, String>("func_76746_c", "getEnableSnow")); - mInitMap.put(new Pair<String, String>("func_76747_a", "getSpawnableList")); - mInitMap.put(new Pair<String, String>("func_76793_b", "genStandardOre2")); - mInitMap.put(new Pair<String, String>("func_76795_a", "genStandardOre1")); - mInitMap.put(new Pair<String, String>("func_76797_b", "generateOres")); - mInitMap.put(new Pair<String, String>("func_76837_b", "getBiomeGenAt")); - mInitMap.put(new Pair<String, String>("func_76838_a", "cleanupCache")); - mInitMap.put(new Pair<String, String>("func_76839_e", "getCachedBiomes")); - mInitMap.put(new Pair<String, String>("func_76840_a", "getBiomeCacheBlock")); - mInitMap.put(new Pair<String, String>("func_76885_a", "getBiomeGenAt")); - mInitMap.put(new Pair<String, String>("func_76931_a", "getBiomeGenAt")); - mInitMap.put(new Pair<String, String>("func_76932_a", "getBiomesToSpawnIn")); - mInitMap.put(new Pair<String, String>("func_76933_b", "loadBlockGeneratorData")); - mInitMap.put(new Pair<String, String>("func_76935_a", "getBiomeGenAt")); - mInitMap.put(new Pair<String, String>("func_76936_a", "getRainfall")); - mInitMap.put(new Pair<String, String>("func_76937_a", "getBiomesForGeneration")); - mInitMap.put(new Pair<String, String>("func_76938_b", "cleanupCache")); - mInitMap.put(new Pair<String, String>("func_76939_a", "getTemperatureAtHeight")); - mInitMap.put(new Pair<String, String>("func_76940_a", "areBiomesViable")); - mInitMap.put(new Pair<String, String>("func_76975_c", "renderShadow")); - mInitMap.put(new Pair<String, String>("func_76976_a", "setRenderManager")); - mInitMap.put(new Pair<String, String>("func_76977_a", "renderEntityOnFire")); - mInitMap.put(new Pair<String, String>("func_76978_a", "renderOffsetAABB")); - mInitMap.put(new Pair<String, String>("func_76979_b", "doRenderShadowAndFire")); - mInitMap.put(new Pair<String, String>("func_76980_a", "renderAABB")); - mInitMap.put(new Pair<String, String>("func_76982_b", "getWorldFromRenderManager")); - mInitMap.put(new Pair<String, String>("func_76983_a", "getFontRendererFromRenderManager")); - mInitMap.put(new Pair<String, String>("func_76986_a", "doRender")); - mInitMap.put(new Pair<String, String>("func_77015_a", "renderItemIntoGUI")); - mInitMap.put(new Pair<String, String>("func_77017_a", "renderQuad")); - mInitMap.put(new Pair<String, String>("func_77018_a", "renderGlint")); - mInitMap.put(new Pair<String, String>("func_77020_a", "renderDroppedItem")); - mInitMap.put(new Pair<String, String>("func_77021_b", "renderItemOverlayIntoGUI")); - mInitMap.put(new Pair<String, String>("func_77026_a", "renderEntity")); - mInitMap.put(new Pair<String, String>("func_77029_c", "renderEquippedItems")); - mInitMap.put(new Pair<String, String>("func_77030_a", "getColorMultiplier")); - mInitMap.put(new Pair<String, String>("func_77032_a", "shouldRenderPass")); - mInitMap.put(new Pair<String, String>("func_77033_b", "passSpecialRender")); - mInitMap.put(new Pair<String, String>("func_77034_a", "interpolateRotation")); - mInitMap.put(new Pair<String, String>("func_77035_b", "inheritRenderPass")); - mInitMap.put(new Pair<String, String>("func_77036_a", "renderModel")); - mInitMap.put(new Pair<String, String>("func_77037_a", "getDeathMaxRotation")); - mInitMap.put(new Pair<String, String>("func_77039_a", "renderLivingAt")); - mInitMap.put(new Pair<String, String>("func_77040_d", "getSwingProgress")); - mInitMap.put(new Pair<String, String>("func_77041_b", "preRenderCallback")); - mInitMap.put(new Pair<String, String>("func_77042_a", "setRenderPassModel")); - mInitMap.put(new Pair<String, String>("func_77043_a", "rotateCorpse")); - mInitMap.put(new Pair<String, String>("func_77044_a", "handleRotationFloat")); - mInitMap.put(new Pair<String, String>("func_77124_a", "setCanBeCreated")); - mInitMap.put(new Pair<String, String>("func_77125_e", "isVersioned")); - mInitMap.put(new Pair<String, String>("func_77126_d", "getCanBeCreated")); - mInitMap.put(new Pair<String, String>("func_77127_a", "getWorldTypeName")); - mInitMap.put(new Pair<String, String>("func_77128_b", "getTranslateName")); - mInitMap.put(new Pair<String, String>("func_77129_f", "setVersioned")); - mInitMap.put(new Pair<String, String>("func_77130_a", "parseWorldType")); - mInitMap.put(new Pair<String, String>("func_77131_c", "getGeneratorVersion")); - mInitMap.put(new Pair<String, String>("func_77132_a", "getWorldTypeForGeneratorVersion")); - mInitMap.put(new Pair<String, String>("func_77142_a", "getByName")); - mInitMap.put(new Pair<String, String>("func_77144_e", "isSurvivalOrAdventure")); - mInitMap.put(new Pair<String, String>("func_77145_d", "isCreative")); - mInitMap.put(new Pair<String, String>("func_77146_a", "getByID")); - mInitMap.put(new Pair<String, String>("func_77147_a", "configurePlayerCapabilities")); - mInitMap.put(new Pair<String, String>("func_77148_a", "getID")); - mInitMap.put(new Pair<String, String>("func_77149_b", "getName")); - mInitMap.put(new Pair<String, String>("func_77158_f", "getHardcoreEnabled")); - mInitMap.put(new Pair<String, String>("func_77159_a", "enableBonusChest")); - mInitMap.put(new Pair<String, String>("func_77160_d", "getSeed")); - mInitMap.put(new Pair<String, String>("func_77161_a", "getGameTypeById")); - mInitMap.put(new Pair<String, String>("func_77162_e", "getGameType")); - mInitMap.put(new Pair<String, String>("func_77163_i", "areCommandsAllowed")); - mInitMap.put(new Pair<String, String>("func_77164_g", "isMapFeaturesEnabled")); - mInitMap.put(new Pair<String, String>("func_77165_h", "getTerrainType")); - mInitMap.put(new Pair<String, String>("func_77166_b", "enableCommands")); - mInitMap.put(new Pair<String, String>("func_77167_c", "isBonusChestEnabled")); - mInitMap.put(new Pair<String, String>("func_77176_a", "setScheduledTime")); - mInitMap.put(new Pair<String, String>("func_77184_b", "placeInExistingPortal")); - mInitMap.put(new Pair<String, String>("func_77185_a", "placeInPortal")); - mInitMap.put(new Pair<String, String>("func_77190_a", "canCreatureTypeSpawnAtLocation")); - mInitMap.put(new Pair<String, String>("func_77191_a", "performWorldGenSpawning")); - mInitMap.put(new Pair<String, String>("func_77192_a", "findChunksForSpawning")); - mInitMap.put(new Pair<String, String>("func_77201_a", "readRecipiesFromTags")); - mInitMap.put(new Pair<String, String>("func_77202_a", "getRecipiesAsTags")); - mInitMap.put(new Pair<String, String>("func_77203_a", "canRecipeBeUsed")); - mInitMap.put(new Pair<String, String>("func_77205_a", "addToListWithCheck")); - mInitMap.put(new Pair<String, String>("func_77272_a", "chunkXZ2Int")); - mInitMap.put(new Pair<String, String>("func_77273_a", "getCenterXPos")); - mInitMap.put(new Pair<String, String>("func_77274_b", "getCenterZPosition")); - mInitMap.put(new Pair<String, String>("func_77278_a", "doExplosionA")); - mInitMap.put(new Pair<String, String>("func_77279_a", "doExplosionB")); - mInitMap.put(new Pair<String, String>("func_77316_c", "getTranslatedName")); - mInitMap.put(new Pair<String, String>("func_77317_b", "getMaxEnchantability")); - mInitMap.put(new Pair<String, String>("func_77318_a", "calcModifierDamage")); - mInitMap.put(new Pair<String, String>("func_77319_d", "getMinLevel")); - mInitMap.put(new Pair<String, String>("func_77320_a", "getName")); - mInitMap.put(new Pair<String, String>("func_77321_a", "getMinEnchantability")); - mInitMap.put(new Pair<String, String>("func_77322_b", "setName")); - mInitMap.put(new Pair<String, String>("func_77324_c", "getWeight")); - mInitMap.put(new Pair<String, String>("func_77325_b", "getMaxLevel")); - mInitMap.put(new Pair<String, String>("func_77326_a", "canApplyTogether")); - mInitMap.put(new Pair<String, String>("func_77390_a", "readFromTags")); - mInitMap.put(new Pair<String, String>("func_77391_b", "hasSameItemsAs")); - mInitMap.put(new Pair<String, String>("func_77393_a", "hasSameIDsAs")); - mInitMap.put(new Pair<String, String>("func_77394_a", "getItemToBuy")); - mInitMap.put(new Pair<String, String>("func_77395_g", "writeToTags")); - mInitMap.put(new Pair<String, String>("func_77396_b", "getSecondItemToBuy")); - mInitMap.put(new Pair<String, String>("func_77397_d", "getItemToSell")); - mInitMap.put(new Pair<String, String>("func_77398_c", "hasSecondItemToBuy")); - mInitMap.put(new Pair<String, String>("func_77399_f", "incrementToolUses")); - mInitMap.put(new Pair<String, String>("func_77442_b", "canUnlockAchievement")); - mInitMap.put(new Pair<String, String>("func_77443_a", "hasAchievementUnlocked")); - mInitMap.put(new Pair<String, String>("func_77444_a", "writeStat")); - mInitMap.put(new Pair<String, String>("func_77466_a", "getFoliageColorPine")); - mInitMap.put(new Pair<String, String>("func_77467_a", "setFoliageBiomeColorizer")); - mInitMap.put(new Pair<String, String>("func_77468_c", "getFoliageColorBasic")); - mInitMap.put(new Pair<String, String>("func_77469_b", "getFoliageColorBirch")); - mInitMap.put(new Pair<String, String>("func_77470_a", "getFoliageColor")); - mInitMap.put(new Pair<String, String>("func_77472_b", "setClientActiveTexture")); - mInitMap.put(new Pair<String, String>("func_77473_a", "setActiveTexture")); - mInitMap.put(new Pair<String, String>("func_77474_a", "initializeTextures")); - mInitMap.put(new Pair<String, String>("func_77475_a", "setLightmapTextureCoords")); - mInitMap.put(new Pair<String, String>("func_77479_a", "setGrassBiomeColorizer")); - mInitMap.put(new Pair<String, String>("func_77480_a", "getGrassColor")); - mInitMap.put(new Pair<String, String>("func_77487_a", "getServerMotd")); - mInitMap.put(new Pair<String, String>("func_77488_b", "getServerIpPort")); - mInitMap.put(new Pair<String, String>("func_77489_c", "updateLastSeen")); - mInitMap.put(new Pair<String, String>("func_77493_a", "calculateModifier")); - mInitMap.put(new Pair<String, String>("func_77501_a", "getRespiration")); - mInitMap.put(new Pair<String, String>("func_77502_d", "getSilkTouchModifier")); - mInitMap.put(new Pair<String, String>("func_77504_a", "addRandomEnchantment")); - mInitMap.put(new Pair<String, String>("func_77505_b", "mapEnchantmentData")); - mInitMap.put(new Pair<String, String>("func_77506_a", "getEnchantmentLevel")); - mInitMap.put(new Pair<String, String>("func_77507_b", "getKnockbackModifier")); - mInitMap.put(new Pair<String, String>("func_77508_a", "getEnchantmentModifierDamage")); - mInitMap.put(new Pair<String, String>("func_77509_b", "getEfficiencyModifier")); - mInitMap.put(new Pair<String, String>("func_77510_g", "getAquaAffinityModifier")); - mInitMap.put(new Pair<String, String>("func_77511_a", "getMaxEnchantmentLevel")); - mInitMap.put(new Pair<String, String>("func_77512_a", "getEnchantmentModifierLiving")); - mInitMap.put(new Pair<String, String>("func_77513_b", "buildEnchantmentList")); - mInitMap.put(new Pair<String, String>("func_77514_a", "calcItemStackEnchantability")); - mInitMap.put(new Pair<String, String>("func_77516_a", "applyEnchantmentModifierArray")); - mInitMap.put(new Pair<String, String>("func_77517_e", "getFortuneModifier")); - mInitMap.put(new Pair<String, String>("func_77518_a", "applyEnchantmentModifier")); - mInitMap.put(new Pair<String, String>("func_77519_f", "getLootingModifier")); - mInitMap.put(new Pair<String, String>("func_77523_b", "getAdFromPingResponse")); - mInitMap.put(new Pair<String, String>("func_77524_a", "getMotdFromPingResponse")); - mInitMap.put(new Pair<String, String>("func_77525_a", "getPingResponse")); - mInitMap.put(new Pair<String, String>("func_77552_b", "setWasNotUpdated")); - mInitMap.put(new Pair<String, String>("func_77553_a", "getWasUpdated")); - mInitMap.put(new Pair<String, String>("func_77554_c", "getLanServers")); - mInitMap.put(new Pair<String, String>("func_77557_a", "canEnchantItem")); - mInitMap.put(new Pair<String, String>("func_77569_a", "matches")); - mInitMap.put(new Pair<String, String>("func_77570_a", "getRecipeSize")); - mInitMap.put(new Pair<String, String>("func_77571_b", "getRecipeOutput")); - mInitMap.put(new Pair<String, String>("func_77572_b", "getCraftingResult")); - mInitMap.put(new Pair<String, String>("func_77573_a", "checkMatch")); - mInitMap.put(new Pair<String, String>("func_77583_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77586_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77589_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77590_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77592_b", "getRecipeList")); - mInitMap.put(new Pair<String, String>("func_77594_a", "getInstance")); - mInitMap.put(new Pair<String, String>("func_77596_b", "addShapelessRecipe")); - mInitMap.put(new Pair<String, String>("func_77599_b", "getSmeltingList")); - mInitMap.put(new Pair<String, String>("func_77602_a", "instance")); - mInitMap.put(new Pair<String, String>("func_77607_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77608_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77609_a", "addRecipes")); - mInitMap.put(new Pair<String, String>("func_77612_l", "getMaxDurability")); - mInitMap.put(new Pair<String, String>("func_77613_e", "getRarity")); - mInitMap.put(new Pair<String, String>("func_77614_k", "getHasSubtypes")); - mInitMap.put(new Pair<String, String>("func_77615_a", "onPlayerStoppedUsing")); - mInitMap.put(new Pair<String, String>("func_77616_k", "isItemTool")); - mInitMap.put(new Pair<String, String>("func_77617_a", "getIconFromDamage")); - mInitMap.put(new Pair<String, String>("func_77618_c", "getIconFromDamageForRenderPass")); - mInitMap.put(new Pair<String, String>("func_77619_b", "getItemEnchantability")); - mInitMap.put(new Pair<String, String>("func_77620_a", "getColorFromDamage")); - mInitMap.put(new Pair<String, String>("func_77621_a", "getMovingObjectPositionFromPlayer")); - mInitMap.put(new Pair<String, String>("func_77622_d", "onCreated")); - mInitMap.put(new Pair<String, String>("func_77623_v", "requiresMultipleRenderPasses")); - mInitMap.put(new Pair<String, String>("func_77624_a", "addInformation")); - mInitMap.put(new Pair<String, String>("func_77625_d", "setMaxStackSize")); - mInitMap.put(new Pair<String, String>("func_77626_a", "getMaxItemUseDuration")); - mInitMap.put(new Pair<String, String>("func_77627_a", "setHasSubtypes")); - mInitMap.put(new Pair<String, String>("func_77629_n_", "shouldRotateAroundWhenRendering")); - mInitMap.put(new Pair<String, String>("func_77630_h", "doesContainerItemLeaveCraftingGrid")); - mInitMap.put(new Pair<String, String>("func_77631_c", "setPotionEffect")); - mInitMap.put(new Pair<String, String>("func_77634_r", "hasContainerItem")); - mInitMap.put(new Pair<String, String>("func_77636_d", "hasEffect")); - mInitMap.put(new Pair<String, String>("func_77637_a", "setCreativeTab")); - mInitMap.put(new Pair<String, String>("func_77639_j", "getItemStackLimit")); - mInitMap.put(new Pair<String, String>("func_77640_w", "getCreativeTab")); - mInitMap.put(new Pair<String, String>("func_77642_a", "setContainerItem")); - mInitMap.put(new Pair<String, String>("func_77643_m_", "isMap")); - mInitMap.put(new Pair<String, String>("func_77644_a", "hitEntity")); - mInitMap.put(new Pair<String, String>("func_77645_m", "isDamageable")); - mInitMap.put(new Pair<String, String>("func_77647_b", "getMetadata")); - mInitMap.put(new Pair<String, String>("func_77648_a", "onItemUse")); - mInitMap.put(new Pair<String, String>("func_77650_f", "getIconIndex")); - mInitMap.put(new Pair<String, String>("func_77651_p", "getShareTag")); - mInitMap.put(new Pair<String, String>("func_77653_i", "getItemStackDisplayName")); - mInitMap.put(new Pair<String, String>("func_77654_b", "onItemUseFinish")); - mInitMap.put(new Pair<String, String>("func_77655_b", "setUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_77656_e", "setMaxDurability")); - mInitMap.put(new Pair<String, String>("func_77657_g", "getUnlocalizedNameInefficiently")); - mInitMap.put(new Pair<String, String>("func_77658_a", "getUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_77659_a", "onItemRightClick")); - mInitMap.put(new Pair<String, String>("func_77661_b", "getItemUseAction")); - mInitMap.put(new Pair<String, String>("func_77662_d", "isFull3D")); - mInitMap.put(new Pair<String, String>("func_77663_a", "onUpdate")); - mInitMap.put(new Pair<String, String>("func_77664_n", "setFull3D")); - mInitMap.put(new Pair<String, String>("func_77667_c", "getUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_77668_q", "getContainerItem")); - mInitMap.put(new Pair<String, String>("func_77828_a", "validBookTagContents")); - mInitMap.put(new Pair<String, String>("func_77831_g", "isSplash")); - mInitMap.put(new Pair<String, String>("func_77832_l", "getEffects")); - mInitMap.put(new Pair<String, String>("func_77833_h", "isEffectInstant")); - mInitMap.put(new Pair<String, String>("func_77834_f", "getEffects")); - mInitMap.put(new Pair<String, String>("func_77840_a", "spawnCreature")); - mInitMap.put(new Pair<String, String>("func_77842_f", "getMaterialName")); - mInitMap.put(new Pair<String, String>("func_77844_a", "setPotionEffect")); - mInitMap.put(new Pair<String, String>("func_77845_h", "isWolfsFavoriteMeat")); - mInitMap.put(new Pair<String, String>("func_77848_i", "setAlwaysEdible")); - mInitMap.put(new Pair<String, String>("func_77849_c", "onFoodEaten")); - mInitMap.put(new Pair<String, String>("func_77861_e", "getToolMaterialName")); - mInitMap.put(new Pair<String, String>("func_77872_a", "updateMapData")); - mInitMap.put(new Pair<String, String>("func_77873_a", "getMapData")); - mInitMap.put(new Pair<String, String>("func_77875_a", "tryPlaceContainedLiquid")); - mInitMap.put(new Pair<String, String>("func_77906_a", "brewBitOperations")); - mInitMap.put(new Pair<String, String>("func_77907_h", "countSetFlags")); - mInitMap.put(new Pair<String, String>("func_77910_c", "isFlagSet")); - mInitMap.put(new Pair<String, String>("func_77911_a", "calcPotionLiquidColor")); - mInitMap.put(new Pair<String, String>("func_77912_a", "parsePotionEffects")); - mInitMap.put(new Pair<String, String>("func_77913_a", "applyIngredient")); - mInitMap.put(new Pair<String, String>("func_77914_a", "checkFlag")); - mInitMap.put(new Pair<String, String>("func_77916_d", "isFlagUnset")); - mInitMap.put(new Pair<String, String>("func_77917_b", "getPotionEffects")); - mInitMap.put(new Pair<String, String>("func_77942_o", "hasTagCompound")); - mInitMap.put(new Pair<String, String>("func_77943_a", "tryPlaceItemIntoWorld")); - mInitMap.put(new Pair<String, String>("func_77944_b", "copyItemStack")); - mInitMap.put(new Pair<String, String>("func_77945_a", "updateAnimation")); - mInitMap.put(new Pair<String, String>("func_77946_l", "copy")); - mInitMap.put(new Pair<String, String>("func_77948_v", "isItemEnchanted")); - mInitMap.put(new Pair<String, String>("func_77949_a", "loadItemStackFromNBT")); - mInitMap.put(new Pair<String, String>("func_77950_b", "onItemUseFinish")); - mInitMap.put(new Pair<String, String>("func_77951_h", "isItemDamaged")); - mInitMap.put(new Pair<String, String>("func_77952_i", "getCurrentDurability")); - mInitMap.put(new Pair<String, String>("func_77953_t", "getRarity")); - mInitMap.put(new Pair<String, String>("func_77954_c", "getIconIndex")); - mInitMap.put(new Pair<String, String>("func_77955_b", "writeToNBT")); - mInitMap.put(new Pair<String, String>("func_77956_u", "isItemEnchantable")); - mInitMap.put(new Pair<String, String>("func_77957_a", "useItemRightClick")); - mInitMap.put(new Pair<String, String>("func_77958_k", "getMaxDurability")); - mInitMap.put(new Pair<String, String>("func_77959_d", "isItemStackEqual")); - mInitMap.put(new Pair<String, String>("func_77960_j", "getMetadata")); - mInitMap.put(new Pair<String, String>("func_77961_a", "hitEntity")); - mInitMap.put(new Pair<String, String>("func_77962_s", "hasEffect")); - mInitMap.put(new Pair<String, String>("func_77963_c", "readFromNBT")); - mInitMap.put(new Pair<String, String>("func_77964_b", "setMetadata")); - mInitMap.put(new Pair<String, String>("func_77966_a", "addEnchantment")); - mInitMap.put(new Pair<String, String>("func_77969_a", "isItemEqual")); - mInitMap.put(new Pair<String, String>("func_77970_a", "areItemStackTagsEqual")); - mInitMap.put(new Pair<String, String>("func_77972_a", "damageItem")); - mInitMap.put(new Pair<String, String>("func_77973_b", "getItem")); - mInitMap.put(new Pair<String, String>("func_77974_b", "onPlayerStoppedUsing")); - mInitMap.put(new Pair<String, String>("func_77975_n", "getItemUseAction")); - mInitMap.put(new Pair<String, String>("func_77976_d", "getMaxStackSize")); - mInitMap.put(new Pair<String, String>("func_77977_a", "getUnlocalizedName")); - mInitMap.put(new Pair<String, String>("func_77978_p", "getTagCompound")); - mInitMap.put(new Pair<String, String>("func_77979_a", "splitStack")); - mInitMap.put(new Pair<String, String>("func_77980_a", "onCrafting")); - mInitMap.put(new Pair<String, String>("func_77981_g", "getHasSubtypes")); - mInitMap.put(new Pair<String, String>("func_77982_d", "setTagCompound")); - mInitMap.put(new Pair<String, String>("func_77983_a", "setTagInfo")); - mInitMap.put(new Pair<String, String>("func_77984_f", "isItemStackDamageable")); - mInitMap.put(new Pair<String, String>("func_77985_e", "isStackable")); - mInitMap.put(new Pair<String, String>("func_77986_q", "getEnchantmentTagList")); - mInitMap.put(new Pair<String, String>("func_77988_m", "getMaxItemUseDuration")); - mInitMap.put(new Pair<String, String>("func_77989_b", "areItemStacksEqual")); - mInitMap.put(new Pair<String, String>("func_77995_e", "getEnchantability")); - mInitMap.put(new Pair<String, String>("func_77996_d", "getHarvestLevel")); - mInitMap.put(new Pair<String, String>("func_77997_a", "getMaxUses")); - mInitMap.put(new Pair<String, String>("func_77998_b", "getEfficiencyOnProperMaterial")); - mInitMap.put(new Pair<String, String>("func_78000_c", "getDamageVsEntity")); - mInitMap.put(new Pair<String, String>("func_78013_b", "getTabLabel")); - mInitMap.put(new Pair<String, String>("func_78014_h", "setNoTitle")); - mInitMap.put(new Pair<String, String>("func_78015_f", "getBackgroundImageName")); - mInitMap.put(new Pair<String, String>("func_78016_d", "getTabIconItem")); - mInitMap.put(new Pair<String, String>("func_78017_i", "shouldHidePlayerInventory")); - mInitMap.put(new Pair<String, String>("func_78018_a", "displayAllReleventItems")); - mInitMap.put(new Pair<String, String>("func_78019_g", "drawInForegroundOfTab")); - mInitMap.put(new Pair<String, String>("func_78020_k", "getTabColumn")); - mInitMap.put(new Pair<String, String>("func_78021_a", "getTabIndex")); - mInitMap.put(new Pair<String, String>("func_78022_j", "setNoScrollbar")); - mInitMap.put(new Pair<String, String>("func_78023_l", "isTabInFirstRow")); - mInitMap.put(new Pair<String, String>("func_78024_c", "getTranslatedTabLabel")); - mInitMap.put(new Pair<String, String>("func_78025_a", "setBackgroundImageName")); - mInitMap.put(new Pair<String, String>("func_78044_b", "getDamageReductionAmount")); - mInitMap.put(new Pair<String, String>("func_78045_a", "getEnchantability")); - mInitMap.put(new Pair<String, String>("func_78046_a", "getDurability")); - mInitMap.put(new Pair<String, String>("func_78084_a", "getTextureOffset")); - mInitMap.put(new Pair<String, String>("func_78085_a", "setTextureOffset")); - mInitMap.put(new Pair<String, String>("func_78086_a", "setLivingAnimations")); - mInitMap.put(new Pair<String, String>("func_78087_a", "setRotationAngles")); - mInitMap.put(new Pair<String, String>("func_78088_a", "render")); - mInitMap.put(new Pair<String, String>("func_78110_b", "renderEars")); - mInitMap.put(new Pair<String, String>("func_78111_c", "renderCloak")); - mInitMap.put(new Pair<String, String>("func_78164_a", "renderSign")); - mInitMap.put(new Pair<String, String>("func_78214_a", "updateRotations")); - mInitMap.put(new Pair<String, String>("func_78231_a", "renderAll")); - mInitMap.put(new Pair<String, String>("func_78235_a", "flipFace")); - mInitMap.put(new Pair<String, String>("func_78236_a", "draw")); - mInitMap.put(new Pair<String, String>("func_78240_a", "setTexturePosition")); - mInitMap.put(new Pair<String, String>("func_78245_a", "render")); - mInitMap.put(new Pair<String, String>("func_78255_a", "renderStringAtPos")); - mInitMap.put(new Pair<String, String>("func_78256_a", "getStringWidth")); - mInitMap.put(new Pair<String, String>("func_78257_a", "loadGlyphTexture")); - mInitMap.put(new Pair<String, String>("func_78258_a", "renderString")); - mInitMap.put(new Pair<String, String>("func_78259_e", "sizeStringToWidth")); - mInitMap.put(new Pair<String, String>("func_78260_a", "getBidiFlag")); - mInitMap.put(new Pair<String, String>("func_78261_a", "drawStringWithShadow")); - mInitMap.put(new Pair<String, String>("func_78262_a", "trimStringToWidth")); - mInitMap.put(new Pair<String, String>("func_78263_a", "getCharWidth")); - mInitMap.put(new Pair<String, String>("func_78264_a", "setUnicodeFlag")); - mInitMap.put(new Pair<String, String>("func_78265_b", "resetStyles")); - mInitMap.put(new Pair<String, String>("func_78266_a", "renderDefaultChar")); - mInitMap.put(new Pair<String, String>("func_78267_b", "splitStringWidth")); - mInitMap.put(new Pair<String, String>("func_78268_b", "renderSplitString")); - mInitMap.put(new Pair<String, String>("func_78269_a", "trimStringToWidth")); - mInitMap.put(new Pair<String, String>("func_78270_c", "isFormatSpecial")); - mInitMap.put(new Pair<String, String>("func_78271_c", "listFormattedStringToWidth")); - mInitMap.put(new Pair<String, String>("func_78272_b", "isFormatColor")); - mInitMap.put(new Pair<String, String>("func_78273_d", "trimStringmInitMap.put(newline")); - mInitMap.put(new Pair<String, String>("func_78274_b", "renderStringAligned")); - mInitMap.put(new Pair<String, String>("func_78275_b", "setBidiFlag")); - mInitMap.put(new Pair<String, String>("func_78276_b", "drawString")); - mInitMap.put(new Pair<String, String>("func_78277_a", "renderUnicodeChar")); - mInitMap.put(new Pair<String, String>("func_78278_a", "renderCharAtPos")); - mInitMap.put(new Pair<String, String>("func_78279_b", "drawSplitString")); - mInitMap.put(new Pair<String, String>("func_78280_d", "wrapFormattedStringToWidth")); - mInitMap.put(new Pair<String, String>("func_78282_e", "getFormatFromString")); - mInitMap.put(new Pair<String, String>("func_78324_d", "getScaledHeight_double")); - mInitMap.put(new Pair<String, String>("func_78325_e", "getScaleFactor")); - mInitMap.put(new Pair<String, String>("func_78326_a", "getScaledWidth")); - mInitMap.put(new Pair<String, String>("func_78327_c", "getScaledWidth_double")); - mInitMap.put(new Pair<String, String>("func_78328_b", "getScaledHeight")); - mInitMap.put(new Pair<String, String>("func_78369_a", "setColorRGBA_F")); - mInitMap.put(new Pair<String, String>("func_78370_a", "setColorRGBA")); - mInitMap.put(new Pair<String, String>("func_78371_b", "startDrawing")); - mInitMap.put(new Pair<String, String>("func_78372_c", "addTranslation")); - mInitMap.put(new Pair<String, String>("func_78373_b", "setTranslation")); - mInitMap.put(new Pair<String, String>("func_78374_a", "addVertexWithUV")); - mInitMap.put(new Pair<String, String>("func_78375_b", "setNormal")); - mInitMap.put(new Pair<String, String>("func_78376_a", "setColorOpaque")); - mInitMap.put(new Pair<String, String>("func_78377_a", "addVertex")); - mInitMap.put(new Pair<String, String>("func_78378_d", "setColorOpaque_I")); - mInitMap.put(new Pair<String, String>("func_78379_d", "reset")); - mInitMap.put(new Pair<String, String>("func_78380_c", "setBrightness")); - mInitMap.put(new Pair<String, String>("func_78381_a", "draw")); - mInitMap.put(new Pair<String, String>("func_78382_b", "startDrawingQuads")); - mInitMap.put(new Pair<String, String>("func_78383_c", "disableColor")); - mInitMap.put(new Pair<String, String>("func_78384_a", "setColorRGBA_I")); - mInitMap.put(new Pair<String, String>("func_78385_a", "setTextureUV")); - mInitMap.put(new Pair<String, String>("func_78386_a", "setColorOpaque_F")); - mInitMap.put(new Pair<String, String>("func_78418_a", "rendersChunk")); - mInitMap.put(new Pair<String, String>("func_78419_a", "callLists")); - mInitMap.put(new Pair<String, String>("func_78420_a", "addGLRenderList")); - mInitMap.put(new Pair<String, String>("func_78421_b", "resetList")); - mInitMap.put(new Pair<String, String>("func_78422_a", "setupRenderList")); - mInitMap.put(new Pair<String, String>("func_78432_a", "parseUserSkin")); - mInitMap.put(new Pair<String, String>("func_78433_b", "setAreaOpaque")); - mInitMap.put(new Pair<String, String>("func_78434_a", "setAreaTransparent")); - mInitMap.put(new Pair<String, String>("func_78435_c", "hasTransparency")); - mInitMap.put(new Pair<String, String>("func_78439_a", "renderItemIn2D")); - mInitMap.put(new Pair<String, String>("func_78440_a", "renderItemInFirstPerson")); - mInitMap.put(new Pair<String, String>("func_78441_a", "updateEquippedItem")); - mInitMap.put(new Pair<String, String>("func_78442_d", "renderFireInFirstPerson")); - mInitMap.put(new Pair<String, String>("func_78443_a", "renderItem")); - mInitMap.put(new Pair<String, String>("func_78444_b", "resetEquippedProgress")); - mInitMap.put(new Pair<String, String>("func_78445_c", "resetEquippedProgress2")); - mInitMap.put(new Pair<String, String>("func_78446_a", "renderInsideOfBlock")); - mInitMap.put(new Pair<String, String>("func_78447_b", "renderOverlays")); - mInitMap.put(new Pair<String, String>("func_78448_c", "renderWaterOverlayTexture")); - mInitMap.put(new Pair<String, String>("func_78463_b", "enableLightmap")); - mInitMap.put(new Pair<String, String>("func_78464_a", "updateRenderer")); - mInitMap.put(new Pair<String, String>("func_78466_h", "updateFogColor")); - mInitMap.put(new Pair<String, String>("func_78467_g", "orientCamera")); - mInitMap.put(new Pair<String, String>("func_78468_a", "setupFog")); - mInitMap.put(new Pair<String, String>("func_78469_a", "setFogColorBuffer")); - mInitMap.put(new Pair<String, String>("func_78470_f", "updateTorchFlicker")); - mInitMap.put(new Pair<String, String>("func_78471_a", "renderWorld")); - mInitMap.put(new Pair<String, String>("func_78472_g", "updateLightmap")); - mInitMap.put(new Pair<String, String>("func_78473_a", "getMouseOver")); - mInitMap.put(new Pair<String, String>("func_78474_d", "renderRainSnow")); - mInitMap.put(new Pair<String, String>("func_78475_f", "setupViewBobbing")); - mInitMap.put(new Pair<String, String>("func_78476_b", "renderHand")); - mInitMap.put(new Pair<String, String>("func_78477_e", "updateFovModifierHand")); - mInitMap.put(new Pair<String, String>("func_78478_c", "setupOverlayRendering")); - mInitMap.put(new Pair<String, String>("func_78479_a", "setupCameraTransform")); - mInitMap.put(new Pair<String, String>("func_78480_b", "updateCameraAndRender")); - mInitMap.put(new Pair<String, String>("func_78481_a", "getFOVModifier")); - mInitMap.put(new Pair<String, String>("func_78482_e", "hurtCameraEffect")); - mInitMap.put(new Pair<String, String>("func_78483_a", "disableLightmap")); - mInitMap.put(new Pair<String, String>("func_78484_h", "addRainParticles")); - mInitMap.put(new Pair<String, String>("func_78546_a", "isBoundingBoxInFrustum")); - mInitMap.put(new Pair<String, String>("func_78547_a", "setPosition")); - mInitMap.put(new Pair<String, String>("func_78548_b", "isBoxInFrustum")); - mInitMap.put(new Pair<String, String>("func_78553_b", "isBoxInFrustum")); - mInitMap.put(new Pair<String, String>("func_78558_a", "getInstance")); - mInitMap.put(new Pair<String, String>("func_78559_a", "normalize")); - mInitMap.put(new Pair<String, String>("func_78560_b", "init")); - mInitMap.put(new Pair<String, String>("func_78713_a", "getEntityRenderObject")); - mInitMap.put(new Pair<String, String>("func_78714_a", "getDistanceToCamera")); - mInitMap.put(new Pair<String, String>("func_78715_a", "getEntityClassRenderObject")); - mInitMap.put(new Pair<String, String>("func_78716_a", "getFontRenderer")); - mInitMap.put(new Pair<String, String>("func_78717_a", "set")); - mInitMap.put(new Pair<String, String>("func_78738_b", "createNextComponentRandom")); - mInitMap.put(new Pair<String, String>("func_78743_b", "clickBlock")); - mInitMap.put(new Pair<String, String>("func_78744_a", "clickBlockCreative")); - mInitMap.put(new Pair<String, String>("func_78745_b", "flipPlayer")); - mInitMap.put(new Pair<String, String>("func_78746_a", "setGameType")); - mInitMap.put(new Pair<String, String>("func_78747_a", "enableEverythingIsScrewedUpMode")); - mInitMap.put(new Pair<String, String>("func_78748_a", "setPlayerCapabilities")); - mInitMap.put(new Pair<String, String>("func_78749_i", "extendedReach")); - mInitMap.put(new Pair<String, String>("func_78750_j", "syncCurrentPlayItem")); - mInitMap.put(new Pair<String, String>("func_78751_a", "onPlayerDestroyBlock")); - mInitMap.put(new Pair<String, String>("func_78752_a", "sendPacketDropItem")); - mInitMap.put(new Pair<String, String>("func_78753_a", "windowClick")); - mInitMap.put(new Pair<String, String>("func_78755_b", "shouldDrawHUD")); - mInitMap.put(new Pair<String, String>("func_78756_a", "sendEnchantPacket")); - mInitMap.put(new Pair<String, String>("func_78757_d", "getBlockReachDistance")); - mInitMap.put(new Pair<String, String>("func_78758_h", "isInCreativeMode")); - mInitMap.put(new Pair<String, String>("func_78759_c", "onPlayerDamageBlock")); - mInitMap.put(new Pair<String, String>("func_78760_a", "onPlayerRightClick")); - mInitMap.put(new Pair<String, String>("func_78761_a", "sendSlotPacket")); - mInitMap.put(new Pair<String, String>("func_78762_g", "isNotCreative")); - mInitMap.put(new Pair<String, String>("func_78763_f", "gameIsSurvivalOrAdventure")); - mInitMap.put(new Pair<String, String>("func_78764_a", "attackEntity")); - mInitMap.put(new Pair<String, String>("func_78765_e", "updateController")); - mInitMap.put(new Pair<String, String>("func_78766_c", "onStoppedUsingItem")); - mInitMap.put(new Pair<String, String>("func_78767_c", "resetBlockRemoving")); - mInitMap.put(new Pair<String, String>("func_78768_b", "interactWithEntitySendPacket")); - mInitMap.put(new Pair<String, String>("func_78769_a", "sendUseItem")); - mInitMap.put(new Pair<String, String>("func_78784_a", "setTextureOffset")); - mInitMap.put(new Pair<String, String>("func_78785_a", "render")); - mInitMap.put(new Pair<String, String>("func_78786_a", "addBox")); - mInitMap.put(new Pair<String, String>("func_78787_b", "setTextureSize")); - mInitMap.put(new Pair<String, String>("func_78788_d", "compileDisplayList")); - mInitMap.put(new Pair<String, String>("func_78789_a", "addBox")); - mInitMap.put(new Pair<String, String>("func_78790_a", "addBox")); - mInitMap.put(new Pair<String, String>("func_78791_b", "renderWithRotation")); - mInitMap.put(new Pair<String, String>("func_78792_a", "addChild")); - mInitMap.put(new Pair<String, String>("func_78793_a", "setRotationPoint")); - mInitMap.put(new Pair<String, String>("func_78794_c", "postRender")); - mInitMap.put(new Pair<String, String>("func_78815_a", "getRandomComponent")); - mInitMap.put(new Pair<String, String>("func_78817_b", "getNextMineShaftComponent")); - mInitMap.put(new Pair<String, String>("func_78836_a", "getNBTCompound")); - mInitMap.put(new Pair<String, String>("func_78837_a", "getServerDataFromNBTCompound")); - mInitMap.put(new Pair<String, String>("func_78849_a", "addServerData")); - mInitMap.put(new Pair<String, String>("func_78850_a", "getServerData")); - mInitMap.put(new Pair<String, String>("func_78851_b", "removeServerData")); - mInitMap.put(new Pair<String, String>("func_78853_a", "loadServerList")); - mInitMap.put(new Pair<String, String>("func_78855_b", "saveServerList")); - mInitMap.put(new Pair<String, String>("func_78856_c", "countServers")); - mInitMap.put(new Pair<String, String>("func_78857_a", "swapServers")); - mInitMap.put(new Pair<String, String>("func_78861_a", "getIP")); - mInitMap.put(new Pair<String, String>("func_78862_a", "parseIntWithDefault")); - mInitMap.put(new Pair<String, String>("func_78863_b", "getServerAddress")); - mInitMap.put(new Pair<String, String>("func_78864_b", "getPort")); - mInitMap.put(new Pair<String, String>("func_78867_a", "addBlockHitEffects")); - mInitMap.put(new Pair<String, String>("func_78868_a", "updateEffects")); - mInitMap.put(new Pair<String, String>("func_78869_b", "getStatistics")); - mInitMap.put(new Pair<String, String>("func_78870_a", "clearEffects")); - mInitMap.put(new Pair<String, String>("func_78872_b", "renderLitParticles")); - mInitMap.put(new Pair<String, String>("func_78873_a", "addEffect")); - mInitMap.put(new Pair<String, String>("func_78874_a", "renderParticles")); - mInitMap.put(new Pair<String, String>("func_78879_f", "getCenterY")); - mInitMap.put(new Pair<String, String>("func_78880_d", "getZSize")); - mInitMap.put(new Pair<String, String>("func_78881_e", "getCenterX")); - mInitMap.put(new Pair<String, String>("func_78882_c", "getYSize")); - mInitMap.put(new Pair<String, String>("func_78883_b", "getXSize")); - mInitMap.put(new Pair<String, String>("func_78884_a", "intersectsWith")); - mInitMap.put(new Pair<String, String>("func_78885_a", "intersectsWith")); - mInitMap.put(new Pair<String, String>("func_78886_a", "offset")); - mInitMap.put(new Pair<String, String>("func_78887_a", "getmInitMap.put(newBoundingBox")); - mInitMap.put(new Pair<String, String>("func_78888_b", "expandTo")); - mInitMap.put(new Pair<String, String>("func_78889_a", "getComponentToAddBoundingBox")); - mInitMap.put(new Pair<String, String>("func_78890_b", "isVecInside")); - mInitMap.put(new Pair<String, String>("func_78891_g", "getCenterZ")); - mInitMap.put(new Pair<String, String>("func_78898_a", "updatePlayerMoveState")); - mInitMap.put(new Pair<String, String>("func_78904_d", "callOcclusionQueryList")); - mInitMap.put(new Pair<String, String>("func_78905_g", "setupGLTranslation")); - mInitMap.put(new Pair<String, String>("func_78906_e", "skipAllRenderPasses")); - mInitMap.put(new Pair<String, String>("func_78908_a", "updateInFrustum")); - mInitMap.put(new Pair<String, String>("func_78909_a", "getGLCallListForPass")); - mInitMap.put(new Pair<String, String>("func_78910_b", "setDontDraw")); - mInitMap.put(new Pair<String, String>("func_78911_c", "stopRendering")); - mInitMap.put(new Pair<String, String>("func_78912_a", "distanceToEntitySquared")); - mInitMap.put(new Pair<String, String>("func_78913_a", "setPosition")); - mInitMap.put(new Pair<String, String>("func_78914_f", "markDirty")); - mInitMap.put(new Pair<String, String>("func_80003_ah", "getPlayerUsageSnooper")); - mInitMap.put(new Pair<String, String>("func_80006_f", "getUniqueID")); - mInitMap.put(new Pair<String, String>("func_80007_l", "getDimensionName")); - mInitMap.put(new Pair<String, String>("func_82114_b", "getCommandSenderPosition")); - mInitMap.put(new Pair<String, String>("func_82141_a", "copyDataFrom")); - mInitMap.put(new Pair<String, String>("func_82142_c", "setInvisible")); - mInitMap.put(new Pair<String, String>("func_82143_as", "getMaxFallHeight")); - mInitMap.put(new Pair<String, String>("func_82145_z", "getMaxInPortalTime")); - mInitMap.put(new Pair<String, String>("func_82147_ab", "getPortalCooldown")); - mInitMap.put(new Pair<String, String>("func_82148_at", "getTeleportDirection")); - mInitMap.put(new Pair<String, String>("func_82149_j", "copyLocationAndAnglesFrom")); - mInitMap.put(new Pair<String, String>("func_82150_aj", "isInvisible")); - mInitMap.put(new Pair<String, String>("func_82159_b", "getArmorPosition")); - mInitMap.put(new Pair<String, String>("func_82160_b", "dropEquipment")); - mInitMap.put(new Pair<String, String>("func_82161_a", "getArmorItemForSlot")); - mInitMap.put(new Pair<String, String>("func_82162_bC", "enchantEquipment")); - mInitMap.put(new Pair<String, String>("func_82164_bB", "addRandomArmor")); - mInitMap.put(new Pair<String, String>("func_82165_m", "isPotionActive")); - mInitMap.put(new Pair<String, String>("func_82166_i", "getArmSwingAnimationEnd")); - mInitMap.put(new Pair<String, String>("func_82167_n", "collideWithEntity")); - mInitMap.put(new Pair<String, String>("func_82168_bl", "updateArmSwingProgress")); - mInitMap.put(new Pair<String, String>("func_82169_q", "getCurrentArmor")); - mInitMap.put(new Pair<String, String>("func_82170_o", "removePotionEffect")); - mInitMap.put(new Pair<String, String>("func_82171_bF", "canBeSteered")); - mInitMap.put(new Pair<String, String>("func_82183_n", "getAIControlledByPlayer")); - mInitMap.put(new Pair<String, String>("func_82185_r", "setCollarColor")); - mInitMap.put(new Pair<String, String>("func_82186_bH", "getCollarColor")); - mInitMap.put(new Pair<String, String>("func_82187_q", "setLookingForHome")); - mInitMap.put(new Pair<String, String>("func_82188_j", "adjustProbability")); - mInitMap.put(new Pair<String, String>("func_82196_d", "attackEntityWithRangedAttack")); - mInitMap.put(new Pair<String, String>("func_82197_f", "setAggressive")); - mInitMap.put(new Pair<String, String>("func_82198_m", "getAggressive")); - mInitMap.put(new Pair<String, String>("func_82201_a", "setSkeletonType")); - mInitMap.put(new Pair<String, String>("func_82202_m", "getSkeletonType")); - mInitMap.put(new Pair<String, String>("func_82203_t", "getWatchedTargetId")); - mInitMap.put(new Pair<String, String>("func_82205_o", "isArmored")); - mInitMap.put(new Pair<String, String>("func_82209_a", "launchWitherSkullToCoords")); - mInitMap.put(new Pair<String, String>("func_82212_n", "getInvulTime")); - mInitMap.put(new Pair<String, String>("func_82215_s", "setInvulTime")); - mInitMap.put(new Pair<String, String>("func_82216_a", "launchWitherSkullToEntity")); - mInitMap.put(new Pair<String, String>("func_82227_f", "setChild")); - mInitMap.put(new Pair<String, String>("func_82228_a", "startConversion")); - mInitMap.put(new Pair<String, String>("func_82229_g", "setVillager")); - mInitMap.put(new Pair<String, String>("func_82230_o", "isConverting")); - mInitMap.put(new Pair<String, String>("func_82231_m", "isVillager")); - mInitMap.put(new Pair<String, String>("func_82232_p", "convertToVillager")); - mInitMap.put(new Pair<String, String>("func_82233_q", "getConversionTimeBoost")); - mInitMap.put(new Pair<String, String>("func_82235_h", "getIsBatHanging")); - mInitMap.put(new Pair<String, String>("func_82236_f", "setIsBatHanging")); - mInitMap.put(new Pair<String, String>("func_82238_cc", "getHideCape")); - mInitMap.put(new Pair<String, String>("func_82239_b", "setHideCape")); - mInitMap.put(new Pair<String, String>("func_82241_s", "getHideCape")); - mInitMap.put(new Pair<String, String>("func_82242_a", "addExperienceLevel")); - mInitMap.put(new Pair<String, String>("func_82243_bO", "getArmorVisibility")); - mInitMap.put(new Pair<String, String>("func_82244_d", "displayGUIAnvil")); - mInitMap.put(new Pair<String, String>("func_82245_bX", "isSpawnForced")); - mInitMap.put(new Pair<String, String>("func_82246_f", "isCurrentToolAdventureModeExempt")); - mInitMap.put(new Pair<String, String>("func_82247_a", "canPlayerEdit")); - mInitMap.put(new Pair<String, String>("func_82328_a", "setDirection")); - mInitMap.put(new Pair<String, String>("func_82329_d", "getWidthPixels")); - mInitMap.put(new Pair<String, String>("func_82330_g", "getHeightPixels")); - mInitMap.put(new Pair<String, String>("func_82333_j", "getRotation")); - mInitMap.put(new Pair<String, String>("func_82334_a", "setDisplayedItem")); - mInitMap.put(new Pair<String, String>("func_82335_i", "getDisplayedItem")); - mInitMap.put(new Pair<String, String>("func_82336_g", "setItemRotation")); - mInitMap.put(new Pair<String, String>("func_82338_g", "setAlphaF")); - mInitMap.put(new Pair<String, String>("func_82340_a", "setPotionDamage")); - mInitMap.put(new Pair<String, String>("func_82341_c", "getMotionFactor")); - mInitMap.put(new Pair<String, String>("func_82342_d", "isInvulnerable")); - mInitMap.put(new Pair<String, String>("func_82343_e", "setInvulnerable")); - mInitMap.put(new Pair<String, String>("func_82356_Z", "isCommandBlockEnabled")); - mInitMap.put(new Pair<String, String>("func_82357_ak", "getSpawnProtectionSize")); - mInitMap.put(new Pair<String, String>("func_82358_a", "isUsernameIndex")); - mInitMap.put(new Pair<String, String>("func_82359_c", "getPlayer")); - mInitMap.put(new Pair<String, String>("func_82360_a", "getStringFromNthArg")); - mInitMap.put(new Pair<String, String>("func_82362_a", "getRequiredPermissionLevel")); - mInitMap.put(new Pair<String, String>("func_82363_b", "parseDouble")); - mInitMap.put(new Pair<String, String>("func_82366_d", "getGameRules")); - mInitMap.put(new Pair<String, String>("func_82370_a", "getUsernameIndex")); - mInitMap.put(new Pair<String, String>("func_82371_e", "getDistanceSquaredToChunkCoordinates")); - mInitMap.put(new Pair<String, String>("func_82372_a", "getMovementDirection")); - mInitMap.put(new Pair<String, String>("func_82375_f", "getDefaultMinimumLevel")); - mInitMap.put(new Pair<String, String>("func_82376_e", "getDefaultMaximumLevel")); - mInitMap.put(new Pair<String, String>("func_82377_a", "matchesMultiplePlayers")); - mInitMap.put(new Pair<String, String>("func_82378_b", "hasArguments")); - mInitMap.put(new Pair<String, String>("func_82379_d", "getDefaultMaximumRange")); - mInitMap.put(new Pair<String, String>("func_82380_c", "matchPlayers")); - mInitMap.put(new Pair<String, String>("func_82381_h", "getArgumentMap")); - mInitMap.put(new Pair<String, String>("func_82382_g", "getDefaultCount")); - mInitMap.put(new Pair<String, String>("func_82383_a", "hasTheseArguments")); - mInitMap.put(new Pair<String, String>("func_82384_c", "getDefaultMinimumRange")); - mInitMap.put(new Pair<String, String>("func_82386_a", "matchOnePlayer")); - mInitMap.put(new Pair<String, String>("func_82403_a", "renderFrameItemAsBlock")); - mInitMap.put(new Pair<String, String>("func_82406_b", "renderItemAndEffectIntoGUI")); - mInitMap.put(new Pair<String, String>("func_82441_a", "renderFirstPersonArm")); - mInitMap.put(new Pair<String, String>("func_82448_a", "transferEntityToWorld")); - mInitMap.put(new Pair<String, String>("func_82449_a", "findPlayers")); - mInitMap.put(new Pair<String, String>("func_82482_a", "dispense")); - mInitMap.put(new Pair<String, String>("func_82485_a", "playDispenseSound")); - mInitMap.put(new Pair<String, String>("func_82486_a", "doDispense")); - mInitMap.put(new Pair<String, String>("func_82487_b", "dispenseStack")); - mInitMap.put(new Pair<String, String>("func_82489_a", "spawnDispenseParticles")); - mInitMap.put(new Pair<String, String>("func_82499_a", "getProjectileEntity")); - mInitMap.put(new Pair<String, String>("func_82565_a", "canEntityStandAt")); - mInitMap.put(new Pair<String, String>("func_82571_y", "getGeneratorOptions")); - mInitMap.put(new Pair<String, String>("func_82572_b", "incrementTotalWorldTime")); - mInitMap.put(new Pair<String, String>("func_82573_f", "getWorldTotalTime")); - mInitMap.put(new Pair<String, String>("func_82574_x", "getGameRulesInstance")); - mInitMap.put(new Pair<String, String>("func_82580_o", "removeTag")); - mInitMap.put(new Pair<String, String>("func_82581_a", "createCrashReport")); - mInitMap.put(new Pair<String, String>("func_82582_d", "hasNoTags")); - mInitMap.put(new Pair<String, String>("func_82594_a", "getObject")); - mInitMap.put(new Pair<String, String>("func_82595_a", "putObject")); - mInitMap.put(new Pair<String, String>("func_82599_e", "getFrontOffsetZ")); - mInitMap.put(new Pair<String, String>("func_82600_a", "getFront")); - mInitMap.put(new Pair<String, String>("func_82601_c", "getFrontOffsetX")); - mInitMap.put(new Pair<String, String>("func_82615_a", "getX")); - mInitMap.put(new Pair<String, String>("func_82616_c", "getZ")); - mInitMap.put(new Pair<String, String>("func_82617_b", "getY")); - mInitMap.put(new Pair<String, String>("func_82618_k", "getWorld")); - mInitMap.put(new Pair<String, String>("func_82620_h", "getBlockMetadata")); - mInitMap.put(new Pair<String, String>("func_82621_f", "getZInt")); - mInitMap.put(new Pair<String, String>("func_82622_e", "getYInt")); - mInitMap.put(new Pair<String, String>("func_82623_d", "getXInt")); - mInitMap.put(new Pair<String, String>("func_82632_g", "boostSpeed")); - mInitMap.put(new Pair<String, String>("func_82633_h", "isControlledByPlayer")); - mInitMap.put(new Pair<String, String>("func_82634_f", "isSpeedBoosted")); - mInitMap.put(new Pair<String, String>("func_82644_b", "getWorldFeatures")); - mInitMap.put(new Pair<String, String>("func_82647_a", "setBiome")); - mInitMap.put(new Pair<String, String>("func_82648_a", "getBiome")); - mInitMap.put(new Pair<String, String>("func_82649_e", "getDefaultFlatGenerator")); - mInitMap.put(new Pair<String, String>("func_82650_c", "getFlatLayers")); - mInitMap.put(new Pair<String, String>("func_82651_a", "createFlatGeneratorFromString")); - mInitMap.put(new Pair<String, String>("func_82656_d", "getMinY")); - mInitMap.put(new Pair<String, String>("func_82657_a", "getLayerCount")); - mInitMap.put(new Pair<String, String>("func_82658_c", "getFillBlockMeta")); - mInitMap.put(new Pair<String, String>("func_82660_d", "setMinY")); - mInitMap.put(new Pair<String, String>("func_82667_a", "getScatteredFeatureSpawnList")); - mInitMap.put(new Pair<String, String>("func_82683_b", "setDefaultPlayerReputation")); - mInitMap.put(new Pair<String, String>("func_82684_a", "getReputationForPlayer")); - mInitMap.put(new Pair<String, String>("func_82686_i", "isMatingSeason")); - mInitMap.put(new Pair<String, String>("func_82687_d", "isPlayerReputationTooLow")); - mInitMap.put(new Pair<String, String>("func_82688_a", "setReputationForPlayer")); - mInitMap.put(new Pair<String, String>("func_82689_b", "writeVillageDataToNBT")); - mInitMap.put(new Pair<String, String>("func_82690_a", "readVillageDataFromNBT")); - mInitMap.put(new Pair<String, String>("func_82692_h", "endMatingSeason")); - mInitMap.put(new Pair<String, String>("func_82695_e", "recreateStructures")); - mInitMap.put(new Pair<String, String>("func_82704_a", "isEntityApplicable")); - mInitMap.put(new Pair<String, String>("func_82705_e", "getAnimal")); - mInitMap.put(new Pair<String, String>("func_82708_h", "setObjectWatched")); - mInitMap.put(new Pair<String, String>("func_82709_a", "addObjectByDataType")); - mInitMap.put(new Pair<String, String>("func_82710_f", "getWatchableObjectItemStack")); - mInitMap.put(new Pair<String, String>("func_82712_a", "parseDoubleWithDefault")); - mInitMap.put(new Pair<String, String>("func_82713_a", "parseDoubleWithDefaultAndMax")); - mInitMap.put(new Pair<String, String>("func_82714_a", "parseIntWithDefaultAndMax")); - mInitMap.put(new Pair<String, String>("func_82715_a", "parseIntWithDefault")); - mInitMap.put(new Pair<String, String>("func_82716_a", "getRandomDoubleInRange")); - mInitMap.put(new Pair<String, String>("func_82719_a", "writeCustomPotionEffectToNBT")); - mInitMap.put(new Pair<String, String>("func_82720_e", "getIsAmbient")); - mInitMap.put(new Pair<String, String>("func_82721_a", "setSplashPotion")); - mInitMap.put(new Pair<String, String>("func_82722_b", "readCustomPotionEffectFromNBT")); - mInitMap.put(new Pair<String, String>("func_82725_o", "isMagicDamage")); - mInitMap.put(new Pair<String, String>("func_82726_p", "setMagicDamage")); - mInitMap.put(new Pair<String, String>("func_82733_a", "selectEntitiesWithinAABB")); - mInitMap.put(new Pair<String, String>("func_82734_g", "getChunkHeightMapMinimum")); - mInitMap.put(new Pair<String, String>("func_82736_K", "getGameRules")); - mInitMap.put(new Pair<String, String>("func_82737_E", "getTotalWorldTime")); - mInitMap.put(new Pair<String, String>("func_82739_e", "playBroadcastSound")); - mInitMap.put(new Pair<String, String>("func_82742_i", "resetUpdateEntityTick")); - mInitMap.put(new Pair<String, String>("func_82743_f", "getCreationCloudUpdateTick")); - mInitMap.put(new Pair<String, String>("func_82744_b", "setCloudUpdateTick")); - mInitMap.put(new Pair<String, String>("func_82746_a", "broadcastSound")); - mInitMap.put(new Pair<String, String>("func_82747_f", "getWorldTypeID")); - mInitMap.put(new Pair<String, String>("func_82750_a", "setWorldName")); - mInitMap.put(new Pair<String, String>("func_82752_c", "isAdventure")); - mInitMap.put(new Pair<String, String>("func_82753_a", "setPriority")); - mInitMap.put(new Pair<String, String>("func_82756_a", "getGameRuleStringValue")); - mInitMap.put(new Pair<String, String>("func_82757_a", "setValue")); - mInitMap.put(new Pair<String, String>("func_82758_b", "getGameRuleBooleanValue")); - mInitMap.put(new Pair<String, String>("func_82763_b", "getRules")); - mInitMap.put(new Pair<String, String>("func_82764_b", "setOrCreateGameRule")); - mInitMap.put(new Pair<String, String>("func_82765_e", "hasRule")); - mInitMap.put(new Pair<String, String>("func_82766_b", "getGameRuleBooleanValue")); - mInitMap.put(new Pair<String, String>("func_82767_a", "getGameRuleStringValue")); - mInitMap.put(new Pair<String, String>("func_82768_a", "readGameRulesFromNBT")); - mInitMap.put(new Pair<String, String>("func_82769_a", "addGameRule")); - mInitMap.put(new Pair<String, String>("func_82770_a", "writeGameRulesToNBT")); - mInitMap.put(new Pair<String, String>("func_82781_a", "getEnchantments")); - mInitMap.put(new Pair<String, String>("func_82782_a", "setEnchantments")); - mInitMap.put(new Pair<String, String>("func_82784_g", "isRecipeDisabled")); - mInitMap.put(new Pair<String, String>("func_82787_a", "findMatchingRecipe")); - mInitMap.put(new Pair<String, String>("func_82788_x", "canItemEditBlocks")); - mInitMap.put(new Pair<String, String>("func_82789_a", "getIsRepairable")); - mInitMap.put(new Pair<String, String>("func_82790_a", "getColorFromItemStack")); - mInitMap.put(new Pair<String, String>("func_82810_a", "createHangingEntity")); - mInitMap.put(new Pair<String, String>("func_82812_d", "getArmorMaterial")); - mInitMap.put(new Pair<String, String>("func_82814_b", "getColor")); - mInitMap.put(new Pair<String, String>("func_82815_c", "removeColor")); - mInitMap.put(new Pair<String, String>("func_82816_b_", "hasColor")); - mInitMap.put(new Pair<String, String>("func_82824_a", "setBossStatus")); - mInitMap.put(new Pair<String, String>("func_82829_a", "renderCloudsCheck")); - mInitMap.put(new Pair<String, String>("func_82830_a", "getNightVisionBrightness")); - mInitMap.put(new Pair<String, String>("func_82833_r", "getDisplayName")); - mInitMap.put(new Pair<String, String>("func_82835_x", "canEditBlocks")); - mInitMap.put(new Pair<String, String>("func_82836_z", "getItemFrame")); - mInitMap.put(new Pair<String, String>("func_82837_s", "hasDisplayName")); - mInitMap.put(new Pair<String, String>("func_82838_A", "getRepairCost")); - mInitMap.put(new Pair<String, String>("func_82839_y", "isOnItemFrame")); - mInitMap.put(new Pair<String, String>("func_82840_a", "getTooltip")); - mInitMap.put(new Pair<String, String>("func_82841_c", "setRepairCost")); - mInitMap.put(new Pair<String, String>("func_82842_a", "setItemFrame")); - mInitMap.put(new Pair<String, String>("func_82846_b", "transferStackInSlot")); - mInitMap.put(new Pair<String, String>("func_82847_b", "removeCraftingFromCrafters")); - mInitMap.put(new Pair<String, String>("func_82848_d", "updateRepairOutput")); - mInitMap.put(new Pair<String, String>("func_82850_a", "updateItemName")); - mInitMap.put(new Pair<String, String>("func_82869_a", "canTakeStack")); - mInitMap.put(new Pair<String, String>("func_82870_a", "onPickupFromSlot")); - mInitMap.put(new Pair<String, String>("func_82877_b", "setPlayerWalkSpeed")); - mInitMap.put(new Pair<String, String>("func_82879_c", "sendSettingsToServer")); - mInitMap.put(new Pair<String, String>("func_82883_a", "getUnicodeFlag")); - mInitMap.put(new Pair<String, String>("func_82889_a", "getBatSize")); - mInitMap.put(new Pair<String, String>("func_83015_S", "getCurrentDate")); - mInitMap.put(new Pair<String, String>("func_85029_a", "addEntityCrashInfo")); - mInitMap.put(new Pair<String, String>("func_85030_a", "playSound")); - mInitMap.put(new Pair<String, String>("func_85031_j", "hitByEntity")); - mInitMap.put(new Pair<String, String>("func_85032_ar", "isEntityInvulnerable")); - mInitMap.put(new Pair<String, String>("func_85033_bc", "collideWithNearbyEntities")); - mInitMap.put(new Pair<String, String>("func_85034_r", "setArrowCountInEntity")); - mInitMap.put(new Pair<String, String>("func_85035_bI", "getArrowCountInEntity")); - mInitMap.put(new Pair<String, String>("func_85036_m", "setCombatTask")); - mInitMap.put(new Pair<String, String>("func_85039_t", "addScore")); - mInitMap.put(new Pair<String, String>("func_85040_s", "setScore")); - mInitMap.put(new Pair<String, String>("func_85052_h", "getThrower")); - mInitMap.put(new Pair<String, String>("func_85054_d", "searchForOtherItemsNearby")); - mInitMap.put(new Pair<String, String>("func_85055_a", "makeCrashReport")); - mInitMap.put(new Pair<String, String>("func_85056_g", "getCategory")); - mInitMap.put(new Pair<String, String>("func_85057_a", "makeCategoryDepth")); - mInitMap.put(new Pair<String, String>("func_85058_a", "makeCategory")); - mInitMap.put(new Pair<String, String>("func_85069_a", "firstTwoElementsOfStackTraceMatch")); - mInitMap.put(new Pair<String, String>("func_85070_b", "trimStackTraceEntriesFromBottom")); - mInitMap.put(new Pair<String, String>("func_85071_a", "getLocationInfo")); - mInitMap.put(new Pair<String, String>("func_85072_a", "appendToStringBuilder")); - mInitMap.put(new Pair<String, String>("func_85073_a", "getPrunedStackTrace")); - mInitMap.put(new Pair<String, String>("func_85093_e", "renderArrowsStuckInEntity")); - mInitMap.put(new Pair<String, String>("func_85094_b", "renderDebugBoundingBox")); - mInitMap.put(new Pair<String, String>("func_85102_a", "playSoundToNearExcept")); - mInitMap.put(new Pair<String, String>("func_85118_a", "addToCrashReport")); - mInitMap.put(new Pair<String, String>("func_85144_b", "getCacheSizes")); - mInitMap.put(new Pair<String, String>("func_85151_d", "getLowerChestInventory")); - mInitMap.put(new Pair<String, String>("func_85156_a", "removeTask")); - mInitMap.put(new Pair<String, String>("func_85157_q", "isAdventureModeExempt")); - mInitMap.put(new Pair<String, String>("func_85158_p", "setAdventureModeExempt")); - mInitMap.put(new Pair<String, String>("func_85173_a", "playSoundToNearExcept")); - mInitMap.put(new Pair<String, String>("func_85176_s", "getDefaultTeleporter")); - mInitMap.put(new Pair<String, String>("func_85181_a", "getRandomModelBox")); - mInitMap.put(new Pair<String, String>("func_85182_a", "sameToolAndBlock")); - mInitMap.put(new Pair<String, String>("func_85187_a", "drawString")); - mInitMap.put(new Pair<String, String>("func_85188_a", "makePortal")); - mInitMap.put(new Pair<String, String>("func_85189_a", "removeStalePortalLocations")); - mInitMap.put(new Pair<String, String>("func_90010_a", "isPartOfLargeChest")); - mInitMap.put(new Pair<String, String>("func_90011_a", "createChild")); - mInitMap.put(new Pair<String, String>("func_90013_b", "getDyeFromFleeceColor")); - mInitMap.put(new Pair<String, String>("func_90014_a", "getDyeBasedOnParents")); - mInitMap.put(new Pair<String, String>("func_90019_g", "applyRenderColor")); - mInitMap.put(new Pair<String, String>("func_90020_K", "getLimitFramerate")); - mInitMap.put(new Pair<String, String>("func_90022_d", "getListOfPlayers")); - mInitMap.put(new Pair<String, String>("func_90033_f", "canLoadWorld")); - mInitMap.put(new Pair<String, String>("func_90035_a", "getClassFromID")); - mInitMap.put(new Pair<String, String>("func_90036_a", "getFireAspectModifier")); - mInitMap.put(new Pair<String, String>("func_90999_ad", "canRenderOnFire")); - mInitMap.put(new Pair<String, String>("func_92015_f", "closeScreenNoPacket")); - mInitMap.put(new Pair<String, String>("func_92034_a", "createParticle")); - mInitMap.put(new Pair<String, String>("func_92035_a", "createBall")); - mInitMap.put(new Pair<String, String>("func_92036_a", "createBurst")); - mInitMap.put(new Pair<String, String>("func_92038_a", "createShaped")); - mInitMap.put(new Pair<String, String>("func_92043_f", "setTwinkle")); - mInitMap.put(new Pair<String, String>("func_92044_a", "setColour")); - mInitMap.put(new Pair<String, String>("func_92045_e", "setTrail")); - mInitMap.put(new Pair<String, String>("func_92046_g", "setFadeColour")); - mInitMap.put(new Pair<String, String>("func_92058_a", "setEntityItemStack")); - mInitMap.put(new Pair<String, String>("func_92059_d", "getEntityItem")); - mInitMap.put(new Pair<String, String>("func_92085_d", "getIsBlank")); - mInitMap.put(new Pair<String, String>("func_92087_a", "causeThornsDamage")); - mInitMap.put(new Pair<String, String>("func_92088_a", "makeFireworks")); - mInitMap.put(new Pair<String, String>("func_92089_a", "canApply")); - mInitMap.put(new Pair<String, String>("func_92093_a", "getFireTimeForEntity")); - mInitMap.put(new Pair<String, String>("func_92097_a", "negateDamage")); - mInitMap.put(new Pair<String, String>("func_92103_a", "addRecipe")); - mInitMap.put(new Pair<String, String>("func_92111_a", "getEnchantedItemStack")); - mInitMap.put(new Pair<String, String>("func_92115_a", "addEnchantment")); - mInitMap.put(new Pair<String, String>("func_92116_a", "addEnchantmentBooksToList")); - mInitMap.put(new Pair<String, String>("func_94041_b", "isItemValidForSlot")); - mInitMap.put(new Pair<String, String>("func_94053_h", "nextTextureIndexX")); - mInitMap.put(new Pair<String, String>("func_94056_bM", "hasCustomNameTag")); - mInitMap.put(new Pair<String, String>("func_94057_bL", "getCustomNameTag")); - mInitMap.put(new Pair<String, String>("func_94058_c", "setCustomNameTag")); - mInitMap.put(new Pair<String, String>("func_94059_bO", "getAlwaysRenderNameTagForRender")); - mInitMap.put(new Pair<String, String>("func_94061_f", "setAlwaysRenderNameTag")); - mInitMap.put(new Pair<String, String>("func_94062_bN", "getAlwaysRenderNameTag")); - mInitMap.put(new Pair<String, String>("func_94065_a", "drawTexturedModelRectFromIcon")); - mInitMap.put(new Pair<String, String>("func_94083_c", "getTntPlacedBy")); - mInitMap.put(new Pair<String, String>("func_94085_r", "getDefaultDisplayTileOffset")); - mInitMap.put(new Pair<String, String>("func_94086_l", "setDisplayTileOffset")); - mInitMap.put(new Pair<String, String>("func_94087_l", "getMinecartType")); - mInitMap.put(new Pair<String, String>("func_94090_a", "createMinecart")); - mInitMap.put(new Pair<String, String>("func_94092_k", "setDisplayTileData")); - mInitMap.put(new Pair<String, String>("func_94095_a", "killMinecart")); - mInitMap.put(new Pair<String, String>("func_94096_e", "setHasDisplayTile")); - mInitMap.put(new Pair<String, String>("func_94097_p", "getDefaultDisplayTileData")); - mInitMap.put(new Pair<String, String>("func_94098_o", "getDisplayTileData")); - mInitMap.put(new Pair<String, String>("func_94099_q", "getDisplayTileOffset")); - mInitMap.put(new Pair<String, String>("func_94100_s", "hasDisplayTile")); - mInitMap.put(new Pair<String, String>("func_94101_h", "applyDrag")); - mInitMap.put(new Pair<String, String>("func_94103_c", "explodeCart")); - mInitMap.put(new Pair<String, String>("func_94105_c", "ignite")); - mInitMap.put(new Pair<String, String>("func_94107_f", "setMinecartPowered")); - mInitMap.put(new Pair<String, String>("func_94108_c", "isMinecartPowered")); - mInitMap.put(new Pair<String, String>("func_94128_d", "getSlotsForFace")); - mInitMap.put(new Pair<String, String>("func_94140_a", "registerDestroyBlockIcons")); - mInitMap.put(new Pair<String, String>("func_94143_a", "updateIcons")); - mInitMap.put(new Pair<String, String>("func_94148_a", "renderItemOverlayIntoGUI")); - mInitMap.put(new Pair<String, String>("func_94149_a", "renderIcon")); - mInitMap.put(new Pair<String, String>("func_94178_a", "updateIcons")); - mInitMap.put(new Pair<String, String>("func_94182_a", "addSlot")); - mInitMap.put(new Pair<String, String>("func_94183_a", "getStitchHolder")); - mInitMap.put(new Pair<String, String>("func_94184_a", "getAllStitchSlots")); - mInitMap.put(new Pair<String, String>("func_94185_c", "getOriginY")); - mInitMap.put(new Pair<String, String>("func_94186_b", "getOriginX")); - mInitMap.put(new Pair<String, String>("func_94194_d", "rotate")); - mInitMap.put(new Pair<String, String>("func_94195_e", "isRotated")); - mInitMap.put(new Pair<String, String>("func_94196_a", "setmInitMap.put(newDimension")); - mInitMap.put(new Pair<String, String>("func_94197_a", "getWidth")); - mInitMap.put(new Pair<String, String>("func_94199_b", "getHeight")); - mInitMap.put(new Pair<String, String>("func_94206_g", "getMinV")); - mInitMap.put(new Pair<String, String>("func_94207_b", "getInterpolatedV")); - mInitMap.put(new Pair<String, String>("func_94209_e", "getMinU")); - mInitMap.put(new Pair<String, String>("func_94210_h", "getMaxV")); - mInitMap.put(new Pair<String, String>("func_94211_a", "getIconWidth")); - mInitMap.put(new Pair<String, String>("func_94212_f", "getMaxU")); - mInitMap.put(new Pair<String, String>("func_94214_a", "getInterpolatedU")); - mInitMap.put(new Pair<String, String>("func_94215_i", "getIconName")); - mInitMap.put(new Pair<String, String>("func_94216_b", "getIconHeight")); - mInitMap.put(new Pair<String, String>("func_94217_a", "copyFrom")); - mInitMap.put(new Pair<String, String>("func_94219_l", "updateAnimation")); - mInitMap.put(new Pair<String, String>("func_94241_a", "updateCompass")); - mInitMap.put(new Pair<String, String>("func_94245_a", "registerIcon")); - mInitMap.put(new Pair<String, String>("func_94248_c", "updateAnimations")); - mInitMap.put(new Pair<String, String>("func_94277_a", "bindTexture")); - mInitMap.put(new Pair<String, String>("func_94305_f", "doStitch")); - mInitMap.put(new Pair<String, String>("func_94309_g", "getStichSlots")); - mInitMap.put(new Pair<String, String>("func_94310_b", "allocateSlot")); - mInitMap.put(new Pair<String, String>("func_94311_c", "expandAndAllocateSlot")); - mInitMap.put(new Pair<String, String>("func_94520_b", "isKeyTranslated")); - mInitMap.put(new Pair<String, String>("func_94522_b", "canTranslate")); - mInitMap.put(new Pair<String, String>("func_94525_a", "computeStackSize")); - mInitMap.put(new Pair<String, String>("func_94526_b", "calcRedstoneFromInventory")); - mInitMap.put(new Pair<String, String>("func_94527_a", "canAddItemToSlot")); - mInitMap.put(new Pair<String, String>("func_94528_d", "isValidDragMode")); - mInitMap.put(new Pair<String, String>("func_94529_b", "extractDragMode")); - mInitMap.put(new Pair<String, String>("func_94531_b", "canDragIntoSlot")); - mInitMap.put(new Pair<String, String>("func_94532_c", "getDragEvent")); - mInitMap.put(new Pair<String, String>("func_94533_d", "resetDrag")); - mInitMap.put(new Pair<String, String>("func_94539_a", "setExplosionSource")); - mInitMap.put(new Pair<String, String>("func_94540_d", "setExplosion")); - mInitMap.put(new Pair<String, String>("func_94541_c", "isExplosion")); - mInitMap.put(new Pair<String, String>("func_94560_a", "getDamageSrc")); - mInitMap.put(new Pair<String, String>("func_94572_D", "getStrongestIndirectPower")); - mInitMap.put(new Pair<String, String>("func_94574_k", "getIndirectPowerOutput")); - mInitMap.put(new Pair<String, String>("func_94576_a", "getEntitiesWithinAABBExcludingEntity")); - mInitMap.put(new Pair<String, String>("func_94577_B", "getBlockPowerInput")); - mInitMap.put(new Pair<String, String>("func_94581_a", "registerIcons")); - mInitMap.put(new Pair<String, String>("func_94599_c", "getItemIconForUseDuration")); - mInitMap.put(new Pair<String, String>("func_94602_b", "getBackgroundIcon")); - mInitMap.put(new Pair<String, String>("func_94608_d", "getItemSpriteNumber")); - mInitMap.put(new Pair<String, String>("func_94613_c", "getExplosivePlacedBy")); - mInitMap.put(new Pair<String, String>("func_94901_k", "getSpriteNumber")); - mInitMap.put(new Pair<String, String>("func_96092_aw", "isPushedByWater")); - mInitMap.put(new Pair<String, String>("func_96094_a", "setMinecartName")); - mInitMap.put(new Pair<String, String>("func_96095_a", "onActivatorRailPass")); - mInitMap.put(new Pair<String, String>("func_96096_ay", "isIgnited")); - mInitMap.put(new Pair<String, String>("func_96107_aA", "getXPos")); - mInitMap.put(new Pair<String, String>("func_96108_aC", "getZPos")); - mInitMap.put(new Pair<String, String>("func_96109_aB", "getYPos")); - mInitMap.put(new Pair<String, String>("func_96110_f", "setBlocked")); - mInitMap.put(new Pair<String, String>("func_96111_ay", "getBlocked")); - mInitMap.put(new Pair<String, String>("func_96120_a", "setEquipmentDropChance")); - mInitMap.put(new Pair<String, String>("func_96122_a", "canAttackPlayer")); - mInitMap.put(new Pair<String, String>("func_96123_co", "getWorldScoreboard")); - mInitMap.put(new Pair<String, String>("func_96124_cp", "getTeam")); - mInitMap.put(new Pair<String, String>("func_96125_a", "displayGUIHopperMinecart")); - mInitMap.put(new Pair<String, String>("func_96136_a", "renderScoreboard")); - mInitMap.put(new Pair<String, String>("func_96290_a", "isBlockProtected")); - mInitMap.put(new Pair<String, String>("func_96296_a", "getValidValues")); - mInitMap.put(new Pair<String, String>("func_96297_d", "getFriendlyName")); - mInitMap.put(new Pair<String, String>("func_96298_a", "getFormattingCode")); - mInitMap.put(new Pair<String, String>("func_96300_b", "getValueByName")); - mInitMap.put(new Pair<String, String>("func_96301_b", "isFancyStyling")); - mInitMap.put(new Pair<String, String>("func_96302_c", "isColor")); - mInitMap.put(new Pair<String, String>("func_96332_d", "getPlayerName")); - mInitMap.put(new Pair<String, String>("func_96333_a", "joinNiceStringFromCollection")); - mInitMap.put(new Pair<String, String>("func_96441_U", "getScoreboard")); - mInitMap.put(new Pair<String, String>("func_96443_a", "setWorldScoreboard")); - mInitMap.put(new Pair<String, String>("func_96449_a", "renderOffsetLivingLabel")); - mInitMap.put(new Pair<String, String>("func_96457_a", "matchesScoreboardCriteria")); - mInitMap.put(new Pair<String, String>("func_96508_e", "getTeam")); - mInitMap.put(new Pair<String, String>("func_96509_i", "getPlayersTeam")); - mInitMap.put(new Pair<String, String>("func_96511_d", "removeTeam")); - mInitMap.put(new Pair<String, String>("func_96512_b", "removePlayerFromTeam")); - mInitMap.put(new Pair<String, String>("func_96514_c", "getScoreObjectives")); - mInitMap.put(new Pair<String, String>("func_96517_b", "getObjectiveDisplaySlot")); - mInitMap.put(new Pair<String, String>("func_96518_b", "getObjective")); - mInitMap.put(new Pair<String, String>("func_96523_a", "broadcastTeamCreated")); - mInitMap.put(new Pair<String, String>("func_96524_g", "removePlayerFromTeams")); - mInitMap.put(new Pair<String, String>("func_96525_g", "getTeams")); - mInitMap.put(new Pair<String, String>("func_96526_d", "getObjectiveNames")); - mInitMap.put(new Pair<String, String>("func_96527_f", "createTeam")); - mInitMap.put(new Pair<String, String>("func_96529_a", "getValueFromObjective")); - mInitMap.put(new Pair<String, String>("func_96530_a", "setObjectiveInDisplaySlot")); - mInitMap.put(new Pair<String, String>("func_96531_f", "getTeamNames")); - mInitMap.put(new Pair<String, String>("func_96534_i", "getSortedScores")); - mInitMap.put(new Pair<String, String>("func_96535_a", "addScoreObjective")); - mInitMap.put(new Pair<String, String>("func_96537_j", "getObjectiveDisplaySlotNumber")); - mInitMap.put(new Pair<String, String>("func_96538_b", "broadcastTeamRemoved")); - mInitMap.put(new Pair<String, String>("func_96539_a", "getObjectiveInDisplaySlot")); - mInitMap.put(new Pair<String, String>("func_96559_d", "getFrontOffsetY")); - mInitMap.put(new Pair<String, String>("func_96631_a", "attemptDamageItem")); - mInitMap.put(new Pair<String, String>("func_96636_a", "getName")); - mInitMap.put(new Pair<String, String>("func_96637_b", "isReadOnly")); - mInitMap.put(new Pair<String, String>("func_96646_b", "decreaseScore")); - mInitMap.put(new Pair<String, String>("func_96647_c", "setScorePoints")); - mInitMap.put(new Pair<String, String>("func_96649_a", "increseScore")); - mInitMap.put(new Pair<String, String>("func_96650_f", "getScoreScoreboard")); - mInitMap.put(new Pair<String, String>("func_96652_c", "getScorePoints")); - mInitMap.put(new Pair<String, String>("func_96653_e", "getPlayerName")); - mInitMap.put(new Pair<String, String>("func_96660_a", "setAllowFriendlyFire")); - mInitMap.put(new Pair<String, String>("func_96661_b", "getRegisteredName")); - mInitMap.put(new Pair<String, String>("func_96662_c", "setNameSuffix")); - mInitMap.put(new Pair<String, String>("func_96663_f", "getColorSuffix")); - mInitMap.put(new Pair<String, String>("func_96664_a", "setTeamName")); - mInitMap.put(new Pair<String, String>("func_96665_g", "getAllowFriendlyFire")); - mInitMap.put(new Pair<String, String>("func_96666_b", "setNamePrefix")); - mInitMap.put(new Pair<String, String>("func_96667_a", "formatPlayerName")); - mInitMap.put(new Pair<String, String>("func_96668_e", "getColorPrefix")); - mInitMap.put(new Pair<String, String>("func_96670_d", "getMembershipCollection")); - mInitMap.put(new Pair<String, String>("func_96678_d", "getDisplayName")); - mInitMap.put(new Pair<String, String>("func_96679_b", "getName")); - mInitMap.put(new Pair<String, String>("func_96680_c", "getCriteria")); - mInitMap.put(new Pair<String, String>("func_96681_a", "setDisplayName")); - mInitMap.put(new Pair<String, String>("func_96682_a", "getScoreboard")); - mInitMap.put(new Pair<String, String>("func_98034_c", "isInvisibleToPlayer")); - mInitMap.put(new Pair<String, String>("func_98035_c", "writeMountToNBT")); - mInitMap.put(new Pair<String, String>("func_98042_n", "setTransferTicker")); - mInitMap.put(new Pair<String, String>("func_98043_aE", "canTransfer")); - mInitMap.put(new Pair<String, String>("func_98052_bS", "canPickUpLoot")); - mInitMap.put(new Pair<String, String>("func_98053_h", "setCanPickUpLoot")); - mInitMap.put(new Pair<String, String>("func_98054_a", "setScaleForAge")); - mInitMap.put(new Pair<String, String>("func_98055_j", "setScale")); - mInitMap.put(new Pair<String, String>("func_98150_a", "getAtlasSprite")); - mInitMap.put(new Pair<String, String>("func_98152_d", "getAllUsernames")); - mInitMap.put(new Pair<String, String>("func_98179_a", "computeLightValue")); - mInitMap.put(new Pair<String, String>("func_98265_a", "spawnEntity")); - mInitMap.put(new Pair<String, String>("func_98266_d", "getSpawnerZ")); - mInitMap.put(new Pair<String, String>("func_98268_b", "setDelayToMin")); - mInitMap.put(new Pair<String, String>("func_98269_i", "getRandomEntity")); - mInitMap.put(new Pair<String, String>("func_98270_a", "readFromNBT")); - mInitMap.put(new Pair<String, String>("func_98271_a", "getSpawnerWorld")); - mInitMap.put(new Pair<String, String>("func_98272_a", "setEntityName")); - mInitMap.put(new Pair<String, String>("func_98273_j", "resetTimer")); - mInitMap.put(new Pair<String, String>("func_98274_c", "getSpawnerY")); - mInitMap.put(new Pair<String, String>("func_98275_b", "getSpawnerX")); - mInitMap.put(new Pair<String, String>("func_98276_e", "getEntityNameToSpawn")); - mInitMap.put(new Pair<String, String>("func_98277_a", "setRandomEntity")); - mInitMap.put(new Pair<String, String>("func_98278_g", "updateSpawner")); - mInitMap.put(new Pair<String, String>("func_98279_f", "isActivated")); - mInitMap.put(new Pair<String, String>("func_98280_b", "writeToNBT")); - mInitMap.put(new Pair<String, String>("func_98281_h", "getEntityToRender")); - mInitMap.put(new Pair<String, String>("func_98300_b", "setSeeFriendlyInvisiblesEnabled")); - mInitMap.put(new Pair<String, String>("func_98306_d", "readGlyphSizes")); - mInitMap.put(new Pair<String, String>("func_99999_d", "run")); - } - - public static void init4() { - mObInitMap.put(new Pair<String, String>("aqc", "net/minecraft/world/chunk/storage/IChunkLoader")); - mObInitMap.put(new Pair<String, String>("amd", "net/minecraft/block/BlockMycelium")); - mObInitMap.put(new Pair<String, String>("aag", "net/minecraft/inventory/ContainerEnchantment")); - mObInitMap.put(new Pair<String, String>("aie", "net/minecraft/world/biome/WorldChunkManagerHell")); - mObInitMap.put( - new Pair<String, String>( - "aub", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$DesertPyramid")); - mObInitMap.put(new Pair<String, String>("bue", "net/minecraft/client/stream/ChatController")); - mObInitMap.put(new Pair<String, String>("bqf", "net/minecraft/client/renderer/texture/TextureManager")); - mObInitMap.put(new Pair<String, String>("bei", "net/minecraft/client/gui/achievement/GuiAchievements")); - mObInitMap.put(new Pair<String, String>("bih", "net/minecraft/client/model/ModelSquid")); - mObInitMap.put(new Pair<String, String>("bmg", "net/minecraft/client/shader/Framebuffer")); - mObInitMap.put(new Pair<String, String>("na", "net/minecraft/client/network/NetHandlerHandshakeMemory")); - mObInitMap - .put(new Pair<String, String>("jb", "net/minecraft/network/play/client/C02PacketUseEntity$Action")); - mObInitMap.put(new Pair<String, String>("fc", "net/minecraft/util/MessageDeserializer2")); - mObInitMap.put(new Pair<String, String>("bd", "net/minecraft/command/server/CommandPardonIp")); - mObInitMap.put(new Pair<String, String>("amw", "net/minecraft/block/BlockPumpkin")); - mObInitMap.put(new Pair<String, String>("aey", "net/minecraft/item/crafting/RecipeFireworks")); - mObInitMap.put(new Pair<String, String>("aaz", "net/minecraft/inventory/ContainerDispenser")); - mObInitMap.put(new Pair<String, String>("aix", "net/minecraft/world/biome/BiomeGenEnd")); - mObInitMap.put(new Pair<String, String>("z", "net/minecraft/command/CommandHandler")); - mObInitMap.put(new Pair<String, String>("bqy", "net/minecraft/client/resources/IResourceManager")); - mObInitMap.put(new Pair<String, String>("nt", "net/minecraft/server/management/PlayerProfileCache$1")); - mObInitMap.put(new Pair<String, String>("ju", "net/minecraft/network/login/server/S00PacketDisconnect")); - mObInitMap.put(new Pair<String, String>("fv", "net/minecraft/network/play/INetHandlerPlayClient")); - mObInitMap.put(new Pair<String, String>("abn", "net/minecraft/item/ItemSoup")); - mObInitMap.put(new Pair<String, String>("afm", "net/minecraft/enchantment/EnchantmentArrowDamage")); - mObInitMap.put(new Pair<String, String>("brm", "net/minecraft/client/resources/SkinManager$3")); - mObInitMap.put(new Pair<String, String>("aqu", "net/minecraft/world/gen/ChunkProviderFlat")); - mObInitMap.put( - new Pair<String, String>( - "aut", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Prison")); - mObInitMap.put(new Pair<String, String>("ays", "net/minecraft/world/storage/WorldInfo")); - mObInitMap.put(new Pair<String, String>("bbq", "net/minecraft/util/MinecraftError")); - mObInitMap.put(new Pair<String, String>("bfp", "net/minecraft/util/EnchantmentNameParts")); - mObInitMap.put( - new Pair<String, String>("bjo", "net/minecraft/client/multiplayer/ServerData$ServerResourceMode")); - mObInitMap.put(new Pair<String, String>("bnn", "net/minecraft/client/renderer/entity/RenderManager")); - mObInitMap.put(new Pair<String, String>("ck", "net/minecraft/dispenser/IBlockSource")); - mObInitMap.put(new Pair<String, String>("zp", "net/minecraft/entity/projectile/EntityWitherSkull")); - mObInitMap.put( - new Pair<String, String>("vq", "net/minecraft/entity/ai/EntityAINearestAttackableTarget$Sorter")); - mObInitMap.put(new Pair<String, String>("rr", "net/minecraft/potion/PotionAbsoption")); - mObInitMap.put(new Pair<String, String>("ns", "net/minecraft/server/management/PlayerProfileCache")); - mObInitMap.put(new Pair<String, String>("anj", "net/minecraft/block/BlockSapling")); - mObInitMap.put(new Pair<String, String>("afl", "net/minecraft/item/crafting/RecipesWeapons")); - mObInitMap.put(new Pair<String, String>("ajk", "net/minecraft/block/Block$2")); - mObInitMap.put(new Pair<String, String>("avh", "net/minecraft/world/gen/structure/MapGenStructure$3")); - mObInitMap.put(new Pair<String, String>("bce", "net/minecraft/client/gui/GuiLabel")); - mObInitMap.put(new Pair<String, String>("bgd", "net/minecraft/client/gui/ServerListEntryNormal$1")); - mObInitMap.put(new Pair<String, String>("brl", "net/minecraft/client/resources/SkinManager$2")); - mObInitMap.put(new Pair<String, String>("we", "net/minecraft/entity/passive/EntityBat")); - mObInitMap.put(new Pair<String, String>("og", "net/minecraft/server/management/PreYggdrasilConverter$7")); - mObInitMap.put(new Pair<String, String>("kh", "net/minecraft/network/status/INetHandlerStatusServer")); - mObInitMap.put(new Pair<String, String>("gi", "net/minecraft/network/play/server/S3APacketTabComplete")); - mObInitMap.put(new Pair<String, String>("aca", "net/minecraft/creativetab/CreativeTabs$4")); - mObInitMap.put(new Pair<String, String>("azz", "net/minecraft/scoreboard/Score")); - mObInitMap.put(new Pair<String, String>("bgc", "net/minecraft/client/gui/ServerListEntryNormal")); - mObInitMap.put(new Pair<String, String>("boa", "net/minecraft/client/renderer/entity/RenderItem$2")); - mObInitMap.put(new Pair<String, String>("wx", "net/minecraft/entity/IEntityMultiPart")); - mObInitMap.put(new Pair<String, String>("sy", "net/minecraft/entity/IEntityLivingData")); - mObInitMap.put(new Pair<String, String>("oz", "net/minecraft/network/rcon/RConThreadClient")); - mObInitMap.put(new Pair<String, String>("aoq", "net/minecraft/tileentity/TileEntityBeacon")); - mObInitMap.put(new Pair<String, String>("akr", "net/minecraft/block/BlockDynamicLiquid")); - mObInitMap.put(new Pair<String, String>("act", "net/minecraft/item/ItemFishFood")); - mObInitMap.put(new Pair<String, String>("ags", "net/minecraft/block/BlockEventData")); - mObInitMap.put(new Pair<String, String>("bss", "net/minecraft/client/audio/SoundListSerializer")); - mObInitMap.put(new Pair<String, String>("bot", "net/minecraft/client/renderer/entity/RenderSlime")); - mObInitMap.put(new Pair<String, String>("azy", "net/minecraft/scoreboard/ScorePlayerTeam")); - mObInitMap.put(new Pair<String, String>("bcw", "net/minecraft/client/gui/GuiYesNo")); - mObInitMap.put(new Pair<String, String>("bgv", "net/minecraft/client/main/Main$2")); - mObInitMap.put(new Pair<String, String>("bku", "net/minecraft/client/particle/EntityReddustFX")); - mObInitMap.put(new Pair<String, String>("pn", "net/minecraft/util/TupleIntJsonSerializable")); - mObInitMap.put(new Pair<String, String>("lo", "net/minecraft/network/rcon/IServer")); - mObInitMap.put(new Pair<String, String>("hp", "net/minecraft/network/play/server/S0APacketUseBed")); - mObInitMap.put(new Pair<String, String>("dq", "net/minecraft/nbt/NBTTagList")); - mObInitMap.put(new Pair<String, String>("adh", "net/minecraft/item/ItemMap")); - mObInitMap.put(new Pair<String, String>("bph", "net/minecraft/client/shader/ShaderDefault")); - mObInitMap.put(new Pair<String, String>("aso", "net/minecraft/world/gen/feature/WorldGenSwamp")); - mObInitMap.put(new Pair<String, String>("aop", "net/minecraft/block/BlockCarpet")); - mObInitMap.put(new Pair<String, String>("bdk", "net/minecraft/client/gui/GuiLanguage$List")); - mObInitMap.put(new Pair<String, String>("bhj", "net/minecraft/client/model/ModelCreeper")); - mObInitMap.put(new Pair<String, String>("bli", "net/minecraft/util/MovementInput")); - mObInitMap.put(new Pair<String, String>("ee", "net/minecraft/nbt/JsonToNBT$List")); - mObInitMap.put(new Pair<String, String>("af", "net/minecraft/command/server/CommandBanIp")); - mObInitMap.put(new Pair<String, String>("xk", "net/minecraft/entity/item/EntityItem")); - mObInitMap.put(new Pair<String, String>("tl", "net/minecraft/entity/ai/attributes/BaseAttributeMap")); - mObInitMap.put(new Pair<String, String>("pm", "net/minecraft/stats/IStatType")); - mObInitMap - .put(new Pair<String, String>("atc", "net/minecraft/world/gen/structure/StructureMineshaftStart")); - mObInitMap.put(new Pair<String, String>("apd", "net/minecraft/tileentity/TileEntityEnchantmentTable")); - mObInitMap.put(new Pair<String, String>("ale", "net/minecraft/block/BlockFurnace")); - mObInitMap.put(new Pair<String, String>("adg", "net/minecraft/item/ItemLeaves")); - mObInitMap.put(new Pair<String, String>("ahf", "net/minecraft/world/World$4")); - mObInitMap.put(new Pair<String, String>("axb", "net/minecraft/world/gen/layer/GenLayerAddIsland")); - mObInitMap.put(new Pair<String, String>("bpg", "net/minecraft/client/util/JsonBlendingMode")); - mObInitMap - .put(new Pair<String, String>("net/minecraft/realms/RealmsMth", "net/minecraft/realms/RealmsMth")); - mObInitMap.put(new Pair<String, String>("qa", "net/minecraft/util/IntHashMap$Entry")); - mObInitMap.put(new Pair<String, String>("mb", "net/minecraft/server/gui/MinecraftServerGui$3")); - mObInitMap.put( - new Pair<String, String>("ic", "net/minecraft/network/play/server/S3BPacketScoreboardObjective")); - mObInitMap.put(new Pair<String, String>("ed", "net/minecraft/nbt/JsonToNBT$Compound")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RendererUtility", - "net/minecraft/realms/RendererUtility")); - mObInitMap.put( - new Pair<String, String>( - "atv", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Stairs")); - mObInitMap.put(new Pair<String, String>("apw", "net/minecraft/world/chunk/EmptyChunk")); - mObInitMap.put(new Pair<String, String>("alx", "net/minecraft/block/BlockLog")); - mObInitMap.put(new Pair<String, String>("adz", "net/minecraft/item/ItemSign")); - mObInitMap.put(new Pair<String, String>("ahy", "net/minecraft/world/biome/BiomeCache")); - mObInitMap.put(new Pair<String, String>("axu", "net/minecraft/world/gen/layer/GenLayerRiver")); - mObInitMap.put(new Pair<String, String>("bpz", "net/minecraft/client/renderer/texture/TextureMap")); - mObInitMap.put(new Pair<String, String>("yr", "net/minecraft/entity/monster/EntityZombie$1")); - mObInitMap.put(new Pair<String, String>("us", "net/minecraft/entity/ai/EntityAIMoveThroughVillage")); - mObInitMap.put(new Pair<String, String>("mu", "net/minecraft/world/WorldServer$1")); - mObInitMap.put( - new Pair<String, String>("iv", "net/minecraft/network/play/client/C0FPacketConfirmTransaction")); - mObInitMap.put(new Pair<String, String>("ew", "net/minecraft/network/NetworkStatistics$PacketStat")); - mObInitMap.put(new Pair<String, String>("ax", "net/minecraft/command/server/CommandListBans")); - mObInitMap.put( - new Pair<String, String>("net/minecraft/realms/ServerPing", "net/minecraft/realms/ServerPing")); - mObInitMap.put(new Pair<String, String>("aqk", "net/minecraft/world/chunk/storage/AnvilChunkLoader")); - mObInitMap.put(new Pair<String, String>("aml", "net/minecraft/block/BlockOldLeaf")); - mObInitMap.put(new Pair<String, String>("aen", "net/minecraft/potion/PotionHelper")); - mObInitMap.put(new Pair<String, String>("aao", "net/minecraft/inventory/ContainerHorseInventory$2")); - mObInitMap.put(new Pair<String, String>("aim", "net/minecraft/world/biome/BiomeGenMushroomIsland")); - mObInitMap.put(new Pair<String, String>("o", "net/minecraft/crash/CrashReportCategory$Entry")); - mObInitMap.put(new Pair<String, String>("bum", "net/minecraft/client/stream/IStream")); - mObInitMap.put(new Pair<String, String>("bqn", "net/minecraft/client/resources/AbstractResourcePack")); - mObInitMap.put(new Pair<String, String>("bar", "net/minecraft/client/Minecraft$11")); - mObInitMap.put(new Pair<String, String>("beq", "net/minecraft/client/gui/achievement/GuiStats$Stats")); - mObInitMap.put(new Pair<String, String>("bip", "net/minecraft/client/model/ModelZombie")); - mObInitMap.put( - new Pair<String, String>( - "bmo", - "net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer")); - mObInitMap.put(new Pair<String, String>("ni", "net/minecraft/network/NetHandlerPlayServer$1")); - mObInitMap.put(new Pair<String, String>("jj", "net/minecraft/network/play/client/C0BPacketEntityAction")); - mObInitMap.put(new Pair<String, String>("fk", "net/minecraft/util/IChatComponent$Serializer")); - mObInitMap.put(new Pair<String, String>("bl", "net/minecraft/command/ServerCommandManager")); - mObInitMap.put(new Pair<String, String>("yq", "net/minecraft/entity/monster/EntityZombie")); - mObInitMap.put(new Pair<String, String>("abc", "net/minecraft/item/ItemArmor$1")); - mObInitMap.put(new Pair<String, String>("afb", "net/minecraft/item/crafting/RecipesMapCloning")); - mObInitMap.put( - new Pair<String, String>( - "brb", - "net/minecraft/client/resources/ResourcePackFileNotFoundException")); - mObInitMap.put(new Pair<String, String>("aqj", "net/minecraft/world/chunk/storage/RegionFileCache")); - mObInitMap.put( - new Pair<String, String>("aui", "net/minecraft/world/gen/structure/StructureStrongholdPieces")); - mObInitMap.put(new Pair<String, String>("bbf", "net/minecraft/client/Minecraft$9")); - mObInitMap.put(new Pair<String, String>("bfe", "net/minecraft/client/gui/GuiScreenBook")); - mObInitMap.put(new Pair<String, String>("bjd", "net/minecraft/client/multiplayer/ChunkProviderClient")); - mObInitMap.put(new Pair<String, String>("bnc", "net/minecraft/client/renderer/entity/RenderBat")); - mObInitMap.put(new Pair<String, String>("ze", "net/minecraft/entity/projectile/EntityFireball")); - mObInitMap.put(new Pair<String, String>("vf", "net/minecraft/entity/ai/EntityAIRestrictSun")); - mObInitMap.put(new Pair<String, String>("rg", "net/minecraft/client/renderer/texture/IIconRegister")); - mObInitMap.put(new Pair<String, String>("afa", "net/minecraft/item/crafting/FurnaceRecipes")); - mObInitMap.put(new Pair<String, String>("bby", "net/minecraft/client/gui/MapItemRenderer$1")); - mObInitMap.put(new Pair<String, String>("bfx", "net/minecraft/client/gui/inventory/GuiEditSign")); - mObInitMap.put(new Pair<String, String>("bra", "net/minecraft/client/resources/IResourcePack")); - mObInitMap.put(new Pair<String, String>("zx", "net/minecraft/inventory/ContainerBeacon")); - mObInitMap.put(new Pair<String, String>("vy", "net/minecraft/village/VillageDoorInfo")); - mObInitMap.put(new Pair<String, String>("arq", "net/minecraft/world/gen/feature/WorldGenFire")); - mObInitMap.put(new Pair<String, String>("anr", "net/minecraft/block/BlockStainedGlassPane")); - mObInitMap.put(new Pair<String, String>("abu", "net/minecraft/creativetab/CreativeTabs$1")); - mObInitMap.put(new Pair<String, String>("aft", "net/minecraft/enchantment/Enchantment")); - mObInitMap.put(new Pair<String, String>("ajs", "net/minecraft/block/BlockButton")); - mObInitMap.put(new Pair<String, String>("avp", "net/minecraft/world/gen/structure/StructureVillagePieces")); - mObInitMap.put(new Pair<String, String>("azo", "net/minecraft/world/storage/SaveHandlerMP")); - mObInitMap.put( - new Pair<String, String>( - "brt", - "net/minecraft/client/resources/data/BaseMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("bfw", "net/minecraft/client/gui/GuiMerchant$MerchantButton")); - mObInitMap.put(new Pair<String, String>("bjv", "net/minecraft/client/particle/EntityBubbleFX")); - mObInitMap.put(new Pair<String, String>("bnu", "net/minecraft/client/renderer/entity/RenderGiantZombie")); - mObInitMap.put(new Pair<String, String>("wm", "net/minecraft/entity/passive/EntityMooshroom")); - mObInitMap.put(new Pair<String, String>("oo", "net/minecraft/server/management/UserList$Serializer")); - mObInitMap.put(new Pair<String, String>("kp", "net/minecraft/init/Bootstrap$12")); - mObInitMap.put(new Pair<String, String>("gq", "net/minecraft/network/play/server/S2FPacketSetSlot")); - mObInitMap.put(new Pair<String, String>("cr", "net/minecraft/util/EnumFacing")); - mObInitMap.put(new Pair<String, String>("aof", "net/minecraft/block/BlockTripWire")); - mObInitMap.put(new Pair<String, String>("akg", "net/minecraft/block/BlockDaylightDetector")); - mObInitMap.put(new Pair<String, String>("aci", "net/minecraft/item/ItemDoublePlant")); - mObInitMap.put(new Pair<String, String>("agh", "net/minecraft/enchantment/EnchantmentOxygen")); - mObInitMap.put( - new Pair<String, String>( - "bsh", - "net/minecraft/client/resources/data/PackMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("bcl", "net/minecraft/client/gui/GuiOptionsRowList$Row")); - mObInitMap.put(new Pair<String, String>("bgk", "net/minecraft/client/gui/GuiResourcePackList")); - mObInitMap.put(new Pair<String, String>("bkj", "net/minecraft/client/particle/EntityHugeExplodeFX")); - mObInitMap.put(new Pair<String, String>("boi", "net/minecraft/client/renderer/entity/RenderMinecart")); - mObInitMap.put(new Pair<String, String>("pc", "net/minecraft/stats/AchievementList")); - mObInitMap.put(new Pair<String, String>("ld", "net/minecraft/client/util/JsonException$Entry")); - mObInitMap.put(new Pair<String, String>("he", "net/minecraft/network/play/server/S34PacketMaps")); - mObInitMap.put(new Pair<String, String>("df", "net/minecraft/nbt/NBTTagByteArray")); - mObInitMap.put(new Pair<String, String>("asd", "net/minecraft/world/gen/feature/WorldGenDungeons")); - mObInitMap.put( - new Pair<String, String>("awc", "net/minecraft/world/gen/structure/StructureVillagePieces$House3")); - mObInitMap.put(new Pair<String, String>("dy", "net/minecraft/nbt/NBTBase")); - mObInitMap.put(new Pair<String, String>("ta", "net/minecraft/entity/IEntityOwnable")); - mObInitMap.put(new Pair<String, String>("pb", "net/minecraft/stats/Achievement")); - mObInitMap.put(new Pair<String, String>("asw", "net/minecraft/world/gen/structure/MapGenMineshaft")); - mObInitMap.put(new Pair<String, String>("aox", "net/minecraft/tileentity/TileEntityCommandBlock")); - mObInitMap.put(new Pair<String, String>("aky", "net/minecraft/block/BlockFarmland")); - mObInitMap.put(new Pair<String, String>("agz", "net/minecraft/world/GameRules$Value")); - mObInitMap.put(new Pair<String, String>("awv", "net/minecraft/block/material/MapColor")); - mObInitMap.put(new Pair<String, String>("bds", "net/minecraft/client/gui/GuiFlatPresets$ListSlot")); - mObInitMap.put(new Pair<String, String>("bhr", "net/minecraft/client/model/ModelBase")); - mObInitMap.put(new Pair<String, String>("bsz", "net/minecraft/server/integrated/IntegratedServer$2")); - mObInitMap.put(new Pair<String, String>("xs", "net/minecraft/entity/item/EntityMinecartEmpty")); - mObInitMap.put(new Pair<String, String>("tt", "net/minecraft/entity/ai/EntityJumpHelper")); - mObInitMap.put(new Pair<String, String>("pu", "net/minecraft/util/JsonUtils")); - mObInitMap.put(new Pair<String, String>("lv", "net/minecraft/server/dedicated/DedicatedServer$2")); - mObInitMap.put(new Pair<String, String>("hw", "net/minecraft/network/play/server/S1CPacketEntityMetadata")); - mObInitMap.put(new Pair<String, String>("dx", "net/minecraft/nbt/NBTTagString")); - mObInitMap.put( - new Pair<String, String>( - "atk", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor4")); - mObInitMap.put(new Pair<String, String>("apl", "net/minecraft/tileentity/TileEntityNote")); - mObInitMap.put(new Pair<String, String>("alm", "net/minecraft/block/BlockHay")); - mObInitMap.put(new Pair<String, String>("ado", "net/minecraft/item/ItemPiston")); - mObInitMap.put(new Pair<String, String>("ahn", "net/minecraft/world/EnumSkyBlock")); - mObInitMap.put(new Pair<String, String>("axj", "net/minecraft/world/gen/layer/GenLayerFuzzyZoom")); - mObInitMap.put( - new Pair<String, String>( - "btn", - "net/minecraft/client/audio/SoundManager$SoundSystemStarterThread")); - mObInitMap.put(new Pair<String, String>("bpo", "net/minecraft/client/shader/ShaderUniform")); - mObInitMap.put(new Pair<String, String>("bhq", "net/minecraft/client/model/ModelMinecart")); - mObInitMap.put(new Pair<String, String>("blp", "net/minecraft/client/renderer/RenderSorter")); - mObInitMap.put(new Pair<String, String>("yg", "net/minecraft/entity/monster/EntityMob")); - mObInitMap.put(new Pair<String, String>("uh", "net/minecraft/entity/ai/EntityAIFollowParent")); - mObInitMap.put(new Pair<String, String>("qi", "net/minecraft/profiler/Profiler")); - mObInitMap.put(new Pair<String, String>("mj", "net/minecraft/client/renderer/DestroyBlockProgress")); - mObInitMap.put(new Pair<String, String>("ik", "net/minecraft/network/play/server/S18PacketEntityTeleport")); - mObInitMap.put(new Pair<String, String>("el", "net/minecraft/network/NetworkManager$2")); - mObInitMap.put(new Pair<String, String>("am", "net/minecraft/command/CommandEffect")); - mObInitMap.put(new Pair<String, String>("ama", "net/minecraft/block/BlockMobSpawner")); - mObInitMap.put(new Pair<String, String>("aec", "net/minecraft/item/ItemSnow")); - mObInitMap.put(new Pair<String, String>("aad", "net/minecraft/inventory/ContainerChest")); - mObInitMap.put(new Pair<String, String>("aib", "net/minecraft/world/biome/WorldChunkManager")); - mObInitMap.put(new Pair<String, String>("d", "net/minecraft/crash/CrashReport$2")); - mObInitMap.put( - new Pair<String, String>( - "bub", - "net/minecraft/client/stream/BroadcastController$SwitchBroadcastState")); - mObInitMap.put(new Pair<String, String>("bqc", "net/minecraft/client/renderer/texture/TextureMap$3")); - mObInitMap.put(new Pair<String, String>("bag", "net/minecraft/scoreboard/ScoreHealthCriteria")); - mObInitMap.put(new Pair<String, String>("bef", "net/minecraft/client/gui/GuiVideoSettings")); - mObInitMap.put(new Pair<String, String>("bie", "net/minecraft/client/model/ModelSlime")); - mObInitMap.put(new Pair<String, String>("bmd", "net/minecraft/client/renderer/RenderList")); - mObInitMap.put(new Pair<String, String>("ba", "net/minecraft/command/server/CommandMessageRaw")); - mObInitMap.put(new Pair<String, String>("aev", "net/minecraft/item/crafting/RecipesArmor")); - mObInitMap.put(new Pair<String, String>("aaw", "net/minecraft/inventory/InventoryCraftResult")); - mObInitMap.put(new Pair<String, String>("w", "net/minecraft/client/audio/SoundCategory")); - mObInitMap - .put(new Pair<String, String>("bqv", "net/minecraft/client/resources/IReloadableResourceManager")); - mObInitMap.put(new Pair<String, String>("baz", "net/minecraft/client/Minecraft$3")); - mObInitMap.put(new Pair<String, String>("bey", "net/minecraft/client/gui/GuiRepair")); - mObInitMap.put(new Pair<String, String>("bix", "net/minecraft/client/model/ModelRenderer")); - mObInitMap.put(new Pair<String, String>("bmw", "net/minecraft/client/renderer/culling/ClippingHelperImpl")); - mObInitMap - .put(new Pair<String, String>("fs", "net/minecraft/util/ChatComponentTranslationFormatException")); - mObInitMap.put(new Pair<String, String>("bt", "net/minecraft/command/server/CommandStop")); - mObInitMap.put(new Pair<String, String>("yy", "net/minecraft/entity/player/InventoryPlayer$1")); - mObInitMap.put(new Pair<String, String>("uz", "net/minecraft/entity/ai/EntityAIPanic")); - mObInitMap.put(new Pair<String, String>("aqr", "net/minecraft/world/WorldProviderEnd")); - mObInitMap.put(new Pair<String, String>("ams", "net/minecraft/block/BlockCompressedPowered")); - mObInitMap.put(new Pair<String, String>("aeu", "net/minecraft/item/crafting/RecipesArmorDyes")); - mObInitMap.put(new Pair<String, String>("ait", "net/minecraft/world/biome/BiomeGenSavanna$Mutated")); - mObInitMap.put( - new Pair<String, String>( - "auq", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Library")); - mObInitMap.put(new Pair<String, String>("ayp", "net/minecraft/world/storage/DerivedWorldInfo")); - mObInitMap.put(new Pair<String, String>("bbn", "net/minecraft/client/settings/GameSettings$Options$1")); - mObInitMap.put( - new Pair<String, String>( - "bfm", - "net/minecraft/client/gui/inventory/GuiContainerCreative$ContainerCreative")); - mObInitMap.put(new Pair<String, String>("but", "net/minecraft/realms/RealmsServerStatusPinger$1")); - mObInitMap.put(new Pair<String, String>("bqu", "net/minecraft/client/resources/GrassColorReloadListener")); - mObInitMap.put(new Pair<String, String>("zm", "net/minecraft/entity/item/EntityEnderPearl")); - mObInitMap.put(new Pair<String, String>("vn", "net/minecraft/entity/ai/EntityAIHurtByTarget")); - mObInitMap.put(new Pair<String, String>("ro", "net/minecraft/util/DamageSource")); - mObInitMap.put( - new Pair<String, String>("np", "net/minecraft/server/network/NetHandlerLoginServer$LoginState")); - mObInitMap - .put(new Pair<String, String>("jq", "net/minecraft/network/handshake/INetHandlerHandshakeServer")); - mObInitMap.put(new Pair<String, String>("fr", "net/minecraft/util/ChatComponentTranslation")); - mObInitMap.put(new Pair<String, String>("arf", "net/minecraft/world/gen/feature/WorldGenBlockBlob")); - mObInitMap.put(new Pair<String, String>("ang", "net/minecraft/block/BlockRotatedPillar")); - mObInitMap.put(new Pair<String, String>("abj", "net/minecraft/item/ItemBoat")); - mObInitMap.put(new Pair<String, String>("afi", "net/minecraft/item/crafting/ShapelessRecipes")); - mObInitMap.put(new Pair<String, String>("ajh", "net/minecraft/block/BlockBed")); - mObInitMap.put(new Pair<String, String>("ave", "net/minecraft/world/gen/structure/MapGenStructure")); - mObInitMap.put(new Pair<String, String>("azd", "net/minecraft/client/AnvilConverterException")); - mObInitMap - .put(new Pair<String, String>("net/minecraft/client/main/Main", "net/minecraft/client/main/Main")); - mObInitMap.put(new Pair<String, String>("bri", "net/minecraft/client/resources/SimpleResource")); - mObInitMap.put(new Pair<String, String>("bfl", "net/minecraft/client/gui/inventory/GuiContainerCreative")); - mObInitMap.put(new Pair<String, String>("bjk", "net/minecraft/client/entity/EntityClientPlayerMP")); - mObInitMap.put(new Pair<String, String>("bnj", "net/minecraft/client/renderer/entity/RenderEntity")); - mObInitMap.put(new Pair<String, String>("wb", "net/minecraft/village/VillageSiege")); - mObInitMap.put(new Pair<String, String>("sc", "net/minecraft/entity/Entity$2")); - mObInitMap.put(new Pair<String, String>("od", "net/minecraft/server/management/PreYggdrasilConverter$4")); - mObInitMap.put(new Pair<String, String>("ke", "net/minecraft/network/ServerStatusResponse$Serializer")); - mObInitMap - .put(new Pair<String, String>("gf", "net/minecraft/network/play/server/S35PacketUpdateTileEntity")); - mObInitMap.put(new Pair<String, String>("cg", "net/minecraft/command/PlayerNotFoundException")); - mObInitMap.put(new Pair<String, String>("ary", "net/minecraft/world/gen/feature/WorldGenGlowStone1")); - mObInitMap.put(new Pair<String, String>("anz", "net/minecraft/block/BlockTallGrass")); - mObInitMap.put(new Pair<String, String>("bca", "net/minecraft/client/gui/ScaledResolution")); - mObInitMap.put(new Pair<String, String>("ow", "net/minecraft/network/rcon/RConThreadBase")); - mObInitMap.put(new Pair<String, String>("kx", "net/minecraft/init/Bootstrap$6")); - mObInitMap.put( - new Pair<String, String>("gy", "net/minecraft/network/play/server/S21PacketChunkData$Extracted")); - mObInitMap.put(new Pair<String, String>("cz", "net/minecraft/util/IRegistry")); - mObInitMap.put(new Pair<String, String>("acq", "net/minecraft/item/ItemFireball")); - mObInitMap.put(new Pair<String, String>("agp", "net/minecraft/command/server/CommandBlockLogic")); - mObInitMap.put(new Pair<String, String>("bsp", "net/minecraft/client/audio/SoundList")); - mObInitMap.put(new Pair<String, String>("boq", "net/minecraft/client/renderer/entity/RenderSheep")); - mObInitMap.put(new Pair<String, String>("arx", "net/minecraft/world/gen/feature/WorldGenLakes")); - mObInitMap.put( - new Pair<String, String>( - "avw", - "net/minecraft/world/gen/structure/StructureVillagePieces$House4Garden")); - mObInitMap.put(new Pair<String, String>("azv", "net/minecraft/util/MovingObjectPosition$MovingObjectType")); - mObInitMap.put(new Pair<String, String>("bct", "net/minecraft/client/gui/GuiChat")); - mObInitMap.put(new Pair<String, String>("bgs", "net/minecraft/client/gui/stream/GuiTwitchUserMode")); - mObInitMap.put(new Pair<String, String>("bkr", "net/minecraft/client/particle/EffectRenderer$4")); - mObInitMap.put(new Pair<String, String>("dn", "net/minecraft/nbt/NBTTagIntArray")); - mObInitMap.put(new Pair<String, String>("wt", "net/minecraft/entity/monster/EntityIronGolem")); - mObInitMap.put(new Pair<String, String>("su", "net/minecraft/entity/EntityLeashKnot")); - mObInitMap.put(new Pair<String, String>("asl", "net/minecraft/world/gen/feature/WorldGenSpikes")); - mObInitMap.put(new Pair<String, String>("aom", "net/minecraft/block/BlockWood")); - mObInitMap.put(new Pair<String, String>("akn", "net/minecraft/block/BlockDoor")); - mObInitMap.put(new Pair<String, String>("ago", "net/minecraft/village/MerchantRecipeList")); - mObInitMap.put(new Pair<String, String>("awk", "net/minecraft/world/gen/NoiseGeneratorOctaves")); - mObInitMap.put(new Pair<String, String>("bdh", "net/minecraft/client/gui/GuiErrorScreen")); - mObInitMap.put(new Pair<String, String>("bhg", "net/minecraft/client/model/ModelChest")); - mObInitMap.put(new Pair<String, String>("bso", "net/minecraft/client/audio/PositionedSoundRecord")); - mObInitMap.put(new Pair<String, String>("xh", "net/minecraft/entity/effect/EntityLightningBolt")); - mObInitMap.put(new Pair<String, String>("ti", "net/minecraft/entity/ai/attributes/IAttributeInstance")); - mObInitMap.put(new Pair<String, String>("pj", "net/minecraft/stats/StatBase$2")); - mObInitMap.put(new Pair<String, String>("lk", "net/minecraft/server/MinecraftServer$4")); - mObInitMap.put(new Pair<String, String>("apa", "net/minecraft/tileentity/TileEntityDaylightDetector")); - mObInitMap.put(new Pair<String, String>("alb", "net/minecraft/block/BlockFire")); - mObInitMap.put(new Pair<String, String>("add", "net/minecraft/item/ItemStack")); - mObInitMap.put(new Pair<String, String>("ahc", "net/minecraft/world/World$1")); - mObInitMap.put( - new Pair<String, String>( - "btc", - "net/minecraft/client/network/LanServerDetector$ThreadLanServerFind")); - mObInitMap - .put(new Pair<String, String>("bpd", "net/minecraft/client/renderer/tileentity/RenderWitherSkull")); - mObInitMap.put(new Pair<String, String>("bhf", "net/minecraft/client/model/ModelBook")); - mObInitMap.put(new Pair<String, String>("ble", "net/minecraft/client/particle/EntityFishWakeFX")); - mObInitMap.put(new Pair<String, String>("ea", "net/minecraft/nbt/NBTException")); - mObInitMap.put(new Pair<String, String>("ab", "net/minecraft/command/ICommandManager")); - mObInitMap.put(new Pair<String, String>("adw", "net/minecraft/item/ItemSeeds")); - mObInitMap.put(new Pair<String, String>("ahv", "net/minecraft/world/biome/BiomeGenBase$Height")); - mObInitMap.put(new Pair<String, String>("btv", "net/minecraft/client/audio/SoundEventAccessor")); - mObInitMap.put(new Pair<String, String>("bpw", "net/minecraft/client/renderer/texture/Stitcher$Holder")); - mObInitMap.put(new Pair<String, String>("bdz", "net/minecraft/client/gui/GuiShareToLan")); - mObInitMap.put(new Pair<String, String>("bhy", "net/minecraft/client/model/ModelSheep2")); - mObInitMap.put(new Pair<String, String>("blx", "net/minecraft/client/renderer/IImageBuffer")); - mObInitMap.put( - new Pair<String, String>("mr", "net/minecraft/server/management/PlayerManager$PlayerInstance")); - mObInitMap.put(new Pair<String, String>("is", "net/minecraft/network/play/client/C16PacketClientStatus")); - mObInitMap.put(new Pair<String, String>("et", "net/minecraft/network/PacketBuffer")); - mObInitMap.put(new Pair<String, String>("au", "net/minecraft/command/CommandHelp")); - mObInitMap.put(new Pair<String, String>("aek", "net/minecraft/item/ItemCloth")); - mObInitMap.put(new Pair<String, String>("aal", "net/minecraft/inventory/ContainerHopper")); - mObInitMap.put(new Pair<String, String>("l", "net/minecraft/crash/CrashReportCategory$1")); - mObInitMap.put( - new Pair<String, String>("bqk", "net/minecraft/client/renderer/texture/ITickableTextureObject")); - mObInitMap.put( - new Pair<String, String>( - "atr", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Throne")); - mObInitMap.put(new Pair<String, String>("aps", "net/minecraft/tileentity/TileEntityPiston")); - mObInitMap.put(new Pair<String, String>("axq", "net/minecraft/world/gen/layer/GenLayerRareBiome")); - mObInitMap.put(new Pair<String, String>("bao", "net/minecraft/client/Minecraft")); - mObInitMap.put(new Pair<String, String>("ben", "net/minecraft/client/gui/achievement/GuiStats$StatsItem")); - mObInitMap.put(new Pair<String, String>("bim", "net/minecraft/client/model/ModelWitch")); - mObInitMap.put( - new Pair<String, String>( - "bml", - "net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer")); - mObInitMap.put(new Pair<String, String>("fh", "net/minecraft/event/ClickEvent")); - mObInitMap.put(new Pair<String, String>("bi", "net/minecraft/command/server/CommandSaveOff")); - mObInitMap.put(new Pair<String, String>("yn", "net/minecraft/entity/monster/EntitySpider")); - mObInitMap.put(new Pair<String, String>("uo", "net/minecraft/entity/ai/EntityAILookAtTradePlayer")); - mObInitMap.put( - new Pair<String, String>( - "aqg", - "net/minecraft/world/chunk/storage/ChunkLoader$AnvilConverterData")); - mObInitMap.put(new Pair<String, String>("amh", "net/minecraft/block/BlockNewLeaf")); - mObInitMap.put(new Pair<String, String>("aii", "net/minecraft/world/biome/BiomeGenHell")); - mObInitMap.put( - new Pair<String, String>( - "auf", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$SwampHut")); - mObInitMap.put(new Pair<String, String>("aye", "net/minecraft/pathfinding/PathPoint")); - mObInitMap.put(new Pair<String, String>("bbc", "net/minecraft/client/Minecraft$6")); - mObInitMap - .put(new Pair<String, String>("bfb", "net/minecraft/client/gui/inventory/GuiBeacon$ConfirmButton")); - mObInitMap.put(new Pair<String, String>("bui", "net/minecraft/client/stream/IngestServerTester")); - mObInitMap.put(new Pair<String, String>("bqj", "net/minecraft/client/renderer/texture/ITickable")); - mObInitMap - .put(new Pair<String, String>("zb", "net/minecraft/entity/player/EntityPlayer$EnumChatVisibility")); - mObInitMap.put(new Pair<String, String>("vc", "net/minecraft/entity/ai/EntityAIWander")); - mObInitMap.put(new Pair<String, String>("rd", "net/minecraft/world/EnumDifficulty")); - mObInitMap.put(new Pair<String, String>("ne", "net/minecraft/network/NetworkSystem$2")); - mObInitMap.put( - new Pair<String, String>( - "jf", - "net/minecraft/network/play/client/C03PacketPlayer$C06PacketPlayerPosLook")); - mObInitMap.put(new Pair<String, String>("fg", "net/minecraft/util/ChatComponentStyle$2")); - mObInitMap.put(new Pair<String, String>("aqz", "net/minecraft/world/gen/ChunkProviderGenerate")); - mObInitMap.put( - new Pair<String, String>( - "auy", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stairs")); - mObInitMap.put(new Pair<String, String>("ayx", "net/minecraft/world/storage/WorldInfo$5")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsSliderButton", - "net/minecraft/realms/RealmsSliderButton")); - mObInitMap.put(new Pair<String, String>("zu", "net/minecraft/inventory/ContainerRepair")); - mObInitMap.put(new Pair<String, String>("vv", "net/minecraft/pathfinding/PathNavigate")); - mObInitMap.put(new Pair<String, String>("rw", "net/minecraft/potion/PotionEffect")); - mObInitMap.put(new Pair<String, String>("nx", "net/minecraft/server/management/BanList")); - mObInitMap.put(new Pair<String, String>("jy", "net/minecraft/network/status/INetHandlerStatusClient")); - mObInitMap.put(new Pair<String, String>("fz", "net/minecraft/network/play/server/S0FPacketSpawnMob")); - mObInitMap.put(new Pair<String, String>("arn", "net/minecraft/world/gen/feature/WorldGenerator")); - mObInitMap.put(new Pair<String, String>("ano", "net/minecraft/block/BlockSoulSand")); - mObInitMap.put(new Pair<String, String>("abr", "net/minecraft/item/ItemColored")); - mObInitMap.put(new Pair<String, String>("afq", "net/minecraft/enchantment/EnchantmentDamage")); - mObInitMap.put(new Pair<String, String>("ajp", "net/minecraft/block/BlockBookshelf")); - mObInitMap.put(new Pair<String, String>("brq", "net/minecraft/client/resources/Language")); - mObInitMap.put(new Pair<String, String>("bbu", "net/minecraft/client/gui/FontRenderer")); - mObInitMap - .put(new Pair<String, String>("bft", "net/minecraft/client/gui/inventory/GuiScreenHorseInventory")); - mObInitMap.put(new Pair<String, String>("bjs", "net/minecraft/client/network/OldServerPinger$2")); - mObInitMap.put(new Pair<String, String>("bnr", "net/minecraft/client/renderer/entity/RenderFireball")); - mObInitMap.put(new Pair<String, String>("sk", "net/minecraft/command/IEntitySelector$1")); - mObInitMap.put(new Pair<String, String>("ol", "net/minecraft/server/management/UserListEntry")); - mObInitMap.put(new Pair<String, String>("km", "net/minecraft/init/Bootstrap$1")); - mObInitMap.put(new Pair<String, String>("gn", "net/minecraft/network/play/server/S2DPacketOpenWindow")); - mObInitMap.put(new Pair<String, String>("co", "net/minecraft/util/RegistryDefaulted")); - mObInitMap.put(new Pair<String, String>("acf", "net/minecraft/creativetab/CreativeTabs$9")); - mObInitMap.put(new Pair<String, String>("age", "net/minecraft/enchantment/EnchantmentFishingSpeed")); - mObInitMap.put( - new Pair<String, String>("bse", "net/minecraft/client/resources/data/LanguageMetadataSection")); - mObInitMap.put(new Pair<String, String>("arm", "net/minecraft/world/gen/feature/WorldGenDoublePlant")); - mObInitMap.put( - new Pair<String, String>( - "avl", - "net/minecraft/world/gen/structure/StructureComponent$BlockSelector")); - mObInitMap.put(new Pair<String, String>("bci", "net/minecraft/client/gui/GuiListExtended$IGuiListEntry")); - mObInitMap.put( - new Pair<String, String>("bgh", "net/minecraft/client/resources/ResourcePackListEntryDefault")); - mObInitMap.put(new Pair<String, String>("bkg", "net/minecraft/client/particle/EntityFootStepFX")); - mObInitMap.put(new Pair<String, String>("bof", "net/minecraft/client/renderer/entity/RenderLeashKnot")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/server/MinecraftServer", - "net/minecraft/server/MinecraftServer")); - mObInitMap.put(new Pair<String, String>("hb", "net/minecraft/network/play/server/S2APacketParticles")); - mObInitMap.put(new Pair<String, String>("wi", "net/minecraft/entity/passive/EntityHorse")); - mObInitMap.put(new Pair<String, String>("sj", "net/minecraft/command/IEntitySelector")); - mObInitMap.put(new Pair<String, String>("asa", "net/minecraft/world/gen/feature/WorldGenMegaPineTree")); - mObInitMap.put(new Pair<String, String>("aob", "net/minecraft/block/BlockTNT")); - mObInitMap.put(new Pair<String, String>("akc", "net/minecraft/block/BlockRedstoneComparator")); - mObInitMap.put(new Pair<String, String>("agd", "net/minecraft/enchantment/EnchantmentFireAspect")); - mObInitMap.put( - new Pair<String, String>( - "bsd", - "net/minecraft/client/resources/data/FontMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("ha", "net/minecraft/network/play/server/S28PacketEffect")); - mObInitMap.put(new Pair<String, String>("ast", "net/minecraft/world/gen/FlatLayerInfo")); - mObInitMap.put(new Pair<String, String>("aou", "net/minecraft/tileentity/TileEntity$3")); - mObInitMap.put(new Pair<String, String>("akv", "net/minecraft/block/BlockEnderChest")); - mObInitMap.put(new Pair<String, String>("acx", "net/minecraft/item/ItemFood")); - mObInitMap.put(new Pair<String, String>("agw", "net/minecraft/world/Explosion")); - mObInitMap.put(new Pair<String, String>("aws", "net/minecraft/block/material/MaterialLiquid")); - mObInitMap.put(new Pair<String, String>("bsw", "net/minecraft/server/integrated/IntegratedPlayerList")); - mObInitMap.put(new Pair<String, String>("box", "net/minecraft/client/renderer/entity/RenderTntMinecart")); - mObInitMap.put(new Pair<String, String>("bky", "net/minecraft/client/particle/EntitySplashFX")); - mObInitMap.put(new Pair<String, String>("xp", "net/minecraft/entity/item/EntityMinecartContainer")); - mObInitMap.put(new Pair<String, String>("tq", "net/minecraft/entity/ai/attributes/ServersideAttributeMap")); - mObInitMap.put(new Pair<String, String>("pr", "net/minecraft/util/JsonSerializableSet")); - mObInitMap.put(new Pair<String, String>("ls", "net/minecraft/server/dedicated/DedicatedPlayerList")); - mObInitMap.put(new Pair<String, String>("ht", "net/minecraft/network/play/server/S19PacketEntityHeadLook")); - mObInitMap.put(new Pair<String, String>("du", "net/minecraft/nbt/CompressedStreamTools")); - mObInitMap.put(new Pair<String, String>("api", "net/minecraft/tileentity/TileEntityHopper")); - mObInitMap.put(new Pair<String, String>("alj", "net/minecraft/block/BlockSlab")); - mObInitMap.put(new Pair<String, String>("adl", "net/minecraft/item/ItemMultiTexture")); - mObInitMap.put(new Pair<String, String>("ahk", "net/minecraft/world/WorldSettings$GameType")); - mObInitMap.put(new Pair<String, String>("btk", "net/minecraft/client/audio/SoundManager$1")); - mObInitMap.put(new Pair<String, String>("bpl", "net/minecraft/client/shader/ShaderLoader")); - mObInitMap.put(new Pair<String, String>("bdo", "net/minecraft/client/gui/GuiMemoryErrorScreen")); - mObInitMap.put(new Pair<String, String>("bhn", "net/minecraft/client/model/ModelLargeChest")); - mObInitMap.put(new Pair<String, String>("blm", "net/minecraft/client/renderer/RenderBlocks")); - mObInitMap.put(new Pair<String, String>("qf", "net/minecraft/util/EnumTypeAdapterFactory")); - mObInitMap.put(new Pair<String, String>("mg", "net/minecraft/server/gui/StatsComponent$1")); - mObInitMap.put(new Pair<String, String>("ih", "net/minecraft/network/play/server/S03PacketTimeUpdate")); - mObInitMap.put(new Pair<String, String>("ei", "net/minecraft/network/NettyEncryptingEncoder")); - mObInitMap.put(new Pair<String, String>("aj", "net/minecraft/command/server/CommandDeOp")); - mObInitMap.put(new Pair<String, String>("aaa", "net/minecraft/inventory/ContainerBrewingStand$Ingredient")); - mObInitMap.put(new Pair<String, String>("a", "net/minecraft/util/EnumChatFormatting")); - mObInitMap.put( - new Pair<String, String>( - "atg", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing3")); - mObInitMap.put(new Pair<String, String>("axf", "net/minecraft/world/gen/layer/GenLayerBiome")); - mObInitMap.put(new Pair<String, String>("bad", "net/minecraft/scoreboard/ScoreboardSaveData")); - mObInitMap.put(new Pair<String, String>("bec", "net/minecraft/client/gui/GuiScreenOptionsSounds")); - mObInitMap.put(new Pair<String, String>("bib", "net/minecraft/client/model/ModelSkeletonHead")); - mObInitMap.put(new Pair<String, String>("bma", "net/minecraft/client/renderer/RenderGlobal")); - mObInitMap.put(new Pair<String, String>("yc", "net/minecraft/entity/monster/IMob$1")); - mObInitMap.put(new Pair<String, String>("ud", "net/minecraft/entity/ai/EntityAIEatGrass")); - mObInitMap.put(new Pair<String, String>("qe", "net/minecraft/util/LongHashMap$Entry")); - mObInitMap.put(new Pair<String, String>("t", "net/minecraft/util/ChatAllowedCharacters")); - mObInitMap.put( - new Pair<String, String>( - "atz", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces")); - mObInitMap.put(new Pair<String, String>("baw", "net/minecraft/client/Minecraft$16")); - mObInitMap.put(new Pair<String, String>("bev", "net/minecraft/client/gui/GuiKeyBindingList$KeyEntry")); - mObInitMap.put(new Pair<String, String>("yv", "net/minecraft/entity/passive/EntityVillager")); - mObInitMap.put(new Pair<String, String>("uw", "net/minecraft/entity/ai/EntityAIOcelotSit")); - mObInitMap.put(new Pair<String, String>("qx", "net/minecraft/util/WeightedRandomChestContent")); - mObInitMap.put(new Pair<String, String>("my", "net/minecraft/entity/EntityTrackerEntry")); - mObInitMap.put(new Pair<String, String>("iz", "net/minecraft/network/play/client/C17PacketCustomPayload")); - mObInitMap.put(new Pair<String, String>("aqo", "net/minecraft/world/WorldProvider")); - mObInitMap.put(new Pair<String, String>("amp", "net/minecraft/block/BlockPortal")); - mObInitMap.put(new Pair<String, String>("aas", "net/minecraft/inventory/InventoryMerchant")); - mObInitMap.put( - new Pair<String, String>( - "aun", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Corridor")); - mObInitMap.put(new Pair<String, String>("aym", "net/minecraft/world/chunk/storage/AnvilSaveHandler")); - mObInitMap.put(new Pair<String, String>("buq", "net/minecraft/client/stream/TwitchStream$1$1")); - mObInitMap.put(new Pair<String, String>("bqr", "net/minecraft/client/resources/FileResourcePack")); - mObInitMap.put( - new Pair<String, String>( - "bms", - "net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer")); - mObInitMap.put(new Pair<String, String>("zj", "net/minecraft/entity/projectile/EntitySnowball")); - mObInitMap.put(new Pair<String, String>("vk", "net/minecraft/entity/ai/EntityAITempt")); - mObInitMap.put(new Pair<String, String>("rl", "net/minecraft/inventory/ISidedInventory")); - mObInitMap.put( - new Pair<String, String>( - "nm", - "net/minecraft/server/network/NetHandlerHandshakeTCP$SwitchEnumConnectionState")); - mObInitMap.put(new Pair<String, String>("jn", "net/minecraft/network/play/client/C12PacketUpdateSign")); - mObInitMap.put(new Pair<String, String>("fo", "net/minecraft/util/ChatStyle$1")); - mObInitMap.put(new Pair<String, String>("bp", "net/minecraft/command/CommandSetSpawnpoint")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsServerAddress", - "net/minecraft/realms/RealmsServerAddress")); - mObInitMap.put(new Pair<String, String>("arc", "net/minecraft/world/gen/feature/WorldGenAbstractTree")); - mObInitMap.put(new Pair<String, String>("and", "net/minecraft/block/BlockRedstoneTorch$Toggle")); - mObInitMap.put(new Pair<String, String>("abg", "net/minecraft/item/ItemBed")); - mObInitMap.put(new Pair<String, String>("aff", "net/minecraft/item/crafting/CraftingManager$1")); - mObInitMap.put(new Pair<String, String>("aje", "net/minecraft/block/BlockRailBase")); - mObInitMap.put( - new Pair<String, String>("brf", "net/minecraft/client/resources/ResourcePackRepository$Entry")); - mObInitMap.put(new Pair<String, String>("bbj", "net/minecraft/client/settings/GameSettings")); - mObInitMap.put(new Pair<String, String>("bfi", "net/minecraft/client/gui/inventory/GuiChest")); - mObInitMap.put(new Pair<String, String>("bjh", "net/minecraft/client/multiplayer/WorldClient$2")); - mObInitMap.put(new Pair<String, String>("bng", "net/minecraft/client/renderer/entity/RenderChicken")); - mObInitMap.put(new Pair<String, String>("oa", "net/minecraft/server/management/PreYggdrasilConverter$1")); - mObInitMap.put(new Pair<String, String>("kb", "net/minecraft/network/ServerStatusResponse")); - mObInitMap.put(new Pair<String, String>("gc", "net/minecraft/network/play/server/S0BPacketAnimation")); - mObInitMap.put(new Pair<String, String>("cd", "net/minecraft/command/CommandException")); - mObInitMap.put(new Pair<String, String>("abz", "net/minecraft/creativetab/CreativeTabs$3")); - mObInitMap.put(new Pair<String, String>("afy", "net/minecraft/enchantment/EnchantmentHelper$HurtIterator")); - mObInitMap.put( - new Pair<String, String>( - "bry", - "net/minecraft/client/resources/data/IMetadataSerializer$Registration")); - mObInitMap.put( - new Pair<String, String>( - "ava", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Straight")); - mObInitMap.put(new Pair<String, String>("bnz", "net/minecraft/client/renderer/entity/RenderItem$1")); - mObInitMap - .put(new Pair<String, String>("gv", "net/minecraft/network/play/server/S2BPacketChangeGameState")); - mObInitMap.put(new Pair<String, String>("cw", "net/minecraft/util/RegistryNamespaced")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsScrolledSelectionList", - "net/minecraft/realms/RealmsScrolledSelectionList")); - mObInitMap.put(new Pair<String, String>("aru", "net/minecraft/world/gen/feature/WorldGenBigMushroom")); - mObInitMap.put(new Pair<String, String>("anv", "net/minecraft/block/BlockStone")); - mObInitMap - .put(new Pair<String, String>("afx", "net/minecraft/enchantment/EnchantmentHelper$DamageIterator")); - mObInitMap.put(new Pair<String, String>("ajw", "net/minecraft/block/BlockCauldron")); - mObInitMap.put( - new Pair<String, String>("avt", "net/minecraft/world/gen/structure/StructureVillagePieces$Torch")); - mObInitMap.put(new Pair<String, String>("azs", "net/minecraft/world/storage/IThreadedFileIO")); - mObInitMap.put(new Pair<String, String>("bcq", "net/minecraft/client/gui/GuiScreenRealmsProxy")); - mObInitMap.put(new Pair<String, String>("bgp", "net/minecraft/client/gui/stream/GuiStreamUnavailable")); - mObInitMap - .put(new Pair<String, String>("brx", "net/minecraft/client/resources/data/IMetadataSerializer$1")); - mObInitMap.put(new Pair<String, String>("wq", "net/minecraft/entity/passive/EntitySheep$1")); - mObInitMap.put(new Pair<String, String>("sr", "net/minecraft/entity/EntityFlying")); - mObInitMap.put(new Pair<String, String>("os", "net/minecraft/server/management/UserListWhitelistEntry")); - mObInitMap.put(new Pair<String, String>("kt", "net/minecraft/init/Bootstrap$3")); - mObInitMap.put(new Pair<String, String>("gu", "net/minecraft/network/play/server/S27PacketExplosion")); - mObInitMap.put(new Pair<String, String>("asi", "net/minecraft/world/gen/feature/WorldGenCanopyTree")); - mObInitMap.put(new Pair<String, String>("aoj", "net/minecraft/block/BlockLilyPad")); - mObInitMap.put(new Pair<String, String>("akk", "net/minecraft/block/BlockDirectional")); - mObInitMap.put(new Pair<String, String>("acm", "net/minecraft/item/ItemEnchantedBook")); - mObInitMap.put(new Pair<String, String>("agl", "net/minecraft/enchantment/EnchantmentWaterWorker")); - mObInitMap.put(new Pair<String, String>("bsl", "net/minecraft/client/audio/MovingSound")); - mObInitMap.put(new Pair<String, String>("bom", "net/minecraft/client/renderer/entity/RenderOcelot")); - mObInitMap.put(new Pair<String, String>("bgo", "net/minecraft/client/gui/stream/GuiStreamOptions")); - mObInitMap.put(new Pair<String, String>("bkn", "net/minecraft/client/particle/EffectRenderer")); - mObInitMap.put( - new Pair<String, String>("net/minecraft/realms/RealmsScreen", "net/minecraft/realms/RealmsScreen")); - mObInitMap.put(new Pair<String, String>("xe", "net/minecraft/entity/projectile/EntityFishHook")); - mObInitMap.put(new Pair<String, String>("tf", "net/minecraft/entity/DataWatcher$WatchableObject")); - mObInitMap.put(new Pair<String, String>("pg", "net/minecraft/stats/StatisticsFile")); - mObInitMap.put(new Pair<String, String>("lh", "net/minecraft/server/MinecraftServer$1")); - mObInitMap.put( - new Pair<String, String>( - "hi", - "net/minecraft/network/play/server/S14PacketEntity$S16PacketEntityLook")); - mObInitMap.put(new Pair<String, String>("dj", "net/minecraft/nbt/NBTTagCompound$2")); - mObInitMap.put(new Pair<String, String>("ada", "net/minecraft/item/ItemHoe")); - mObInitMap.put(new Pair<String, String>("bpa", "net/minecraft/client/renderer/entity/RenderVillager")); - mObInitMap.put(new Pair<String, String>("bdd", "net/minecraft/client/gui/GuiScreenDemo")); - mObInitMap.put(new Pair<String, String>("bhc", "net/minecraft/client/model/ModelBat")); - mObInitMap.put(new Pair<String, String>("blb", "net/minecraft/client/particle/EntityPickupFX")); - mObInitMap.put(new Pair<String, String>("pz", "net/minecraft/util/IntHashMap")); - mObInitMap.put(new Pair<String, String>("adt", "net/minecraft/item/ItemSaddle")); - mObInitMap.put(new Pair<String, String>("ahs", "net/minecraft/world/NextTickListEntry")); - mObInitMap.put(new Pair<String, String>("bts", "net/minecraft/client/audio/SoundHandler$SwitchType")); - mObInitMap.put(new Pair<String, String>("bpt", "net/minecraft/client/renderer/texture/LayeredTexture")); - mObInitMap.put(new Pair<String, String>("awz", "net/minecraft/world/gen/layer/GenLayerEdge$SwitchMode")); - mObInitMap.put(new Pair<String, String>("bdw", "net/minecraft/client/gui/GuiScreen")); - mObInitMap.put(new Pair<String, String>("bhv", "net/minecraft/client/model/TexturedQuad")); - mObInitMap.put(new Pair<String, String>("blu", "net/minecraft/client/renderer/EntityRenderer$1")); - mObInitMap.put(new Pair<String, String>("ip", "net/minecraft/network/play/client/C0APacketAnimation")); - mObInitMap.put(new Pair<String, String>("eq", "net/minecraft/network/EnumConnectionState$4")); - mObInitMap.put(new Pair<String, String>("ar", "net/minecraft/command/CommandGameMode")); - mObInitMap.put(new Pair<String, String>("xw", "net/minecraft/entity/item/EntityTNTPrimed")); - mObInitMap.put(new Pair<String, String>("tx", "net/minecraft/entity/ai/EntityAIAvoidEntity$1")); - mObInitMap.put(new Pair<String, String>("i", "net/minecraft/crash/CrashReport$7")); - mObInitMap.put( - new Pair<String, String>( - "ato", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor5")); - mObInitMap.put(new Pair<String, String>("app", "net/minecraft/block/BlockPistonBase")); - mObInitMap.put(new Pair<String, String>("alq", "net/minecraft/block/BlockJukebox")); - mObInitMap.put(new Pair<String, String>("ahr", "net/minecraft/world/ChunkCache")); - mObInitMap.put(new Pair<String, String>("axn", "net/minecraft/world/gen/layer/GenLayer")); - mObInitMap.put(new Pair<String, String>("bal", "net/minecraft/client/settings/KeyBinding")); - mObInitMap.put(new Pair<String, String>("bek", "net/minecraft/client/gui/achievement/GuiStats$StatsBlock")); - mObInitMap.put(new Pair<String, String>("bij", "net/minecraft/client/model/ModelIronGolem")); - mObInitMap.put(new Pair<String, String>("btr", "net/minecraft/client/audio/SoundHandler$2")); - mObInitMap.put(new Pair<String, String>("yk", "net/minecraft/entity/monster/EntitySilverfish")); - mObInitMap.put(new Pair<String, String>("ul", "net/minecraft/entity/ai/EntityAIWatchClosest2")); - mObInitMap.put(new Pair<String, String>("qm", "net/minecraft/util/MouseFilter")); - mObInitMap.put(new Pair<String, String>("mn", "net/minecraft/entity/EntityTracker")); - mObInitMap.put(new Pair<String, String>("io", "net/minecraft/network/play/INetHandlerPlayServer")); - mObInitMap.put(new Pair<String, String>("aeg", "net/minecraft/item/ItemSlab")); - mObInitMap.put(new Pair<String, String>("aah", "net/minecraft/inventory/ContainerEnchantment$1")); - mObInitMap.put(new Pair<String, String>("aif", "net/minecraft/world/biome/BiomeGenForest")); - mObInitMap.put( - new Pair<String, String>( - "auc", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$JunglePyramid")); - mObInitMap.put(new Pair<String, String>("ayb", "net/minecraft/world/gen/layer/GenLayerVoronoiZoom")); - mObInitMap - .put(new Pair<String, String>("buf", "net/minecraft/client/stream/ChatController$SwitchChatState")); - mObInitMap.put(new Pair<String, String>("bqg", "net/minecraft/client/renderer/texture/TextureManager$1")); - mObInitMap.put(new Pair<String, String>("bii", "net/minecraft/client/model/PositionTextureVertex")); - mObInitMap.put(new Pair<String, String>("bmh", "net/minecraft/client/renderer/Tessellator")); - mObInitMap.put(new Pair<String, String>("ra", "net/minecraft/inventory/InventoryLargeChest")); - mObInitMap.put( - new Pair<String, String>( - "nb", - "net/minecraft/client/network/NetHandlerHandshakeMemory$SwitchEnumConnectionState")); - mObInitMap.put(new Pair<String, String>("jc", "net/minecraft/network/play/client/C00PacketKeepAlive")); - mObInitMap.put(new Pair<String, String>("fd", "net/minecraft/util/MessageSerializer2")); - mObInitMap.put(new Pair<String, String>("be", "net/minecraft/command/server/CommandPardonPlayer")); - mObInitMap.put(new Pair<String, String>("aqw", "net/minecraft/world/gen/MapGenCaves")); - mObInitMap.put(new Pair<String, String>("amx", "net/minecraft/block/BlockQuartz")); - mObInitMap.put(new Pair<String, String>("aez", "net/minecraft/item/crafting/RecipesFood")); - mObInitMap.put(new Pair<String, String>("aiy", "net/minecraft/world/biome/BiomeEndDecorator")); - mObInitMap.put( - new Pair<String, String>("bqz", "net/minecraft/client/resources/IResourceManagerReloadListener")); - mObInitMap.put(new Pair<String, String>("rt", "net/minecraft/potion/PotionHealthBoost")); - mObInitMap.put(new Pair<String, String>("nu", "net/minecraft/server/management/PlayerProfileCache$2")); - mObInitMap.put(new Pair<String, String>("jv", "net/minecraft/network/login/INetHandlerLoginServer")); - mObInitMap.put(new Pair<String, String>("fw", "net/minecraft/network/play/server/S0EPacketSpawnObject")); - mObInitMap.put(new Pair<String, String>("bx", "net/minecraft/command/server/CommandTestForBlock")); - mObInitMap.put(new Pair<String, String>("abo", "net/minecraft/item/ItemBucket")); - mObInitMap.put(new Pair<String, String>("afn", "net/minecraft/enchantment/EnchantmentArrowFire")); - mObInitMap.put(new Pair<String, String>("brn", "net/minecraft/client/resources/SkinManager$3$1")); - mObInitMap.put(new Pair<String, String>("aqv", "net/minecraft/world/gen/ChunkProviderHell")); - mObInitMap.put( - new Pair<String, String>( - "auu", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$RightTurn")); - mObInitMap.put(new Pair<String, String>("ayt", "net/minecraft/world/storage/WorldInfo$1")); - mObInitMap.put(new Pair<String, String>("bbr", "net/minecraft/util/Timer")); - mObInitMap.put(new Pair<String, String>("bfq", "net/minecraft/client/gui/GuiEnchantment")); - mObInitMap.put(new Pair<String, String>("bjp", "net/minecraft/client/multiplayer/ServerList")); - mObInitMap.put(new Pair<String, String>("bno", "net/minecraft/client/renderer/entity/Render")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsLevelSummary", - "net/minecraft/realms/RealmsLevelSummary")); - mObInitMap - .put(new Pair<String, String>("gk", "net/minecraft/network/play/server/S22PacketMultiBlockChange")); - mObInitMap.put(new Pair<String, String>("cl", "net/minecraft/block/BlockSourceImpl")); - mObInitMap.put(new Pair<String, String>("vr", "net/minecraft/entity/ai/EntityAITargetNonTamed")); - mObInitMap.put(new Pair<String, String>("rs", "net/minecraft/potion/PotionAttackDamage")); - mObInitMap.put(new Pair<String, String>("arj", "net/minecraft/world/gen/feature/WorldGenClay")); - mObInitMap.put(new Pair<String, String>("ank", "net/minecraft/block/BlockSign")); - mObInitMap.put(new Pair<String, String>("ajl", "net/minecraft/block/Block$3")); - mObInitMap.put(new Pair<String, String>("avi", "net/minecraft/world/gen/structure/MapGenStructureIO")); - mObInitMap.put(new Pair<String, String>("bcf", "net/minecraft/client/gui/GuiButtonLanguage")); - mObInitMap.put(new Pair<String, String>("bge", "net/minecraft/client/gui/ServerSelectionList")); - mObInitMap.put(new Pair<String, String>("wf", "net/minecraft/entity/passive/EntityAnimal")); - mObInitMap.put(new Pair<String, String>("sg", "net/minecraft/entity/EntityList")); - mObInitMap.put( - new Pair<String, String>( - "oh", - "net/minecraft/server/management/PreYggdrasilConverter$ConversionError")); - mObInitMap.put(new Pair<String, String>("ki", "net/minecraft/network/status/client/C01PacketPing")); - mObInitMap.put(new Pair<String, String>("gj", "net/minecraft/network/play/server/S02PacketChat")); - mObInitMap.put(new Pair<String, String>("acb", "net/minecraft/creativetab/CreativeTabs$5")); - mObInitMap - .put(new Pair<String, String>("aga", "net/minecraft/enchantment/EnchantmentHelper$ModifierLiving")); - mObInitMap.put( - new Pair<String, String>("bsa", "net/minecraft/client/resources/data/AnimationMetadataSection")); - mObInitMap.put(new Pair<String, String>("bkc", "net/minecraft/client/particle/EntityFireworkOverlayFX")); - mObInitMap.put(new Pair<String, String>("bob", "net/minecraft/client/renderer/entity/RenderItem$3")); - mObInitMap.put(new Pair<String, String>("wy", "net/minecraft/entity/boss/EntityDragonPart")); - mObInitMap.put(new Pair<String, String>("sz", "net/minecraft/entity/EnumCreatureAttribute")); - mObInitMap.put(new Pair<String, String>("asq", "net/minecraft/world/gen/feature/WorldGenTrees")); - mObInitMap.put(new Pair<String, String>("aor", "net/minecraft/tileentity/TileEntity")); - mObInitMap.put(new Pair<String, String>("aks", "net/minecraft/block/BlockEnchantmentTable")); - mObInitMap.put(new Pair<String, String>("acu", "net/minecraft/item/ItemFishFood$FishType")); - mObInitMap.put(new Pair<String, String>("agt", "net/minecraft/world/ChunkPosition")); - mObInitMap.put(new Pair<String, String>("bst", "net/minecraft/client/audio/ISound")); - mObInitMap.put(new Pair<String, String>("bou", "net/minecraft/client/renderer/entity/RenderSnowMan")); - mObInitMap.put(new Pair<String, String>("bcx", "net/minecraft/client/multiplayer/GuiConnecting")); - mObInitMap.put(new Pair<String, String>("bgw", "net/minecraft/client/main/Main$3")); - mObInitMap.put(new Pair<String, String>("bkv", "net/minecraft/client/particle/EntitySmokeFX")); - mObInitMap.put( - new Pair<String, String>("tn", "net/minecraft/entity/ai/attributes/ModifiableAttributeInstance")); - mObInitMap.put(new Pair<String, String>("po", "net/minecraft/util/IJsonSerializable")); - mObInitMap.put(new Pair<String, String>("lp", "net/minecraft/scoreboard/ServerScoreboard")); - mObInitMap - .put(new Pair<String, String>("hq", "net/minecraft/network/play/server/S13PacketDestroyEntities")); - mObInitMap.put(new Pair<String, String>("dr", "net/minecraft/nbt/NBTTagLong")); - mObInitMap.put(new Pair<String, String>("adi", "net/minecraft/item/ItemBucketMilk")); - mObInitMap.put(new Pair<String, String>("ahh", "net/minecraft/world/IWorldAccess")); - mObInitMap.put(new Pair<String, String>("bth", "net/minecraft/client/audio/MusicTicker$MusicType")); - mObInitMap.put(new Pair<String, String>("bpi", "net/minecraft/client/shader/ShaderManager")); - mObInitMap.put(new Pair<String, String>("asp", "net/minecraft/world/gen/feature/WorldGenTallGrass")); - mObInitMap.put(new Pair<String, String>("awo", "net/minecraft/world/gen/NoiseGeneratorSimplex")); - mObInitMap.put(new Pair<String, String>("bhk", "net/minecraft/client/model/ModelEnderman")); - mObInitMap.put(new Pair<String, String>("blj", "net/minecraft/util/MovementInputFromOptions")); - mObInitMap.put(new Pair<String, String>("ie", "net/minecraft/network/play/server/S3CPacketUpdateScore")); - mObInitMap.put(new Pair<String, String>("ef", "net/minecraft/nbt/JsonToNBT$Primitive")); - mObInitMap.put(new Pair<String, String>("ag", "net/minecraft/command/server/CommandBanPlayer")); - mObInitMap.put(new Pair<String, String>("xl", "net/minecraft/entity/item/EntityMinecart")); - mObInitMap.put(new Pair<String, String>("atd", "net/minecraft/world/gen/structure/MapGenNetherBridge")); - mObInitMap.put(new Pair<String, String>("ape", "net/minecraft/tileentity/TileEntityEnderChest")); - mObInitMap.put(new Pair<String, String>("alf", "net/minecraft/block/BlockGlass")); - mObInitMap.put(new Pair<String, String>("ahg", "net/minecraft/world/MinecraftException")); - mObInitMap.put(new Pair<String, String>("axc", "net/minecraft/world/gen/layer/GenLayerAddMushroomIsland")); - mObInitMap.put(new Pair<String, String>("baa", "net/minecraft/scoreboard/Score$1")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/DisconnectedOnlineScreen", - "net/minecraft/realms/DisconnectedOnlineScreen")); - mObInitMap.put(new Pair<String, String>("btg", "net/minecraft/client/audio/MusicTicker")); - mObInitMap.put(new Pair<String, String>("ua", "net/minecraft/entity/ai/EntityAIMate")); - mObInitMap.put(new Pair<String, String>("mc", "net/minecraft/server/gui/MinecraftServerGui$4")); - mObInitMap.put(new Pair<String, String>("id", "net/minecraft/network/play/server/S3EPacketTeams")); - mObInitMap.put(new Pair<String, String>("q", "net/minecraft/util/Facing")); - mObInitMap.put( - new Pair<String, String>( - "atw", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Start")); - mObInitMap.put(new Pair<String, String>("apx", "net/minecraft/world/chunk/Chunk")); - mObInitMap.put(new Pair<String, String>("aly", "net/minecraft/block/BlockMelon")); - mObInitMap.put(new Pair<String, String>("ahz", "net/minecraft/world/biome/BiomeCache$Block")); - mObInitMap.put(new Pair<String, String>("axv", "net/minecraft/world/gen/layer/GenLayerRiverMix")); - mObInitMap.put(new Pair<String, String>("btz", "net/minecraft/client/stream/Metadata")); - mObInitMap.put(new Pair<String, String>("ys", "net/minecraft/entity/monster/EntityZombie$GroupData")); - mObInitMap.put(new Pair<String, String>("ut", "net/minecraft/entity/ai/EntityAIMoveTowardsRestriction")); - mObInitMap.put(new Pair<String, String>("qu", "net/minecraft/util/Tuple")); - mObInitMap.put(new Pair<String, String>("mv", "net/minecraft/world/WorldServer$ServerBlockEventList")); - mObInitMap.put(new Pair<String, String>("iw", "net/minecraft/network/play/client/C11PacketEnchantItem")); - mObInitMap.put(new Pair<String, String>("ex", "net/minecraft/network/NetworkStatistics$Tracker")); - mObInitMap.put(new Pair<String, String>("ay", "net/minecraft/command/server/CommandListPlayers")); - mObInitMap.put( - new Pair<String, String>("aql", "net/minecraft/world/chunk/storage/AnvilChunkLoader$PendingChunk")); - mObInitMap.put(new Pair<String, String>("amm", "net/minecraft/block/BlockOldLog")); - mObInitMap.put(new Pair<String, String>("aap", "net/minecraft/inventory/ContainerPlayer")); - mObInitMap.put(new Pair<String, String>("ain", "net/minecraft/world/biome/BiomeGenMutated")); - mObInitMap.put(new Pair<String, String>("p", "net/minecraft/util/Direction")); - mObInitMap.put(new Pair<String, String>("bun", "net/minecraft/client/stream/IStream$AuthFailureReason")); - mObInitMap.put(new Pair<String, String>("bqo", "net/minecraft/client/resources/ResourceIndex")); - mObInitMap.put(new Pair<String, String>("bas", "net/minecraft/client/Minecraft$12")); - mObInitMap.put(new Pair<String, String>("ber", "net/minecraft/client/gui/IProgressMeter")); - mObInitMap.put(new Pair<String, String>("biq", "net/minecraft/client/model/ModelDragon")); - mObInitMap.put( - new Pair<String, String>( - "bmp", - "net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer")); - mObInitMap.put(new Pair<String, String>("ri", "net/minecraft/profiler/PlayerUsageSnooper")); - mObInitMap.put(new Pair<String, String>("nj", "net/minecraft/network/NetHandlerPlayServer$2")); - mObInitMap.put(new Pair<String, String>("jk", "net/minecraft/network/play/client/C0CPacketInput")); - mObInitMap.put(new Pair<String, String>("fl", "net/minecraft/event/HoverEvent")); - mObInitMap.put(new Pair<String, String>("bm", "net/minecraft/command/server/CommandSetBlock")); - mObInitMap.put(new Pair<String, String>("abd", "net/minecraft/item/ItemArmor$ArmorMaterial")); - mObInitMap.put(new Pair<String, String>("afc", "net/minecraft/item/crafting/RecipesMapExtending")); - mObInitMap.put(new Pair<String, String>("ajb", "net/minecraft/block/BlockAnvil")); - mObInitMap.put(new Pair<String, String>("brc", "net/minecraft/client/resources/ResourcePackRepository")); - mObInitMap.put( - new Pair<String, String>("auj", "net/minecraft/world/gen/structure/StructureStrongholdPieces$1")); - mObInitMap.put(new Pair<String, String>("ayi", "net/minecraft/world/storage/MapData")); - mObInitMap.put(new Pair<String, String>("bbg", "net/minecraft/util/MouseHelper")); - mObInitMap.put(new Pair<String, String>("bff", "net/minecraft/client/gui/GuiScreenBook$NextPageButton")); - mObInitMap.put(new Pair<String, String>("bje", "net/minecraft/client/multiplayer/PlayerControllerMP")); - mObInitMap.put(new Pair<String, String>("bnd", "net/minecraft/client/renderer/entity/RenderBlaze")); - mObInitMap.put(new Pair<String, String>("ca", "net/minecraft/command/CommandToggleDownfall")); - mObInitMap.put(new Pair<String, String>("zf", "net/minecraft/entity/item/EntityFireworkRocket")); - mObInitMap.put(new Pair<String, String>("vg", "net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy")); - mObInitMap.put(new Pair<String, String>("rh", "net/minecraft/inventory/InventoryBasic")); - mObInitMap.put(new Pair<String, String>("aja", "net/minecraft/block/BlockAir")); - mObInitMap.put(new Pair<String, String>("bbz", "net/minecraft/client/gui/MapItemRenderer$Instance")); - mObInitMap.put(new Pair<String, String>("bfy", "net/minecraft/client/gui/inventory/GuiDispenser")); - mObInitMap.put(new Pair<String, String>("bjx", "net/minecraft/client/particle/EntityCritFX")); - mObInitMap.put(new Pair<String, String>("zy", "net/minecraft/inventory/ContainerBeacon$BeaconSlot")); - mObInitMap.put(new Pair<String, String>("vz", "net/minecraft/village/Village")); - mObInitMap.put(new Pair<String, String>("arr", "net/minecraft/world/gen/feature/WorldGenGlowStone2")); - mObInitMap.put(new Pair<String, String>("ans", "net/minecraft/block/BlockStairs")); - mObInitMap.put(new Pair<String, String>("abv", "net/minecraft/creativetab/CreativeTabs$10")); - mObInitMap.put(new Pair<String, String>("afu", "net/minecraft/enchantment/EnumEnchantmentType")); - mObInitMap.put(new Pair<String, String>("ajt", "net/minecraft/block/BlockCactus")); - mObInitMap.put( - new Pair<String, String>("avq", "net/minecraft/world/gen/structure/StructureVillagePieces$House1")); - mObInitMap.put(new Pair<String, String>("azp", "net/minecraft/world/storage/IPlayerFileData")); - mObInitMap.put(new Pair<String, String>("bru", "net/minecraft/client/resources/data/IMetadataSection")); - mObInitMap.put(new Pair<String, String>("bjw", "net/minecraft/client/particle/EntityCrit2FX")); - mObInitMap.put(new Pair<String, String>("bnv", "net/minecraft/client/renderer/entity/RenderHorse")); - mObInitMap.put(new Pair<String, String>("wn", "net/minecraft/entity/passive/EntityOcelot")); - mObInitMap.put(new Pair<String, String>("op", "net/minecraft/server/management/UserListBans")); - mObInitMap.put(new Pair<String, String>("kq", "net/minecraft/init/Bootstrap$13")); - mObInitMap.put(new Pair<String, String>("gr", "net/minecraft/network/play/server/S3FPacketCustomPayload")); - mObInitMap.put(new Pair<String, String>("cs", "net/minecraft/util/IObjectIntIterable")); - mObInitMap.put(new Pair<String, String>("asf", "net/minecraft/world/gen/feature/WorldGenTaiga1")); - mObInitMap.put(new Pair<String, String>("aog", "net/minecraft/block/BlockTripWireHook")); - mObInitMap.put(new Pair<String, String>("akh", "net/minecraft/block/BlockDeadBush")); - mObInitMap.put(new Pair<String, String>("acj", "net/minecraft/item/ItemDye")); - mObInitMap.put(new Pair<String, String>("agi", "net/minecraft/enchantment/EnchantmentProtection")); - mObInitMap - .put(new Pair<String, String>("bsi", "net/minecraft/client/resources/data/TextureMetadataSection")); - mObInitMap.put(new Pair<String, String>("bcm", "net/minecraft/client/gui/GuiSlot")); - mObInitMap.put(new Pair<String, String>("bgl", "net/minecraft/client/gui/GuiResourcePackSelected")); - mObInitMap.put(new Pair<String, String>("bkk", "net/minecraft/client/particle/EntityLavaFX")); - mObInitMap.put( - new Pair<String, String>("boj", "net/minecraft/client/renderer/entity/RenderMinecartMobSpawner")); - mObInitMap.put(new Pair<String, String>("tc", "net/minecraft/entity/item/EntityPainting$EnumArt")); - mObInitMap.put(new Pair<String, String>("pd", "net/minecraft/stats/IStatStringFormat")); - mObInitMap.put(new Pair<String, String>("le", "net/minecraft/command/ServerCommand")); - mObInitMap.put(new Pair<String, String>("hf", "net/minecraft/network/play/server/S14PacketEntity")); - mObInitMap.put(new Pair<String, String>("dg", "net/minecraft/nbt/NBTTagByte")); - mObInitMap.put(new Pair<String, String>("ase", "net/minecraft/world/gen/feature/WorldGenMinable")); - mObInitMap.put( - new Pair<String, String>( - "awd", - "net/minecraft/world/gen/structure/StructureVillagePieces$Village")); - mObInitMap.put(new Pair<String, String>("bda", "net/minecraft/client/gui/GuiCreateFlatWorld$Details")); - mObInitMap.put(new Pair<String, String>("hy", "net/minecraft/network/play/server/S12PacketEntityVelocity")); - mObInitMap.put(new Pair<String, String>("dz", "net/minecraft/nbt/NBTBase$NBTPrimitive")); - mObInitMap.put(new Pair<String, String>("xa", "net/minecraft/entity/boss/EntityDragon")); - mObInitMap.put(new Pair<String, String>("tb", "net/minecraft/entity/item/EntityPainting")); - mObInitMap - .put(new Pair<String, String>("asx", "net/minecraft/world/gen/structure/StructureMineshaftPieces")); - mObInitMap.put(new Pair<String, String>("aoy", "net/minecraft/tileentity/TileEntityCommandBlock$1")); - mObInitMap.put(new Pair<String, String>("akz", "net/minecraft/block/BlockFence")); - mObInitMap.put(new Pair<String, String>("aww", "net/minecraft/block/material/MaterialPortal")); - mObInitMap.put(new Pair<String, String>("bdt", "net/minecraft/client/gui/GuiScreenWorking")); - mObInitMap.put(new Pair<String, String>("bhs", "net/minecraft/client/model/ModelHorse")); - mObInitMap.put(new Pair<String, String>("xt", "net/minecraft/entity/ai/EntityMinecartMobSpawner")); - mObInitMap.put(new Pair<String, String>("tu", "net/minecraft/entity/ai/EntityLookHelper")); - mObInitMap.put(new Pair<String, String>("pv", "net/minecraft/util/HttpUtil")); - mObInitMap.put(new Pair<String, String>("lw", "net/minecraft/server/dedicated/DedicatedServer$3")); - mObInitMap.put(new Pair<String, String>("hx", "net/minecraft/network/play/server/S1BPacketEntityAttach")); - mObInitMap.put(new Pair<String, String>("f", "net/minecraft/crash/CrashReport$4")); - mObInitMap.put( - new Pair<String, String>( - "atl", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Entrance")); - mObInitMap.put(new Pair<String, String>("apm", "net/minecraft/tileentity/TileEntitySign")); - mObInitMap.put(new Pair<String, String>("aln", "net/minecraft/block/BlockHopper")); - mObInitMap.put(new Pair<String, String>("adp", "net/minecraft/item/ItemPotion")); - mObInitMap.put(new Pair<String, String>("aho", "net/minecraft/world/SpawnerAnimals")); - mObInitMap.put(new Pair<String, String>("bai", "net/minecraft/stats/ObjectiveStat")); - mObInitMap.put(new Pair<String, String>("bto", "net/minecraft/client/audio/SoundEventAccessorComposite")); - mObInitMap.put(new Pair<String, String>("bpp", "net/minecraft/client/renderer/texture/AbstractTexture")); - mObInitMap.put(new Pair<String, String>("blq", "net/minecraft/client/renderer/EntitySorter")); - mObInitMap.put(new Pair<String, String>("yh", "net/minecraft/entity/monster/EntityPigZombie")); - mObInitMap.put(new Pair<String, String>("ui", "net/minecraft/entity/ai/EntityAIBase")); - mObInitMap.put(new Pair<String, String>("qj", "net/minecraft/profiler/Profiler$Result")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsServerStatusPinger", - "net/minecraft/realms/RealmsServerStatusPinger")); - mObInitMap.put(new Pair<String, String>("mk", "net/minecraft/world/demo/DemoWorldServer")); - mObInitMap - .put(new Pair<String, String>("il", "net/minecraft/network/play/server/S20PacketEntityProperties")); - mObInitMap.put(new Pair<String, String>("em", "net/minecraft/network/NetworkManager$3")); - mObInitMap.put(new Pair<String, String>("an", "net/minecraft/command/server/CommandEmote")); - mObInitMap.put(new Pair<String, String>("aqa", "net/minecraft/world/chunk/storage/NibbleArrayReader")); - mObInitMap.put(new Pair<String, String>("amb", "net/minecraft/block/BlockSilverfish")); - mObInitMap.put(new Pair<String, String>("aed", "net/minecraft/item/ItemSnowball")); - mObInitMap.put(new Pair<String, String>("aae", "net/minecraft/inventory/InventoryCrafting")); - mObInitMap.put(new Pair<String, String>("aic", "net/minecraft/world/biome/BiomeGenDesert")); - mObInitMap.put(new Pair<String, String>("e", "net/minecraft/crash/CrashReport$3")); - mObInitMap.put( - new Pair<String, String>("buc", "net/minecraft/client/stream/BroadcastController$BroadcastState")); - mObInitMap.put(new Pair<String, String>("bqd", "net/minecraft/client/renderer/texture/TextureAtlasSprite")); - mObInitMap.put(new Pair<String, String>("bah", "net/minecraft/scoreboard/IScoreObjectiveCriteria")); - mObInitMap.put(new Pair<String, String>("beg", "net/minecraft/client/gui/GuiWinGame")); - mObInitMap.put(new Pair<String, String>("bif", "net/minecraft/client/model/ModelSnowMan")); - mObInitMap.put(new Pair<String, String>("bme", "net/minecraft/client/util/QuadComparator")); - mObInitMap.put(new Pair<String, String>("fa", "net/minecraft/util/MessageSerializer")); - mObInitMap.put(new Pair<String, String>("bb", "net/minecraft/command/server/CommandNetstat")); - mObInitMap.put(new Pair<String, String>("aew", "net/minecraft/item/crafting/RecipeBookCloning")); - mObInitMap.put(new Pair<String, String>("aax", "net/minecraft/inventory/SlotCrafting")); - mObInitMap.put(new Pair<String, String>("aiv", "net/minecraft/world/biome/BiomeGenSwamp")); - mObInitMap.put(new Pair<String, String>("x", "net/minecraft/command/IAdminCommand")); - mObInitMap.put(new Pair<String, String>("bqw", "net/minecraft/client/resources/IResource")); - mObInitMap.put(new Pair<String, String>("bez", "net/minecraft/client/gui/inventory/GuiBeacon")); - mObInitMap.put(new Pair<String, String>("biy", "net/minecraft/client/model/TextureOffset")); - mObInitMap.put(new Pair<String, String>("bmx", "net/minecraft/client/renderer/culling/Frustrum")); - mObInitMap.put(new Pair<String, String>("js", "net/minecraft/network/login/server/S02PacketLoginSuccess")); - mObInitMap.put(new Pair<String, String>("ft", "net/minecraft/network/Packet")); - mObInitMap.put(new Pair<String, String>("bu", "net/minecraft/command/server/CommandSummon")); - mObInitMap.put(new Pair<String, String>("yz", "net/minecraft/entity/player/EntityPlayer")); - mObInitMap.put(new Pair<String, String>("aqs", "net/minecraft/world/gen/MapGenRavine")); - mObInitMap.put(new Pair<String, String>("amt", "net/minecraft/block/BlockRailPowered")); - mObInitMap.put(new Pair<String, String>("aiu", "net/minecraft/world/biome/BiomeGenStoneBeach")); - mObInitMap.put( - new Pair<String, String>( - "aur", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$PieceWeight")); - mObInitMap.put(new Pair<String, String>("ayq", "net/minecraft/world/storage/SaveHandler")); - mObInitMap.put(new Pair<String, String>("bbo", "net/minecraft/client/LoadingScreenRenderer")); - mObInitMap.put( - new Pair<String, String>( - "bfn", - "net/minecraft/client/gui/inventory/GuiContainerCreative$CreativeSlot")); - mObInitMap.put(new Pair<String, String>("bjm", "net/minecraft/client/multiplayer/ServerAddress")); - mObInitMap.put(new Pair<String, String>("buu", "net/minecraft/client/renderer/OpenGlHelper")); - mObInitMap.put(new Pair<String, String>("zn", "net/minecraft/entity/item/EntityExpBottle")); - mObInitMap.put(new Pair<String, String>("vo", "net/minecraft/entity/ai/EntityAINearestAttackableTarget")); - mObInitMap.put(new Pair<String, String>("rp", "net/minecraft/util/EntityDamageSource")); - mObInitMap.put(new Pair<String, String>("nq", "net/minecraft/server/network/NetHandlerStatusServer")); - mObInitMap.put(new Pair<String, String>("jr", "net/minecraft/network/login/INetHandlerLoginClient")); - mObInitMap.put(new Pair<String, String>("arg", "net/minecraft/world/gen/feature/WorldGeneratorBonusChest")); - mObInitMap.put(new Pair<String, String>("anh", "net/minecraft/block/BlockSand")); - mObInitMap.put(new Pair<String, String>("abk", "net/minecraft/item/ItemBook")); - mObInitMap.put(new Pair<String, String>("afj", "net/minecraft/item/crafting/RecipesCrafting")); - mObInitMap.put(new Pair<String, String>("aji", "net/minecraft/block/Block")); - mObInitMap.put(new Pair<String, String>("avf", "net/minecraft/world/gen/structure/MapGenStructure$1")); - mObInitMap.put(new Pair<String, String>("aze", "net/minecraft/world/storage/ISaveFormat")); - mObInitMap.put(new Pair<String, String>("brj", "net/minecraft/client/resources/SkinManager")); - mObInitMap.put(new Pair<String, String>("bjl", "net/minecraft/client/gui/GuiPlayerInfo")); - mObInitMap.put( - new Pair<String, String>("bnk", "net/minecraft/client/renderer/tileentity/RenderEnderCrystal")); - mObInitMap.put(new Pair<String, String>("wc", "net/minecraft/village/VillageCollection")); - mObInitMap.put(new Pair<String, String>("sd", "net/minecraft/entity/Entity$SwitchEnumEntitySize")); - mObInitMap.put(new Pair<String, String>("oe", "net/minecraft/server/management/PreYggdrasilConverter$5")); - mObInitMap.put( - new Pair<String, String>( - "kf", - "net/minecraft/network/ServerStatusResponse$MinecraftProtocolVersionIdentifier")); - mObInitMap.put(new Pair<String, String>("gg", "net/minecraft/network/play/server/S24PacketBlockAction")); - mObInitMap.put(new Pair<String, String>("ch", "net/minecraft/command/CommandNotFoundException")); - mObInitMap.put(new Pair<String, String>("arz", "net/minecraft/world/gen/feature/WorldGenMegaJungle")); - mObInitMap.put(new Pair<String, String>("bcb", "net/minecraft/client/gui/GuiButton")); - mObInitMap.put(new Pair<String, String>("bga", "net/minecraft/client/gui/ServerListEntryLanScan")); - mObInitMap.put(new Pair<String, String>("sw", "net/minecraft/entity/EntityLiving")); - mObInitMap.put(new Pair<String, String>("ox", "net/minecraft/network/rcon/RConThreadQuery")); - mObInitMap.put(new Pair<String, String>("ky", "net/minecraft/init/Bootstrap$7")); - mObInitMap.put(new Pair<String, String>("gz", "net/minecraft/network/play/server/S26PacketMapChunkBulk")); - mObInitMap.put(new Pair<String, String>("akp", "net/minecraft/block/BlockDragonEgg")); - mObInitMap.put(new Pair<String, String>("acr", "net/minecraft/item/ItemFireworkCharge")); - mObInitMap.put(new Pair<String, String>("agq", "net/minecraft/tileentity/MobSpawnerBaseLogic")); - mObInitMap.put(new Pair<String, String>("bsq", "net/minecraft/client/audio/SoundList$SoundEntry")); - mObInitMap.put(new Pair<String, String>("bor", "net/minecraft/client/renderer/entity/RenderSilverfish")); - mObInitMap.put( - new Pair<String, String>( - "avx", - "net/minecraft/world/gen/structure/StructureVillagePieces$WoodHut")); - mObInitMap.put(new Pair<String, String>("azw", "net/minecraft/util/Vec3")); - mObInitMap.put(new Pair<String, String>("bcu", "net/minecraft/client/gui/GuiConfirmOpenLink")); - mObInitMap.put(new Pair<String, String>("bgt", "net/minecraft/client/main/Main$1")); - mObInitMap.put(new Pair<String, String>("bks", "net/minecraft/client/particle/EntityCloudFX")); - mObInitMap.put(new Pair<String, String>("wu", "net/minecraft/entity/passive/EntityWaterMob")); - mObInitMap.put(new Pair<String, String>("sv", "net/minecraft/entity/EntityLivingBase")); - mObInitMap.put(new Pair<String, String>("asm", "net/minecraft/world/gen/feature/WorldGenLiquids")); - mObInitMap.put(new Pair<String, String>("aon", "net/minecraft/block/BlockButtonWood")); - mObInitMap.put(new Pair<String, String>("ako", "net/minecraft/block/BlockDoublePlant")); - mObInitMap.put(new Pair<String, String>("awl", "net/minecraft/world/gen/NoiseGeneratorPerlin")); - mObInitMap.put(new Pair<String, String>("bdi", "net/minecraft/client/gui/GuiSleepMP")); - mObInitMap.put(new Pair<String, String>("bhh", "net/minecraft/client/model/ModelChicken")); - mObInitMap.put(new Pair<String, String>("blg", "net/minecraft/client/entity/AbstractClientPlayer")); - mObInitMap.put(new Pair<String, String>("xi", "net/minecraft/entity/item/EntityBoat")); - mObInitMap.put(new Pair<String, String>("tj", "net/minecraft/entity/ai/attributes/AttributeModifier")); - mObInitMap.put(new Pair<String, String>("pk", "net/minecraft/stats/StatBase$3")); - mObInitMap.put(new Pair<String, String>("ll", "net/minecraft/server/MinecraftServer$5")); - mObInitMap.put( - new Pair<String, String>("ata", "net/minecraft/world/gen/structure/StructureMineshaftPieces$Room")); - mObInitMap.put(new Pair<String, String>("apb", "net/minecraft/tileentity/TileEntityDispenser")); - mObInitMap.put(new Pair<String, String>("alc", "net/minecraft/block/BlockFlower")); - mObInitMap.put(new Pair<String, String>("ade", "net/minecraft/init/Items")); - mObInitMap.put(new Pair<String, String>("ahd", "net/minecraft/world/World$2")); - mObInitMap.put( - new Pair<String, String>("btd", "net/minecraft/client/network/LanServerDetector$LanServerList")); - mObInitMap.put(new Pair<String, String>("bpe", "net/minecraft/client/renderer/entity/RenderWolf")); - mObInitMap.put(new Pair<String, String>("blf", "net/minecraft/client/particle/EntityRainFX")); - mObInitMap.put(new Pair<String, String>("ia", "net/minecraft/network/play/server/S1FPacketSetExperience")); - mObInitMap.put(new Pair<String, String>("eb", "net/minecraft/nbt/JsonToNBT")); - mObInitMap.put(new Pair<String, String>("ac", "net/minecraft/command/ICommandSender")); - mObInitMap.put( - new Pair<String, String>( - "att", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$PieceWeight")); - mObInitMap.put(new Pair<String, String>("apu", "net/minecraft/world/chunk/IChunkProvider")); - mObInitMap.put(new Pair<String, String>("alv", "net/minecraft/block/BlockLever")); - mObInitMap.put(new Pair<String, String>("adx", "net/minecraft/item/ItemShears")); - mObInitMap.put(new Pair<String, String>("ahw", "net/minecraft/world/biome/BiomeGenBase$TempCategory")); - mObInitMap.put(new Pair<String, String>("btw", "net/minecraft/client/stream/MetadataAchievement")); - mObInitMap.put(new Pair<String, String>("bpx", "net/minecraft/client/renderer/texture/Stitcher$Slot")); - mObInitMap.put(new Pair<String, String>("bhz", "net/minecraft/client/model/ModelSign")); - mObInitMap.put(new Pair<String, String>("bly", "net/minecraft/client/renderer/ItemRenderer")); - mObInitMap.put(new Pair<String, String>("uq", "net/minecraft/entity/ai/EntityAIAttackOnCollide")); - mObInitMap.put(new Pair<String, String>("ms", "net/minecraft/world/gen/ChunkProviderServer")); - mObInitMap.put( - new Pair<String, String>( - "it", - "net/minecraft/network/play/client/C16PacketClientStatus$EnumState")); - mObInitMap.put(new Pair<String, String>("eu", "net/minecraft/network/NetworkStatistics")); - mObInitMap.put(new Pair<String, String>("av", "net/minecraft/command/CommandServerKick")); - mObInitMap.put(new Pair<String, String>("ael", "net/minecraft/item/ItemWritableBook")); - mObInitMap.put(new Pair<String, String>("aam", "net/minecraft/inventory/ContainerHorseInventory")); - mObInitMap.put(new Pair<String, String>("aik", "net/minecraft/world/biome/BiomeGenJungle")); - mObInitMap.put(new Pair<String, String>("m", "net/minecraft/crash/CrashReportCategory$2")); - mObInitMap.put( - new Pair<String, String>( - "buk", - "net/minecraft/client/stream/IngestServerTester$IngestTestListener")); - mObInitMap.put(new Pair<String, String>("bql", "net/minecraft/client/renderer/texture/TextureClock")); - mObInitMap.put( - new Pair<String, String>( - "ats", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Piece")); - mObInitMap.put(new Pair<String, String>("axr", "net/minecraft/world/gen/layer/GenLayerHills")); - mObInitMap.put(new Pair<String, String>("bap", "net/minecraft/client/Minecraft$1")); - mObInitMap - .put(new Pair<String, String>("beo", "net/minecraft/client/gui/achievement/GuiStats$StatsItem$1")); - mObInitMap.put(new Pair<String, String>("bin", "net/minecraft/client/model/ModelWither")); - mObInitMap.put( - new Pair<String, String>( - "bmm", - "net/minecraft/client/renderer/tileentity/TileEntityChestRenderer")); - mObInitMap - .put(new Pair<String, String>("jh", "net/minecraft/network/play/client/C13PacketPlayerAbilities")); - mObInitMap.put(new Pair<String, String>("fi", "net/minecraft/event/ClickEvent$Action")); - mObInitMap.put(new Pair<String, String>("bj", "net/minecraft/command/server/CommandSaveOn")); - mObInitMap.put(new Pair<String, String>("yo", "net/minecraft/entity/monster/EntitySpider$GroupData")); - mObInitMap.put(new Pair<String, String>("up", "net/minecraft/entity/ai/EntityAIVillagerMate")); - mObInitMap.put(new Pair<String, String>("aqh", "net/minecraft/world/chunk/storage/RegionFile")); - mObInitMap.put(new Pair<String, String>("ami", "net/minecraft/block/BlockNewLog")); - mObInitMap.put(new Pair<String, String>("aij", "net/minecraft/world/biome/BiomeGenSnow")); - mObInitMap.put(new Pair<String, String>("aug", "net/minecraft/world/gen/structure/MapGenStronghold")); - mObInitMap.put(new Pair<String, String>("ayf", "net/minecraft/pathfinding/PathEntity")); - mObInitMap.put(new Pair<String, String>("bbd", "net/minecraft/client/Minecraft$7")); - mObInitMap.put(new Pair<String, String>("bfc", "net/minecraft/client/gui/inventory/GuiBeacon$PowerButton")); - mObInitMap.put(new Pair<String, String>("bjb", "net/minecraft/client/network/NetHandlerPlayClient")); - mObInitMap.put( - new Pair<String, String>("buj", "net/minecraft/client/stream/IngestServerTester$SwitchStatType")); - mObInitMap.put(new Pair<String, String>("zc", "net/minecraft/entity/projectile/EntityArrow")); - mObInitMap.put(new Pair<String, String>("vd", "net/minecraft/entity/ai/EntityAIArrowAttack")); - mObInitMap.put(new Pair<String, String>("re", "net/minecraft/client/renderer/IconFlipped")); - mObInitMap.put(new Pair<String, String>("nf", "net/minecraft/network/NetworkSystem$3")); - mObInitMap.put( - new Pair<String, String>( - "jg", - "net/minecraft/network/play/client/C03PacketPlayer$C05PacketPlayerLook")); - mObInitMap.put( - new Pair<String, String>( - "auz", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stairs2")); - mObInitMap.put(new Pair<String, String>("ayy", "net/minecraft/world/storage/WorldInfo$6")); - mObInitMap.put(new Pair<String, String>("bja", "net/minecraft/client/network/NetHandlerLoginClient$1")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsSharedConstants", - "net/minecraft/realms/RealmsSharedConstants")); - mObInitMap.put(new Pair<String, String>("zv", "net/minecraft/inventory/ContainerRepair$1")); - mObInitMap.put(new Pair<String, String>("vw", "net/minecraft/entity/ai/EntitySenses")); - mObInitMap.put(new Pair<String, String>("rx", "net/minecraft/entity/EntityAgeable")); - mObInitMap.put(new Pair<String, String>("ny", "net/minecraft/server/management/IPBanEntry")); - mObInitMap.put(new Pair<String, String>("jz", "net/minecraft/network/status/server/S01PacketPong")); - mObInitMap.put(new Pair<String, String>("aro", "net/minecraft/world/gen/feature/WorldGenFlowers")); - mObInitMap.put(new Pair<String, String>("anp", "net/minecraft/block/BlockSponge")); - mObInitMap.put(new Pair<String, String>("abs", "net/minecraft/item/ItemMapBase")); - mObInitMap.put(new Pair<String, String>("afr", "net/minecraft/enchantment/EnchantmentDurability")); - mObInitMap.put(new Pair<String, String>("ajq", "net/minecraft/block/BlockBrewingStand")); - mObInitMap.put(new Pair<String, String>("avn", "net/minecraft/world/gen/structure/MapGenVillage")); - mObInitMap.put(new Pair<String, String>("brr", "net/minecraft/client/resources/LanguageManager")); - mObInitMap.put(new Pair<String, String>("bbv", "net/minecraft/client/gui/GuiIngame")); - mObInitMap.put(new Pair<String, String>("bfu", "net/minecraft/client/gui/inventory/GuiInventory")); - mObInitMap.put(new Pair<String, String>("bjt", "net/minecraft/client/network/OldServerPinger$2$1")); - mObInitMap.put(new Pair<String, String>("bns", "net/minecraft/client/renderer/entity/RenderFish")); - mObInitMap.put(new Pair<String, String>("sl", "net/minecraft/command/IEntitySelector$2")); - mObInitMap.put(new Pair<String, String>("om", "net/minecraft/server/management/UserList")); - mObInitMap.put(new Pair<String, String>("kn", "net/minecraft/init/Bootstrap$10")); - mObInitMap.put(new Pair<String, String>("go", "net/minecraft/network/play/server/S30PacketWindowItems")); - mObInitMap.put(new Pair<String, String>("cp", "net/minecraft/dispenser/IBehaviorDispenseItem")); - mObInitMap.put(new Pair<String, String>("ake", "net/minecraft/block/BlockWorkbench")); - mObInitMap.put(new Pair<String, String>("acg", "net/minecraft/item/ItemTool")); - mObInitMap.put(new Pair<String, String>("agf", "net/minecraft/enchantment/EnchantmentKnockback")); - mObInitMap.put( - new Pair<String, String>( - "bsf", - "net/minecraft/client/resources/data/LanguageMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("avm", "net/minecraft/world/gen/structure/StructureStart")); - mObInitMap.put(new Pair<String, String>("bcj", "net/minecraft/client/gui/GuiOptionButton")); - mObInitMap - .put(new Pair<String, String>("bgi", "net/minecraft/client/resources/ResourcePackListEntryFound")); - mObInitMap.put(new Pair<String, String>("bkh", "net/minecraft/client/particle/EntityHeartFX")); - mObInitMap.put(new Pair<String, String>("bog", "net/minecraft/client/renderer/entity/RenderLightningBolt")); - mObInitMap.put(new Pair<String, String>("lb", "net/minecraft/client/util/JsonException")); - mObInitMap.put(new Pair<String, String>("hc", "net/minecraft/network/play/server/S29PacketSoundEffect")); - mObInitMap.put(new Pair<String, String>("dd", "net/minecraft/util/StatCollector")); - mObInitMap.put(new Pair<String, String>("wj", "net/minecraft/entity/passive/EntityHorse$1")); - mObInitMap.put(new Pair<String, String>("asb", "net/minecraft/world/gen/feature/WorldGenHugeTrees")); - mObInitMap.put(new Pair<String, String>("aoc", "net/minecraft/block/BlockTorch")); - mObInitMap.put( - new Pair<String, String>("awa", "net/minecraft/world/gen/structure/StructureVillagePieces$Start")); - mObInitMap.put(new Pair<String, String>("la", "net/minecraft/init/Bootstrap$9")); - mObInitMap.put(new Pair<String, String>("aov", "net/minecraft/tileentity/TileEntityBrewingStand")); - mObInitMap.put(new Pair<String, String>("akw", "net/minecraft/block/ITileEntityProvider")); - mObInitMap.put(new Pair<String, String>("acy", "net/minecraft/item/ItemAppleGold")); - mObInitMap.put(new Pair<String, String>("agx", "net/minecraft/world/ColorizerFoliage")); - mObInitMap.put(new Pair<String, String>("awt", "net/minecraft/block/material/Material")); - mObInitMap.put(new Pair<String, String>("bsx", "net/minecraft/server/integrated/IntegratedServer")); - mObInitMap.put(new Pair<String, String>("boy", "net/minecraft/client/renderer/entity/RenderTNTPrimed")); - mObInitMap.put(new Pair<String, String>("bkz", "net/minecraft/client/particle/EntitySuspendFX")); - mObInitMap.put(new Pair<String, String>("xq", "net/minecraft/entity/item/EntityMinecartFurnace")); - mObInitMap.put(new Pair<String, String>("tr", "net/minecraft/entity/EntityBodyHelper")); - mObInitMap.put(new Pair<String, String>("lt", "net/minecraft/server/dedicated/DedicatedServer")); - mObInitMap.put(new Pair<String, String>("hu", "net/minecraft/network/play/server/S09PacketHeldItemChange")); - mObInitMap.put(new Pair<String, String>("dv", "net/minecraft/nbt/NBTUtil")); - mObInitMap.put( - new Pair<String, String>( - "ati", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Straight")); - mObInitMap.put(new Pair<String, String>("apj", "net/minecraft/tileentity/TileEntityMobSpawner")); - mObInitMap.put(new Pair<String, String>("alk", "net/minecraft/block/BlockBreakable")); - mObInitMap.put(new Pair<String, String>("adm", "net/minecraft/item/ItemNameTag")); - mObInitMap.put(new Pair<String, String>("ahl", "net/minecraft/world/IBlockAccess")); - mObInitMap.put(new Pair<String, String>("btl", "net/minecraft/client/audio/SoundManager$2")); - mObInitMap.put(new Pair<String, String>("bpm", "net/minecraft/client/shader/ShaderLoader$ShaderType")); - mObInitMap.put(new Pair<String, String>("bdp", "net/minecraft/client/gui/GuiIngameMenu")); - mObInitMap.put(new Pair<String, String>("bho", "net/minecraft/client/model/ModelMagmaCube")); - mObInitMap.put(new Pair<String, String>("bln", "net/minecraft/entity/boss/BossStatus")); - mObInitMap.put(new Pair<String, String>("uf", "net/minecraft/entity/ai/EntityAISwimming")); - mObInitMap.put(new Pair<String, String>("qg", "net/minecraft/util/EnumTypeAdapterFactory$1")); - mObInitMap.put(new Pair<String, String>("ii", "net/minecraft/network/play/server/S33PacketUpdateSign")); - mObInitMap.put(new Pair<String, String>("ej", "net/minecraft/network/NetworkManager")); - mObInitMap.put(new Pair<String, String>("ak", "net/minecraft/command/CommandDebug")); - mObInitMap.put(new Pair<String, String>("aea", "net/minecraft/item/ItemSimpleFoiled")); - mObInitMap.put(new Pair<String, String>("aab", "net/minecraft/inventory/ContainerBrewingStand$Potion")); - mObInitMap.put(new Pair<String, String>("b", "net/minecraft/crash/CrashReport")); - mObInitMap.put(new Pair<String, String>("bqa", "net/minecraft/client/renderer/texture/TextureMap$1")); - mObInitMap.put( - new Pair<String, String>( - "ath", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$End")); - mObInitMap.put(new Pair<String, String>("bae", "net/minecraft/scoreboard/Team")); - mObInitMap.put(new Pair<String, String>("bed", "net/minecraft/client/gui/GuiScreenOptionsSounds$Button")); - mObInitMap.put(new Pair<String, String>("bic", "net/minecraft/client/model/ModelSkeleton")); - mObInitMap.put(new Pair<String, String>("bmb", "net/minecraft/client/renderer/RenderGlobal$1")); - mObInitMap.put(new Pair<String, String>("yd", "net/minecraft/entity/monster/EntityGhast")); - mObInitMap.put(new Pair<String, String>("ue", "net/minecraft/entity/ai/EntityAIFleeSun")); - mObInitMap.put(new Pair<String, String>("aau", "net/minecraft/inventory/SlotMerchantResult")); - mObInitMap.put(new Pair<String, String>("u", "net/minecraft/util/Util")); - mObInitMap.put(new Pair<String, String>("bax", "net/minecraft/client/Minecraft$SwitchMovingObjectType")); - mObInitMap.put(new Pair<String, String>("bew", "net/minecraft/client/gui/GuiControls")); - mObInitMap.put(new Pair<String, String>("yw", "net/minecraft/entity/player/PlayerCapabilities")); - mObInitMap.put(new Pair<String, String>("ux", "net/minecraft/entity/ai/EntityAILookAtVillager")); - mObInitMap.put(new Pair<String, String>("mz", "net/minecraft/network/PingResponseHandler")); - mObInitMap.put(new Pair<String, String>("aqp", "net/minecraft/world/WorldProviderHell")); - mObInitMap.put(new Pair<String, String>("amq", "net/minecraft/block/BlockPortal$Size")); - mObInitMap.put(new Pair<String, String>("aat", "net/minecraft/inventory/ContainerMerchant")); - mObInitMap.put(new Pair<String, String>("air", "net/minecraft/world/biome/BiomeGenRiver")); - mObInitMap.put( - new Pair<String, String>( - "auo", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Crossing")); - mObInitMap.put(new Pair<String, String>("ayn", "net/minecraft/world/chunk/storage/AnvilSaveConverter")); - mObInitMap.put(new Pair<String, String>("bbl", "net/minecraft/client/settings/GameSettings$SwitchOptions")); - mObInitMap.put(new Pair<String, String>("bur", "net/minecraft/client/stream/NullStream")); - mObInitMap.put(new Pair<String, String>("bqs", "net/minecraft/client/resources/FolderResourcePack")); - mObInitMap.put(new Pair<String, String>("bmt", "net/minecraft/client/renderer/tileentity/RenderEndPortal")); - mObInitMap.put(new Pair<String, String>("zk", "net/minecraft/entity/projectile/EntityThrowable")); - mObInitMap.put(new Pair<String, String>("vl", "net/minecraft/entity/ai/EntityAITradePlayer")); - mObInitMap.put(new Pair<String, String>("rm", "net/minecraft/util/CombatEntry")); - mObInitMap.put(new Pair<String, String>("nn", "net/minecraft/server/network/NetHandlerLoginServer")); - mObInitMap.put( - new Pair<String, String>("jo", "net/minecraft/network/play/client/C08PacketPlayerBlockPlacement")); - mObInitMap.put(new Pair<String, String>("fp", "net/minecraft/util/ChatStyle$Serializer")); - mObInitMap.put(new Pair<String, String>("bq", "net/minecraft/command/CommandShowSeed")); - mObInitMap.put(new Pair<String, String>("ard", "net/minecraft/world/gen/feature/WorldGenBigTree")); - mObInitMap.put(new Pair<String, String>("ane", "net/minecraft/block/BlockReed")); - mObInitMap.put(new Pair<String, String>("abh", "net/minecraft/item/ItemBlock")); - mObInitMap.put(new Pair<String, String>("afg", "net/minecraft/item/crafting/IRecipe")); - mObInitMap.put(new Pair<String, String>("ajf", "net/minecraft/block/BlockRailBase$Rail")); - mObInitMap.put( - new Pair<String, String>( - "avc", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stronghold")); - mObInitMap.put( - new Pair<String, String>("brg", "net/minecraft/client/resources/SimpleReloadableResourceManager")); - mObInitMap.put(new Pair<String, String>("bbk", "net/minecraft/client/settings/GameSettings$1")); - mObInitMap.put(new Pair<String, String>("bfj", "net/minecraft/client/gui/inventory/GuiCrafting")); - mObInitMap.put(new Pair<String, String>("bji", "net/minecraft/client/multiplayer/WorldClient$3")); - mObInitMap.put(new Pair<String, String>("bnh", "net/minecraft/client/renderer/entity/RenderCow")); - mObInitMap.put(new Pair<String, String>("sa", "net/minecraft/entity/Entity")); - mObInitMap.put(new Pair<String, String>("ob", "net/minecraft/server/management/PreYggdrasilConverter$2")); - mObInitMap - .put(new Pair<String, String>("kc", "net/minecraft/network/ServerStatusResponse$PlayerCountData")); - mObInitMap.put(new Pair<String, String>("gd", "net/minecraft/network/play/server/S37PacketStatistics")); - mObInitMap.put(new Pair<String, String>("ce", "net/minecraft/command/NumberInvalidException")); - mObInitMap.put(new Pair<String, String>("net/minecraft/realms/Realms", "net/minecraft/realms/Realms")); - mObInitMap.put(new Pair<String, String>("ajy", "net/minecraft/block/BlockClay")); - mObInitMap.put(new Pair<String, String>("afz", "net/minecraft/enchantment/EnchantmentHelper$IModifier")); - mObInitMap.put(new Pair<String, String>("brz", "net/minecraft/client/resources/data/AnimationFrame")); - mObInitMap.put( - new Pair<String, String>( - "avb", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$StairsStraight")); - mObInitMap.put(new Pair<String, String>("aza", "net/minecraft/world/storage/WorldInfo$8")); - mObInitMap.put(new Pair<String, String>("kv", "net/minecraft/init/Bootstrap$5")); - mObInitMap.put(new Pair<String, String>("gw", "net/minecraft/network/play/server/S00PacketKeepAlive")); - mObInitMap.put(new Pair<String, String>("cx", "net/minecraft/dispenser/IPosition")); - mObInitMap.put(new Pair<String, String>("arv", "net/minecraft/world/gen/feature/WorldGenIcePath")); - mObInitMap.put(new Pair<String, String>("anw", "net/minecraft/block/BlockStoneBrick")); - mObInitMap.put(new Pair<String, String>("ajx", "net/minecraft/block/BlockChest")); - mObInitMap.put( - new Pair<String, String>( - "avu", - "net/minecraft/world/gen/structure/StructureVillagePieces$PieceWeight")); - mObInitMap.put(new Pair<String, String>("azt", "net/minecraft/util/AxisAlignedBB")); - mObInitMap.put(new Pair<String, String>("bcr", "net/minecraft/client/gui/GuiSlotRealmsProxy")); - mObInitMap.put( - new Pair<String, String>( - "bgq", - "net/minecraft/client/gui/stream/GuiStreamUnavailable$SwitchReason")); - mObInitMap.put(new Pair<String, String>("bkp", "net/minecraft/client/particle/EffectRenderer$2")); - mObInitMap.put(new Pair<String, String>("wr", "net/minecraft/entity/monster/EntitySnowman")); - mObInitMap.put(new Pair<String, String>("ss", "net/minecraft/entity/EntityHanging")); - mObInitMap.put(new Pair<String, String>("ot", "net/minecraft/network/rcon/RConOutputStream")); - mObInitMap.put(new Pair<String, String>("ku", "net/minecraft/init/Bootstrap$4")); - mObInitMap.put(new Pair<String, String>("asj", "net/minecraft/world/gen/feature/WorldGenSand")); - mObInitMap.put(new Pair<String, String>("aok", "net/minecraft/block/BlockWeb")); - mObInitMap.put(new Pair<String, String>("akl", "net/minecraft/block/BlockDirt")); - mObInitMap.put(new Pair<String, String>("acn", "net/minecraft/item/ItemEnderEye")); - mObInitMap.put(new Pair<String, String>("agm", "net/minecraft/entity/IMerchant")); - mObInitMap.put(new Pair<String, String>("bsm", "net/minecraft/client/audio/MovingSoundMinecart")); - mObInitMap.put(new Pair<String, String>("bon", "net/minecraft/client/renderer/entity/RenderPainting")); - mObInitMap.put(new Pair<String, String>("bko", "net/minecraft/client/particle/EffectRenderer$1")); - mObInitMap.put(new Pair<String, String>("xf", "net/minecraft/util/WeightedRandomFishable")); - mObInitMap.put(new Pair<String, String>("tg", "net/minecraft/entity/passive/EntityTameable")); - mObInitMap.put(new Pair<String, String>("ph", "net/minecraft/stats/StatBase")); - mObInitMap.put(new Pair<String, String>("li", "net/minecraft/server/MinecraftServer$2")); - mObInitMap.put(new Pair<String, String>("hj", "net/minecraft/network/play/server/S36PacketSignEditorOpen")); - mObInitMap.put(new Pair<String, String>("dk", "net/minecraft/nbt/NBTTagDouble")); - mObInitMap.put(new Pair<String, String>("adb", "net/minecraft/item/Item")); - mObInitMap.put(new Pair<String, String>("aha", "net/minecraft/world/ColorizerGrass")); - mObInitMap.put(new Pair<String, String>("bta", "net/minecraft/client/network/LanServerDetector")); - mObInitMap.put(new Pair<String, String>("bpb", "net/minecraft/client/renderer/entity/RenderWitch")); - mObInitMap.put(new Pair<String, String>("bde", "net/minecraft/client/gui/GuiScreenServerList")); - mObInitMap.put(new Pair<String, String>("bhd", "net/minecraft/client/model/ModelBlaze")); - mObInitMap.put(new Pair<String, String>("blc", "net/minecraft/client/particle/EntityBlockDustFX")); - mObInitMap.put(new Pair<String, String>("tz", "net/minecraft/entity/ai/EntityAIBreakDoor")); - mObInitMap.put(new Pair<String, String>("als", "net/minecraft/block/BlockLadder")); - mObInitMap.put(new Pair<String, String>("aht", "net/minecraft/world/biome/BiomeGenBeach")); - mObInitMap.put(new Pair<String, String>("btt", "net/minecraft/client/audio/SoundRegistry")); - mObInitMap.put(new Pair<String, String>("bpu", "net/minecraft/client/renderer/texture/SimpleTexture")); - mObInitMap.put(new Pair<String, String>("bdx", "net/minecraft/client/gui/GuiSelectWorld")); - mObInitMap.put(new Pair<String, String>("bhw", "net/minecraft/client/model/ModelQuadruped")); - mObInitMap.put(new Pair<String, String>("blv", "net/minecraft/client/renderer/EntityRenderer$2")); - mObInitMap.put(new Pair<String, String>("iq", "net/minecraft/network/play/client/C14PacketTabComplete")); - mObInitMap.put(new Pair<String, String>("er", "net/minecraft/network/EnumConnectionState$3")); - mObInitMap.put(new Pair<String, String>("as", "net/minecraft/command/CommandGameRule")); - mObInitMap.put(new Pair<String, String>("xx", "net/minecraft/entity/monster/EntityBlaze")); - mObInitMap.put(new Pair<String, String>("ty", "net/minecraft/entity/ai/EntityAIBeg")); - mObInitMap.put(new Pair<String, String>("aaj", "net/minecraft/inventory/ContainerFurnace")); - mObInitMap.put(new Pair<String, String>("j", "net/minecraft/crash/CrashReport$8")); - mObInitMap.put( - new Pair<String, String>( - "atp", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor2")); - mObInitMap.put(new Pair<String, String>("apq", "net/minecraft/block/BlockPistonExtension")); - mObInitMap.put(new Pair<String, String>("alr", "net/minecraft/block/BlockJukebox$TileEntityJukebox")); - mObInitMap.put(new Pair<String, String>("axo", "net/minecraft/world/gen/layer/GenLayer$1")); - mObInitMap.put(new Pair<String, String>("bam", "net/minecraft/client/renderer/RenderHelper")); - mObInitMap - .put(new Pair<String, String>("bel", "net/minecraft/client/gui/achievement/GuiStats$StatsBlock$1")); - mObInitMap.put(new Pair<String, String>("bik", "net/minecraft/client/model/ModelVillager")); - mObInitMap.put( - new Pair<String, String>( - "bmj", - "net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer")); - mObInitMap.put(new Pair<String, String>("bg", "net/minecraft/command/server/CommandPublishLocalServer")); - mObInitMap.put(new Pair<String, String>("yl", "net/minecraft/entity/monster/EntitySkeleton")); - mObInitMap.put(new Pair<String, String>("um", "net/minecraft/entity/ai/EntityAILeapAtTarget")); - mObInitMap.put(new Pair<String, String>("qn", "net/minecraft/util/StringUtils")); - mObInitMap.put(new Pair<String, String>("mo", "net/minecraft/entity/EntityTracker$1")); - mObInitMap.put(new Pair<String, String>("amf", "net/minecraft/block/BlockNetherWart")); - mObInitMap.put(new Pair<String, String>("aeh", "net/minecraft/item/ItemSword")); - mObInitMap.put(new Pair<String, String>("aai", "net/minecraft/inventory/ContainerEnchantment$2")); - mObInitMap.put(new Pair<String, String>("aig", "net/minecraft/world/biome/BiomeGenForest$1")); - mObInitMap.put( - new Pair<String, String>( - "aud", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$JunglePyramid$Stones")); - mObInitMap.put(new Pair<String, String>("ayc", "net/minecraft/world/gen/layer/GenLayerZoom")); - mObInitMap.put(new Pair<String, String>("bba", "net/minecraft/client/Minecraft$4")); - mObInitMap.put(new Pair<String, String>("bug", "net/minecraft/client/stream/ChatController$ChatState")); - mObInitMap.put(new Pair<String, String>("bqh", "net/minecraft/client/renderer/texture/ITextureObject")); - mObInitMap.put(new Pair<String, String>("bmi", "net/minecraft/client/shader/TesselatorVertexState")); - mObInitMap.put(new Pair<String, String>("va", "net/minecraft/entity/ai/EntityAIPlay")); - mObInitMap.put(new Pair<String, String>("rb", "net/minecraft/inventory/IInventory")); - mObInitMap.put(new Pair<String, String>("nc", "net/minecraft/network/NetworkSystem")); - mObInitMap.put(new Pair<String, String>("jd", "net/minecraft/network/play/client/C03PacketPlayer")); - mObInitMap.put(new Pair<String, String>("fe", "net/minecraft/util/ChatComponentStyle")); - mObInitMap.put(new Pair<String, String>("bf", "net/minecraft/command/CommandPlaySound")); - mObInitMap.put(new Pair<String, String>("aqx", "net/minecraft/world/gen/MapGenBase")); - mObInitMap.put(new Pair<String, String>("amy", "net/minecraft/block/BlockRail")); - mObInitMap.put(new Pair<String, String>("aiz", "net/minecraft/world/gen/feature/WorldGenWaterlily")); - mObInitMap.put( - new Pair<String, String>( - "auw", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stones")); - mObInitMap.put(new Pair<String, String>("vt", "net/minecraft/entity/ai/EntityAIOwnerHurtTarget")); - mObInitMap.put(new Pair<String, String>("ru", "net/minecraft/potion/PotionHealth")); - mObInitMap.put( - new Pair<String, String>("nv", "net/minecraft/server/management/PlayerProfileCache$ProfileEntry")); - mObInitMap.put(new Pair<String, String>("jw", "net/minecraft/network/login/client/C00PacketLoginStart")); - mObInitMap.put( - new Pair<String, String>("fx", "net/minecraft/network/play/server/S11PacketSpawnExperienceOrb")); - mObInitMap.put(new Pair<String, String>("by", "net/minecraft/command/server/CommandTestFor")); - mObInitMap.put(new Pair<String, String>("abp", "net/minecraft/item/ItemCarrotOnAStick")); - mObInitMap.put(new Pair<String, String>("afo", "net/minecraft/enchantment/EnchantmentArrowInfinite")); - mObInitMap.put(new Pair<String, String>("ajn", "net/minecraft/init/Blocks")); - mObInitMap.put( - new Pair<String, String>( - "bro", - "net/minecraft/client/resources/SkinManager$SkinAvailableCallback")); - mObInitMap.put( - new Pair<String, String>( - "auv", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$RoomCrossing")); - mObInitMap.put(new Pair<String, String>("ayu", "net/minecraft/world/storage/WorldInfo$2")); - mObInitMap.put(new Pair<String, String>("bbs", "net/minecraft/util/Session")); - mObInitMap.put(new Pair<String, String>("bfr", "net/minecraft/client/gui/inventory/GuiFurnace")); - mObInitMap.put(new Pair<String, String>("bjq", "net/minecraft/client/network/OldServerPinger")); - mObInitMap.put(new Pair<String, String>("bnp", "net/minecraft/client/renderer/entity/RenderXPOrb")); - mObInitMap.put(new Pair<String, String>("kk", "net/minecraft/dispenser/BehaviorProjectileDispense")); - mObInitMap.put( - new Pair<String, String>("gl", "net/minecraft/network/play/server/S32PacketConfirmTransaction")); - mObInitMap.put(new Pair<String, String>("cm", "net/minecraft/dispenser/BehaviorDefaultDispenseItem")); - mObInitMap.put(new Pair<String, String>("zr", "net/minecraft/util/FoodStats")); - mObInitMap.put(new Pair<String, String>("vs", "net/minecraft/entity/ai/EntityAIOwnerHurtByTarget")); - mObInitMap.put(new Pair<String, String>("ark", "net/minecraft/world/gen/feature/WorldGenDeadBush")); - mObInitMap.put(new Pair<String, String>("anl", "net/minecraft/block/BlockSkull")); - mObInitMap.put(new Pair<String, String>("ajm", "net/minecraft/block/Block$SoundType")); - mObInitMap.put(new Pair<String, String>("avj", "net/minecraft/world/gen/structure/MapGenStructureData")); - mObInitMap.put(new Pair<String, String>("bgf", "net/minecraft/client/gui/GuiScreenResourcePacks")); - mObInitMap.put(new Pair<String, String>("bke", "net/minecraft/client/particle/EntityFireworkStarterFX")); - mObInitMap.put(new Pair<String, String>("wg", "net/minecraft/entity/passive/EntityChicken")); - mObInitMap.put(new Pair<String, String>("sh", "net/minecraft/entity/EntityList$EntityEggInfo")); - mObInitMap - .put(new Pair<String, String>("oi", "net/minecraft/server/management/ServerConfigurationManager")); - mObInitMap.put(new Pair<String, String>("kj", "net/minecraft/network/status/client/C00PacketServerQuery")); - mObInitMap.put(new Pair<String, String>("aka", "net/minecraft/block/BlockColored")); - mObInitMap.put(new Pair<String, String>("acc", "net/minecraft/creativetab/CreativeTabs$6")); - mObInitMap - .put(new Pair<String, String>("agb", "net/minecraft/enchantment/EnchantmentHelper$ModifierDamage")); - mObInitMap.put( - new Pair<String, String>( - "bsb", - "net/minecraft/client/resources/data/AnimationMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("bkd", "net/minecraft/client/particle/EntityFireworkSparkFX")); - mObInitMap.put(new Pair<String, String>("boc", "net/minecraft/client/renderer/entity/RenderItem$4")); - mObInitMap.put(new Pair<String, String>("wz", "net/minecraft/entity/item/EntityEnderCrystal")); - mObInitMap.put(new Pair<String, String>("asr", "net/minecraft/world/gen/feature/WorldGenVines")); - mObInitMap.put(new Pair<String, String>("aos", "net/minecraft/tileentity/TileEntity$1")); - mObInitMap.put(new Pair<String, String>("akt", "net/minecraft/block/BlockEndPortal")); - mObInitMap.put(new Pair<String, String>("acv", "net/minecraft/item/ItemFishingRod")); - mObInitMap.put(new Pair<String, String>("agu", "net/minecraft/world/ChunkCoordIntPair")); - mObInitMap.put(new Pair<String, String>("awq", "net/minecraft/block/material/MaterialLogic")); - mObInitMap.put(new Pair<String, String>("bsu", "net/minecraft/client/audio/ISound$AttenuationType")); - mObInitMap.put(new Pair<String, String>("bov", "net/minecraft/client/renderer/entity/RenderSpider")); - mObInitMap.put(new Pair<String, String>("bcy", "net/minecraft/client/multiplayer/GuiConnecting$1")); - mObInitMap.put(new Pair<String, String>("bkw", "net/minecraft/client/particle/EntitySnowShovelFX")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsAnvilLevelStorageSource", - "net/minecraft/realms/RealmsAnvilLevelStorageSource")); - mObInitMap.put(new Pair<String, String>("to", "net/minecraft/entity/ai/attributes/RangedAttribute")); - mObInitMap.put(new Pair<String, String>("pp", "net/minecraft/stats/StatList")); - mObInitMap.put(new Pair<String, String>("lq", "net/minecraft/server/dedicated/PropertyManager")); - mObInitMap.put( - new Pair<String, String>("hr", "net/minecraft/network/play/server/S1EPacketRemoveEntityEffect")); - mObInitMap.put(new Pair<String, String>("ds", "net/minecraft/nbt/NBTSizeTracker")); - mObInitMap.put(new Pair<String, String>("alh", "net/minecraft/block/BlockGrass")); - mObInitMap.put(new Pair<String, String>("adj", "net/minecraft/item/ItemMinecart")); - mObInitMap.put(new Pair<String, String>("bti", "net/minecraft/client/audio/SoundPoolEntry")); - mObInitMap.put(new Pair<String, String>("bpj", "net/minecraft/client/shader/ShaderGroup")); - mObInitMap.put(new Pair<String, String>("awp", "net/minecraft/world/gen/NoiseGenerator")); - mObInitMap.put(new Pair<String, String>("bdm", "net/minecraft/client/gui/GuiOptions")); - mObInitMap.put(new Pair<String, String>("bhl", "net/minecraft/client/model/ModelGhast")); - mObInitMap.put(new Pair<String, String>("blk", "net/minecraft/client/entity/EntityPlayerSP")); - mObInitMap.put(new Pair<String, String>("me", "net/minecraft/server/gui/PlayerListComponent")); - mObInitMap.put(new Pair<String, String>("eg", "net/minecraft/network/NettyEncryptionTranslator")); - mObInitMap.put(new Pair<String, String>("ah", "net/minecraft/command/server/CommandBroadcast")); - mObInitMap.put(new Pair<String, String>("xm", "net/minecraft/entity/item/EntityMinecartChest")); - mObInitMap.put( - new Pair<String, String>("net/minecraft/realms/Tezzelator", "net/minecraft/realms/Tezzelator")); - mObInitMap - .put(new Pair<String, String>("ate", "net/minecraft/world/gen/structure/MapGenNetherBridge$Start")); - mObInitMap.put(new Pair<String, String>("apf", "net/minecraft/tileentity/TileEntityFlowerPot")); - mObInitMap.put(new Pair<String, String>("alg", "net/minecraft/block/BlockGlowstone")); - mObInitMap.put(new Pair<String, String>("axd", "net/minecraft/world/gen/layer/GenLayerAddSnow")); - mObInitMap.put(new Pair<String, String>("bea", "net/minecraft/client/gui/GuiSnooper")); - mObInitMap.put(new Pair<String, String>("ya", "net/minecraft/entity/monster/EntityEnderman")); - mObInitMap.put(new Pair<String, String>("ub", "net/minecraft/entity/ai/EntityAIControlledByPlayer")); - mObInitMap.put(new Pair<String, String>("qc", "net/minecraft/util/ThreadSafeBoundList")); - mObInitMap.put(new Pair<String, String>("md", "net/minecraft/server/gui/MinecraftServerGui$5")); - mObInitMap.put(new Pair<String, String>("r", "net/minecraft/util/ChunkCoordinates")); - mObInitMap.put(new Pair<String, String>("atx", "net/minecraft/world/gen/structure/MapGenScatteredFeature")); - mObInitMap.put(new Pair<String, String>("apy", "net/minecraft/world/chunk/Chunk$1")); - mObInitMap.put(new Pair<String, String>("alz", "net/minecraft/block/BlockCompressed")); - mObInitMap.put(new Pair<String, String>("axw", "net/minecraft/world/gen/layer/GenLayerShore")); - mObInitMap.put(new Pair<String, String>("bau", "net/minecraft/client/Minecraft$14")); - mObInitMap.put(new Pair<String, String>("yt", "net/minecraft/entity/NpcMerchant")); - mObInitMap.put(new Pair<String, String>("uu", "net/minecraft/entity/ai/EntityAIMoveTowardsTarget")); - mObInitMap.put(new Pair<String, String>("qv", "net/minecraft/util/WeightedRandom")); - mObInitMap.put(new Pair<String, String>("mw", "net/minecraft/entity/player/EntityPlayerMP")); - mObInitMap.put(new Pair<String, String>("ix", "net/minecraft/network/play/client/C0EPacketClickWindow")); - mObInitMap.put(new Pair<String, String>("ey", "net/minecraft/network/NetworkStatistics$PacketStatData")); - mObInitMap.put(new Pair<String, String>("az", "net/minecraft/command/server/CommandMessage")); - mObInitMap.put(new Pair<String, String>("amn", "net/minecraft/block/BlockOre")); - mObInitMap.put(new Pair<String, String>("aaq", "net/minecraft/inventory/ContainerPlayer$1")); - mObInitMap.put(new Pair<String, String>("aio", "net/minecraft/world/biome/BiomeGenOcean")); - mObInitMap.put( - new Pair<String, String>( - "aul", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$SwitchDoor")); - mObInitMap.put(new Pair<String, String>("buo", "net/minecraft/client/stream/TwitchStream")); - mObInitMap.put(new Pair<String, String>("bqp", "net/minecraft/client/resources/DefaultResourcePack")); - mObInitMap.put(new Pair<String, String>("bat", "net/minecraft/client/Minecraft$13")); - mObInitMap.put(new Pair<String, String>("bes", "net/minecraft/client/gui/GuiKeyBindingList")); - mObInitMap.put(new Pair<String, String>("bir", "net/minecraft/client/model/ModelEnderCrystal")); - mObInitMap.put( - new Pair<String, String>( - "bmq", - "net/minecraft/client/renderer/tileentity/TileEntityRendererPiston")); - mObInitMap.put(new Pair<String, String>("vi", "net/minecraft/entity/ai/EntityAICreeperSwell")); - mObInitMap.put(new Pair<String, String>("rj", "net/minecraft/profiler/PlayerUsageSnooper$1")); - mObInitMap - .put(new Pair<String, String>("nk", "net/minecraft/network/NetHandlerPlayServer$SwitchEnumState")); - mObInitMap.put(new Pair<String, String>("jl", "net/minecraft/network/play/client/C09PacketHeldItemChange")); - mObInitMap.put(new Pair<String, String>("fm", "net/minecraft/event/HoverEvent$Action")); - mObInitMap.put(new Pair<String, String>("bn", "net/minecraft/command/server/CommandSetDefaultSpawnpoint")); - mObInitMap.put(new Pair<String, String>("abe", "net/minecraft/item/ItemBlockWithMetadata")); - mObInitMap.put(new Pair<String, String>("afd", "net/minecraft/item/crafting/RecipesIngots")); - mObInitMap.put(new Pair<String, String>("ajc", "net/minecraft/block/BlockContainer")); - mObInitMap.put(new Pair<String, String>("brd", "net/minecraft/client/resources/ResourcePackRepository$1")); - mObInitMap.put( - new Pair<String, String>("auk", "net/minecraft/world/gen/structure/StructureStrongholdPieces$2")); - mObInitMap.put(new Pair<String, String>("ayj", "net/minecraft/world/storage/MapData$MapInfo")); - mObInitMap.put(new Pair<String, String>("bbh", "net/minecraft/client/renderer/OpenGlCapsChecker")); - mObInitMap.put(new Pair<String, String>("bfg", "net/minecraft/client/gui/inventory/GuiBrewingStand")); - mObInitMap.put(new Pair<String, String>("bjf", "net/minecraft/client/multiplayer/WorldClient")); - mObInitMap.put(new Pair<String, String>("bne", "net/minecraft/client/renderer/entity/RenderBoat")); - mObInitMap.put(new Pair<String, String>("ga", "net/minecraft/network/play/server/S10PacketSpawnPainting")); - mObInitMap.put(new Pair<String, String>("cb", "net/minecraft/command/CommandWeather")); - mObInitMap.put(new Pair<String, String>("zg", "net/minecraft/entity/projectile/EntityLargeFireball")); - mObInitMap.put(new Pair<String, String>("vh", "net/minecraft/entity/ai/EntityAISit")); - mObInitMap.put(new Pair<String, String>("abx", "net/minecraft/creativetab/CreativeTabs$12")); - mObInitMap.put(new Pair<String, String>("ana", "net/minecraft/block/BlockRedstoneWire")); - mObInitMap.put(new Pair<String, String>("bfz", "net/minecraft/client/gui/GuiMultiplayer")); - mObInitMap.put(new Pair<String, String>("bjy", "net/minecraft/client/particle/EntityDropParticleFX")); - mObInitMap.put(new Pair<String, String>("zz", "net/minecraft/inventory/ContainerBrewingStand")); - mObInitMap.put(new Pair<String, String>("ars", "net/minecraft/world/gen/feature/WorldGenHellLava")); - mObInitMap.put(new Pair<String, String>("ant", "net/minecraft/block/BlockStaticLiquid")); - mObInitMap.put(new Pair<String, String>("abw", "net/minecraft/creativetab/CreativeTabs$11")); - mObInitMap.put(new Pair<String, String>("afv", "net/minecraft/enchantment/EnchantmentHelper")); - mObInitMap.put(new Pair<String, String>("aju", "net/minecraft/block/BlockCake")); - mObInitMap.put( - new Pair<String, String>("avr", "net/minecraft/world/gen/structure/StructureVillagePieces$Field1")); - mObInitMap.put(new Pair<String, String>("azq", "net/minecraft/world/storage/MapStorage")); - mObInitMap.put(new Pair<String, String>("bco", "net/minecraft/client/gui/GuiStreamIndicator")); - mObInitMap.put( - new Pair<String, String>("brv", "net/minecraft/client/resources/data/IMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("bnw", "net/minecraft/client/renderer/entity/RenderBiped")); - mObInitMap.put(new Pair<String, String>("wo", "net/minecraft/entity/passive/EntityPig")); - mObInitMap.put(new Pair<String, String>("sp", "net/minecraft/command/IEntitySelector$ArmoredMob")); - mObInitMap.put(new Pair<String, String>("oq", "net/minecraft/server/management/UserListBansEntry")); - mObInitMap.put(new Pair<String, String>("kr", "net/minecraft/init/Bootstrap$14")); - mObInitMap.put(new Pair<String, String>("gs", "net/minecraft/network/play/server/S40PacketDisconnect")); - mObInitMap.put(new Pair<String, String>("ct", "net/minecraft/util/ObjectIntIdentityMap")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsEditBox", - "net/minecraft/realms/RealmsEditBox")); - mObInitMap.put(new Pair<String, String>("asg", "net/minecraft/world/gen/feature/WorldGenPumpkin")); - mObInitMap.put(new Pair<String, String>("aoh", "net/minecraft/block/BlockVine")); - mObInitMap.put(new Pair<String, String>("aki", "net/minecraft/block/BlockRailDetector")); - mObInitMap.put(new Pair<String, String>("ack", "net/minecraft/item/ItemEgg")); - mObInitMap.put(new Pair<String, String>("agj", "net/minecraft/enchantment/EnchantmentThorns")); - mObInitMap.put( - new Pair<String, String>("awf", "net/minecraft/world/gen/structure/StructureVillagePieces$Well")); - mObInitMap.put( - new Pair<String, String>( - "bsj", - "net/minecraft/client/resources/data/TextureMetadataSectionSerializer")); - mObInitMap.put(new Pair<String, String>("bok", "net/minecraft/client/renderer/entity/RenderLiving")); - mObInitMap.put(new Pair<String, String>("bcn", "net/minecraft/client/gui/GuiOptionSlider")); - mObInitMap.put(new Pair<String, String>("bgm", "net/minecraft/client/gui/stream/GuiIngestServers")); - mObInitMap.put(new Pair<String, String>("bkl", "net/minecraft/client/particle/EntityNoteFX")); - mObInitMap.put(new Pair<String, String>("xc", "net/minecraft/entity/boss/EntityWither")); - mObInitMap.put(new Pair<String, String>("td", "net/minecraft/entity/EntityCreature")); - mObInitMap.put(new Pair<String, String>("pe", "net/minecraft/stats/StatBasic")); - mObInitMap.put( - new Pair<String, String>( - "hg", - "net/minecraft/network/play/server/S14PacketEntity$S15PacketEntityRelMove")); - mObInitMap.put(new Pair<String, String>("dh", "net/minecraft/nbt/NBTTagCompound")); - mObInitMap.put( - new Pair<String, String>("awe", "net/minecraft/world/gen/structure/StructureVillagePieces$Road")); - mObInitMap.put(new Pair<String, String>("bdb", "net/minecraft/client/gui/GuiCreateWorld")); - mObInitMap.put(new Pair<String, String>("ly", "net/minecraft/server/gui/MinecraftServerGui")); - mObInitMap - .put(new Pair<String, String>("hz", "net/minecraft/network/play/server/S04PacketEntityEquipment")); - mObInitMap.put( - new Pair<String, String>( - "asy", - "net/minecraft/world/gen/structure/StructureMineshaftPieces$Corridor")); - mObInitMap.put(new Pair<String, String>("aoz", "net/minecraft/tileentity/TileEntityComparator")); - mObInitMap.put(new Pair<String, String>("awx", "net/minecraft/world/gen/layer/GenLayerDeepOcean")); - mObInitMap.put(new Pair<String, String>("bdu", "net/minecraft/client/gui/GuiDownloadTerrain")); - mObInitMap.put(new Pair<String, String>("bht", "net/minecraft/client/model/ModelOcelot")); - mObInitMap.put( - new Pair<String, String>( - "bls", - "net/minecraft/client/renderer/tileentity/TileEntityRendererChestHelper")); - mObInitMap.put(new Pair<String, String>("ap", "net/minecraft/command/CommandXP")); - mObInitMap.put(new Pair<String, String>("xu", "net/minecraft/entity/ai/EntityMinecartMobSpawner$1")); - mObInitMap.put(new Pair<String, String>("tv", "net/minecraft/entity/ai/EntityMoveHelper")); - mObInitMap.put(new Pair<String, String>("pw", "net/minecraft/util/HttpUtil$1")); - mObInitMap.put(new Pair<String, String>("lx", "net/minecraft/server/dedicated/DedicatedServer$4")); - mObInitMap.put(new Pair<String, String>("g", "net/minecraft/crash/CrashReport$5")); - mObInitMap.put( - new Pair<String, String>( - "atm", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing2")); - mObInitMap.put(new Pair<String, String>("apn", "net/minecraft/tileentity/TileEntitySkull")); - mObInitMap.put(new Pair<String, String>("alo", "net/minecraft/block/BlockHugeMushroom")); - mObInitMap.put(new Pair<String, String>("adq", "net/minecraft/item/EnumRarity")); - mObInitMap.put(new Pair<String, String>("ahp", "net/minecraft/world/Teleporter")); - mObInitMap.put(new Pair<String, String>("axl", "net/minecraft/world/gen/layer/IntCache")); - mObInitMap.put(new Pair<String, String>("baj", "net/minecraft/client/renderer/ActiveRenderInfo")); - mObInitMap.put(new Pair<String, String>("btp", "net/minecraft/client/audio/SoundHandler")); - mObInitMap.put(new Pair<String, String>("bpq", "net/minecraft/client/renderer/texture/DynamicTexture")); - mObInitMap.put(new Pair<String, String>("blr", "net/minecraft/client/util/RenderDistanceSorter")); - mObInitMap.put(new Pair<String, String>("yi", "net/minecraft/entity/IRangedAttackMob")); - mObInitMap.put(new Pair<String, String>("uj", "net/minecraft/entity/ai/EntityAITasks")); - mObInitMap.put(new Pair<String, String>("qk", "net/minecraft/util/IProgressUpdate")); - mObInitMap.put(new Pair<String, String>("ml", "net/minecraft/world/demo/DemoWorldManager")); - mObInitMap.put( - new Pair<String, String>( - "im", - "net/minecraft/network/play/server/S20PacketEntityProperties$Snapshot")); - mObInitMap.put( - new Pair<String, String>( - "en", - "net/minecraft/network/NetworkManager$InboundHandlerTuplePacketListener")); - mObInitMap.put(new Pair<String, String>("ao", "net/minecraft/command/CommandEnchant")); - mObInitMap.put(new Pair<String, String>("amc", "net/minecraft/block/BlockMushroom")); - mObInitMap.put(new Pair<String, String>("aee", "net/minecraft/item/ItemMonsterPlacer")); - mObInitMap.put(new Pair<String, String>("aaf", "net/minecraft/inventory/ContainerWorkbench")); - mObInitMap.put(new Pair<String, String>("aid", "net/minecraft/world/biome/BiomeGenHills")); - mObInitMap.put( - new Pair<String, String>( - "aua", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$1")); - mObInitMap.put( - new Pair<String, String>( - "bud", - "net/minecraft/client/stream/BroadcastController$BroadcastListener")); - mObInitMap - .put(new Pair<String, String>("bqe", "net/minecraft/client/renderer/texture/TextureAtlasSprite$1")); - mObInitMap.put(new Pair<String, String>("beh", "net/minecraft/client/gui/achievement/GuiAchievement")); - mObInitMap.put(new Pair<String, String>("big", "net/minecraft/client/model/ModelSpider")); - mObInitMap.put(new Pair<String, String>("ja", "net/minecraft/network/play/client/C02PacketUseEntity")); - mObInitMap.put(new Pair<String, String>("fb", "net/minecraft/network/INetHandler")); - mObInitMap.put(new Pair<String, String>("bc", "net/minecraft/command/server/CommandOp")); - mObInitMap.put(new Pair<String, String>("amv", "net/minecraft/block/BlockPressurePlate$Sensitivity")); - mObInitMap.put(new Pair<String, String>("aex", "net/minecraft/item/crafting/RecipesDyes")); - mObInitMap.put(new Pair<String, String>("aay", "net/minecraft/inventory/Slot")); - mObInitMap.put(new Pair<String, String>("aiw", "net/minecraft/world/biome/BiomeGenTaiga")); - mObInitMap.put(new Pair<String, String>("y", "net/minecraft/command/CommandBase")); - mObInitMap.put(new Pair<String, String>("bqx", "net/minecraft/util/ResourceLocation")); - mObInitMap.put(new Pair<String, String>("biz", "net/minecraft/client/network/NetHandlerLoginClient")); - mObInitMap.put(new Pair<String, String>("bmy", "net/minecraft/client/renderer/culling/ClippingHelper")); - mObInitMap.put( - new Pair<String, String>("jt", "net/minecraft/network/login/server/S01PacketEncryptionRequest")); - mObInitMap.put(new Pair<String, String>("fu", "net/minecraft/network/play/server/S08PacketPlayerPosLook")); - mObInitMap.put(new Pair<String, String>("bv", "net/minecraft/command/server/CommandTeleport")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/realms/RealmsConnect", - "net/minecraft/realms/RealmsConnect")); - mObInitMap.put(new Pair<String, String>("abm", "net/minecraft/item/ItemBow")); - mObInitMap.put(new Pair<String, String>("amu", "net/minecraft/block/BlockPressurePlate")); - mObInitMap.put( - new Pair<String, String>( - "aus", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$PortalRoom")); - mObInitMap.put(new Pair<String, String>("ayr", "net/minecraft/world/storage/SaveFormatOld")); - mObInitMap.put(new Pair<String, String>("bbp", "net/minecraft/util/ScreenShotHelper")); - mObInitMap.put(new Pair<String, String>("bfo", "net/minecraft/client/renderer/InventoryEffectRenderer")); - mObInitMap.put(new Pair<String, String>("bjn", "net/minecraft/client/multiplayer/ServerData")); - mObInitMap.put(new Pair<String, String>("bnm", "net/minecraft/client/renderer/entity/RenderEnderman")); - mObInitMap.put(new Pair<String, String>("zo", "net/minecraft/entity/projectile/EntityPotion")); - mObInitMap.put(new Pair<String, String>("vp", "net/minecraft/entity/ai/EntityAINearestAttackableTarget$1")); - mObInitMap.put(new Pair<String, String>("rq", "net/minecraft/util/EntityDamageSourceIndirect")); - mObInitMap.put(new Pair<String, String>("nr", "net/minecraft/server/management/BanEntry")); - mObInitMap.put(new Pair<String, String>("arh", "net/minecraft/world/gen/feature/WorldGenCactus")); - mObInitMap.put(new Pair<String, String>("ani", "net/minecraft/block/BlockSandStone")); - mObInitMap.put(new Pair<String, String>("abl", "net/minecraft/item/ItemGlassBottle")); - mObInitMap.put(new Pair<String, String>("afk", "net/minecraft/item/crafting/RecipesTools")); - mObInitMap.put(new Pair<String, String>("ajj", "net/minecraft/block/Block$1")); - mObInitMap.put(new Pair<String, String>("avg", "net/minecraft/world/gen/structure/MapGenStructure$2")); - mObInitMap.put(new Pair<String, String>("azf", "net/minecraft/world/storage/SaveFormatComparator")); - mObInitMap.put(new Pair<String, String>("bcd", "net/minecraft/client/gui/GuiTextField")); - mObInitMap.put(new Pair<String, String>("brk", "net/minecraft/client/resources/SkinManager$1")); - mObInitMap.put(new Pair<String, String>("bnl", "net/minecraft/client/renderer/entity/RenderDragon")); - mObInitMap.put(new Pair<String, String>("wd", "net/minecraft/entity/passive/EntityAmbientCreature")); - mObInitMap.put(new Pair<String, String>("se", "net/minecraft/entity/Entity$EnumEntitySize")); - mObInitMap.put(new Pair<String, String>("of", "net/minecraft/server/management/PreYggdrasilConverter$6")); - mObInitMap.put( - new Pair<String, String>( - "kg", - "net/minecraft/network/ServerStatusResponse$MinecraftProtocolVersionIdentifier$Serializer")); - mObInitMap.put(new Pair<String, String>("gh", "net/minecraft/network/play/server/S23PacketBlockChange")); - mObInitMap.put(new Pair<String, String>("ci", "net/minecraft/command/WrongUsageException")); - mObInitMap.put( - new Pair<String, String>("avz", "net/minecraft/world/gen/structure/StructureVillagePieces$House2")); - mObInitMap.put( - new Pair<String, String>("net/minecraft/realms/RealmsButton", "net/minecraft/realms/RealmsButton")); - mObInitMap.put(new Pair<String, String>("bcc", "net/minecraft/client/gui/GuiNewChat")); - mObInitMap.put(new Pair<String, String>("bgb", "net/minecraft/client/gui/ServerListEntryLanDetected")); - mObInitMap.put(new Pair<String, String>("bka", "net/minecraft/client/particle/EntityExplodeFX")); - mObInitMap.put(new Pair<String, String>("ww", "net/minecraft/entity/boss/IBossDisplayData")); - mObInitMap.put(new Pair<String, String>("sx", "net/minecraft/entity/EnumCreatureType")); - mObInitMap.put(new Pair<String, String>("oy", "net/minecraft/network/rcon/RConThreadQuery$Auth")); - mObInitMap.put(new Pair<String, String>("kz", "net/minecraft/init/Bootstrap$8")); - mObInitMap.put(new Pair<String, String>("akq", "net/minecraft/block/BlockDropper")); - mObInitMap.put(new Pair<String, String>("acs", "net/minecraft/item/ItemFirework")); - mObInitMap.put( - new Pair<String, String>( - "agr", - "net/minecraft/tileentity/MobSpawnerBaseLogic$WeightedRandomMinecart")); - mObInitMap.put(new Pair<String, String>("bsr", "net/minecraft/client/audio/SoundList$SoundEntry$Type")); - mObInitMap.put(new Pair<String, String>("bos", "net/minecraft/client/renderer/entity/RenderSkeleton")); - mObInitMap.put( - new Pair<String, String>("avy", "net/minecraft/world/gen/structure/StructureVillagePieces$Church")); - mObInitMap.put(new Pair<String, String>("azx", "net/minecraft/scoreboard/ScoreObjective")); - mObInitMap.put(new Pair<String, String>("bcv", "net/minecraft/client/gui/GuiYesNoCallback")); - mObInitMap.put(new Pair<String, String>("bgu", "net/minecraft/client/main/Main$1$1")); - mObInitMap.put(new Pair<String, String>("bkt", "net/minecraft/client/particle/EntityPortalFX")); - mObInitMap.put(new Pair<String, String>("ln", "net/minecraft/server/management/PlayerPositionComparator")); - mObInitMap.put(new Pair<String, String>("ho", "net/minecraft/network/play/server/S38PacketPlayerListItem")); - mObInitMap.put(new Pair<String, String>("dp", "net/minecraft/nbt/NBTTagInt")); - mObInitMap.put(new Pair<String, String>("wv", "net/minecraft/entity/passive/EntityWolf")); - mObInitMap.put(new Pair<String, String>("asn", "net/minecraft/world/gen/feature/WorldGenTaiga2")); - mObInitMap.put(new Pair<String, String>("aoo", "net/minecraft/block/BlockWoodSlab")); - mObInitMap.put(new Pair<String, String>("bdj", "net/minecraft/client/gui/GuiLanguage")); - mObInitMap.put(new Pair<String, String>("bhi", "net/minecraft/client/model/ModelCow")); - mObInitMap.put( - new Pair<String, String>("blh", "net/minecraft/client/entity/AbstractClientPlayer$SwitchType")); - mObInitMap.put(new Pair<String, String>("ae", "net/minecraft/command/server/CommandAchievement")); - mObInitMap.put(new Pair<String, String>("xj", "net/minecraft/entity/item/EntityFallingBlock")); - mObInitMap.put(new Pair<String, String>("tk", "net/minecraft/entity/ai/attributes/BaseAttribute")); - mObInitMap.put(new Pair<String, String>("pl", "net/minecraft/stats/StatBase$4")); - mObInitMap.put(new Pair<String, String>("lm", "net/minecraft/server/MinecraftServer$6")); - mObInitMap.put( - new Pair<String, String>( - "atb", - "net/minecraft/world/gen/structure/StructureMineshaftPieces$Stairs")); - mObInitMap.put(new Pair<String, String>("apc", "net/minecraft/tileentity/TileEntityDropper")); - mObInitMap.put(new Pair<String, String>("ald", "net/minecraft/block/BlockFlowerPot")); - mObInitMap.put(new Pair<String, String>("adf", "net/minecraft/item/ItemLead")); - mObInitMap.put(new Pair<String, String>("ahe", "net/minecraft/world/World$3")); - mObInitMap.put(new Pair<String, String>("axa", "net/minecraft/world/gen/layer/GenLayerEdge$Mode")); - mObInitMap.put(new Pair<String, String>("bte", "net/minecraft/client/multiplayer/ThreadLanServerPing")); - mObInitMap.put(new Pair<String, String>("bpf", "net/minecraft/client/renderer/entity/RenderZombie")); - mObInitMap.put(new Pair<String, String>("ma", "net/minecraft/server/gui/MinecraftServerGui$2")); - mObInitMap.put(new Pair<String, String>("ib", "net/minecraft/network/play/server/S06PacketUpdateHealth")); - mObInitMap.put(new Pair<String, String>("ec", "net/minecraft/nbt/JsonToNBT$Any")); - mObInitMap.put(new Pair<String, String>("ad", "net/minecraft/command/PlayerSelector")); - mObInitMap.put( - new Pair<String, String>( - "atu", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Crossing")); - mObInitMap.put(new Pair<String, String>("apv", "net/minecraft/world/chunk/NibbleArray")); - mObInitMap.put(new Pair<String, String>("alw", "net/minecraft/block/BlockLiquid")); - mObInitMap.put(new Pair<String, String>("ady", "net/minecraft/item/ItemSpade")); - mObInitMap.put(new Pair<String, String>("ahx", "net/minecraft/world/biome/BiomeGenBase$SpawnListEntry")); - mObInitMap.put(new Pair<String, String>("axt", "net/minecraft/world/gen/layer/GenLayerRiverInit")); - mObInitMap.put(new Pair<String, String>("bpy", "net/minecraft/client/renderer/StitcherException")); - mObInitMap.put(new Pair<String, String>("ur", "net/minecraft/entity/ai/EntityAIMoveIndoors")); - mObInitMap.put(new Pair<String, String>("mt", "net/minecraft/world/WorldServer")); - mObInitMap.put(new Pair<String, String>("iu", "net/minecraft/network/play/client/C15PacketClientSettings")); - mObInitMap.put(new Pair<String, String>("ev", "net/minecraft/network/NetworkStatistics$1")); - mObInitMap.put(new Pair<String, String>("aw", "net/minecraft/command/CommandKill")); - mObInitMap.put(new Pair<String, String>("amk", "net/minecraft/block/BlockObsidian")); - mObInitMap.put(new Pair<String, String>("aem", "net/minecraft/item/ItemEditableBook")); - mObInitMap.put(new Pair<String, String>("aan", "net/minecraft/inventory/ContainerHorseInventory$1")); - mObInitMap.put(new Pair<String, String>("ail", "net/minecraft/world/biome/BiomeGenMesa")); - mObInitMap.put(new Pair<String, String>("n", "net/minecraft/crash/CrashReportCategory$3")); - mObInitMap.put( - new Pair<String, String>("bul", "net/minecraft/client/stream/IngestServerTester$IngestTestState")); - mObInitMap.put(new Pair<String, String>("bqm", "net/minecraft/client/renderer/texture/TextureCompass")); - mObInitMap.put(new Pair<String, String>("axs", "net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean")); - mObInitMap.put(new Pair<String, String>("baq", "net/minecraft/client/Minecraft$10")); - mObInitMap.put( - new Pair<String, String>("bep", "net/minecraft/client/gui/achievement/GuiStats$StatsMobsList")); - mObInitMap.put(new Pair<String, String>("bio", "net/minecraft/client/model/ModelWolf")); - mObInitMap.put( - new Pair<String, String>("bmn", "net/minecraft/client/renderer/entity/RenderEnchantmentTable")); - mObInitMap.put(new Pair<String, String>("nh", "net/minecraft/network/NetHandlerPlayServer")); - mObInitMap.put(new Pair<String, String>("ji", "net/minecraft/network/play/client/C07PacketPlayerDigging")); - mObInitMap.put(new Pair<String, String>("fj", "net/minecraft/util/IChatComponent")); - mObInitMap.put(new Pair<String, String>("bk", "net/minecraft/command/server/CommandScoreboard")); - mObInitMap.put(new Pair<String, String>("yp", "net/minecraft/entity/monster/EntityWitch")); - mObInitMap.put(new Pair<String, String>("abb", "net/minecraft/item/ItemArmor")); - mObInitMap.put(new Pair<String, String>("aqi", "net/minecraft/world/chunk/storage/RegionFile$ChunkBuffer")); - mObInitMap.put(new Pair<String, String>("amj", "net/minecraft/block/BlockNote")); - mObInitMap.put(new Pair<String, String>("auh", "net/minecraft/world/gen/structure/MapGenStronghold$Start")); - mObInitMap.put(new Pair<String, String>("ayg", "net/minecraft/pathfinding/PathFinder")); - mObInitMap.put(new Pair<String, String>("bbe", "net/minecraft/client/Minecraft$8")); - mObInitMap.put(new Pair<String, String>("bfd", "net/minecraft/client/gui/inventory/GuiBeacon$Button")); - mObInitMap.put(new Pair<String, String>("bjc", "net/minecraft/client/network/NetHandlerPlayClient$1")); - mObInitMap.put(new Pair<String, String>("bnb", "net/minecraft/client/renderer/entity/RenderArrow")); - mObInitMap.put(new Pair<String, String>("zd", "net/minecraft/entity/item/EntityEnderEye")); - mObInitMap.put(new Pair<String, String>("ve", "net/minecraft/entity/ai/EntityAIRestrictOpenDoor")); - mObInitMap.put(new Pair<String, String>("rf", "net/minecraft/util/IIcon")); - mObInitMap.put(new Pair<String, String>("ng", "net/minecraft/network/NetworkSystem$4")); - mObInitMap.put(new Pair<String, String>("aba", "net/minecraft/item/ItemAnvilBlock")); - mObInitMap.put(new Pair<String, String>("ayz", "net/minecraft/world/storage/WorldInfo$7")); - mObInitMap.put(new Pair<String, String>("bbx", "net/minecraft/client/gui/MapItemRenderer")); - mObInitMap.put(new Pair<String, String>("zw", "net/minecraft/inventory/ContainerRepair$2")); - mObInitMap.put(new Pair<String, String>("vx", "net/minecraft/entity/ai/RandomPositionGenerator")); - mObInitMap.put(new Pair<String, String>("ry", "net/minecraft/entity/passive/IAnimals")); - mObInitMap.put(new Pair<String, String>("nz", "net/minecraft/server/management/PreYggdrasilConverter")); - mObInitMap.put(new Pair<String, String>("arp", "net/minecraft/world/gen/feature/WorldGenShrub")); - mObInitMap.put(new Pair<String, String>("anq", "net/minecraft/block/BlockStainedGlass")); - mObInitMap.put(new Pair<String, String>("abt", "net/minecraft/creativetab/CreativeTabs")); - mObInitMap.put(new Pair<String, String>("afs", "net/minecraft/enchantment/EnchantmentDigging")); - mObInitMap.put(new Pair<String, String>("ajr", "net/minecraft/block/BlockBush")); - mObInitMap.put(new Pair<String, String>("avo", "net/minecraft/world/gen/structure/MapGenVillage$Start")); - mObInitMap.put(new Pair<String, String>("brs", "net/minecraft/client/resources/Locale")); - mObInitMap.put(new Pair<String, String>("bbw", "net/minecraft/client/gui/Gui")); - mObInitMap.put(new Pair<String, String>("bfv", "net/minecraft/client/gui/GuiMerchant")); - mObInitMap.put(new Pair<String, String>("bju", "net/minecraft/client/particle/EntityBreakingFX")); - mObInitMap.put(new Pair<String, String>("bnt", "net/minecraft/client/renderer/entity/RenderGhast")); - mObInitMap.put(new Pair<String, String>("wl", "net/minecraft/entity/monster/EntityGolem")); - mObInitMap.put(new Pair<String, String>("sm", "net/minecraft/command/IEntitySelector$3")); - mObInitMap.put(new Pair<String, String>("on", "net/minecraft/server/management/UserList$1")); - mObInitMap.put(new Pair<String, String>("ko", "net/minecraft/init/Bootstrap$11")); - mObInitMap.put(new Pair<String, String>("gp", "net/minecraft/network/play/server/S31PacketWindowProperty")); - mObInitMap.put(new Pair<String, String>("cq", "net/minecraft/dispenser/IBehaviorDispenseItem$1")); - mObInitMap.put(new Pair<String, String>("aoe", "net/minecraft/block/BlockTrapDoor")); - mObInitMap.put(new Pair<String, String>("akf", "net/minecraft/block/BlockCrops")); - mObInitMap.put(new Pair<String, String>("ach", "net/minecraft/item/ItemDoor")); - mObInitMap.put(new Pair<String, String>("agg", "net/minecraft/enchantment/EnchantmentLootBonus")); - mObInitMap.put(new Pair<String, String>("bsg", "net/minecraft/client/resources/data/PackMetadataSection")); - mObInitMap.put(new Pair<String, String>("bck", "net/minecraft/client/gui/GuiOptionsRowList")); - mObInitMap.put(new Pair<String, String>("bgj", "net/minecraft/client/gui/GuiResourcePackAvailable")); - mObInitMap.put(new Pair<String, String>("bki", "net/minecraft/client/particle/EntityLargeExplodeFX")); - mObInitMap - .put(new Pair<String, String>("boh", "net/minecraft/client/renderer/entity/RendererLivingEntity")); - mObInitMap.put(new Pair<String, String>("lc", "net/minecraft/client/util/JsonException$1")); - mObInitMap.put(new Pair<String, String>("hd", "net/minecraft/network/play/server/S01PacketJoinGame")); - mObInitMap.put(new Pair<String, String>("de", "net/minecraft/util/StringTranslate")); - mObInitMap.put(new Pair<String, String>("wk", "net/minecraft/entity/passive/EntityHorse$GroupData")); - mObInitMap.put(new Pair<String, String>("asc", "net/minecraft/world/gen/feature/WorldGenMelon")); - mObInitMap.put(new Pair<String, String>("aod", "net/minecraft/block/BlockLeavesBase")); - mObInitMap.put( - new Pair<String, String>("awb", "net/minecraft/world/gen/structure/StructureVillagePieces$Path")); - mObInitMap.put(new Pair<String, String>("pa", "net/minecraft/network/rcon/RConThreadMain")); - mObInitMap.put(new Pair<String, String>("asv", "net/minecraft/world/gen/structure/StructureBoundingBox")); - mObInitMap.put(new Pair<String, String>("aow", "net/minecraft/tileentity/TileEntityChest")); - mObInitMap.put(new Pair<String, String>("akx", "net/minecraft/block/BlockFalling")); - mObInitMap.put(new Pair<String, String>("acz", "net/minecraft/item/ItemHangingEntity")); - mObInitMap.put(new Pair<String, String>("agy", "net/minecraft/world/GameRules")); - mObInitMap.put(new Pair<String, String>("awu", "net/minecraft/block/material/Material$1")); - mObInitMap.put(new Pair<String, String>("bdr", "net/minecraft/client/gui/GuiFlatPresets$LayerItem")); - mObInitMap.put(new Pair<String, String>("bsy", "net/minecraft/server/integrated/IntegratedServer$1")); - mObInitMap.put(new Pair<String, String>("boz", "net/minecraft/client/renderer/entity/RenderIronGolem")); - mObInitMap.put(new Pair<String, String>("xr", "net/minecraft/entity/item/EntityMinecartHopper")); - mObInitMap.put(new Pair<String, String>("pt", "net/minecraft/util/CryptManager")); - mObInitMap.put(new Pair<String, String>("lu", "net/minecraft/server/dedicated/DedicatedServer$1")); - mObInitMap.put( - new Pair<String, String>("hv", "net/minecraft/network/play/server/S3DPacketDisplayScoreboard")); - mObInitMap.put(new Pair<String, String>("dw", "net/minecraft/nbt/NBTTagShort")); - mObInitMap.put( - new Pair<String, String>( - "atj", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor3")); - mObInitMap.put(new Pair<String, String>("apk", "net/minecraft/tileentity/TileEntityMobSpawner$1")); - mObInitMap.put(new Pair<String, String>("all", "net/minecraft/block/BlockHardenedClay")); - mObInitMap.put(new Pair<String, String>("adn", "net/minecraft/item/ItemPickaxe")); - mObInitMap.put(new Pair<String, String>("ahm", "net/minecraft/world/WorldType")); - mObInitMap.put(new Pair<String, String>("btm", "net/minecraft/client/audio/SoundManager$2$1")); - mObInitMap.put(new Pair<String, String>("bpn", "net/minecraft/client/shader/ShaderLinkHelper")); - mObInitMap.put(new Pair<String, String>("bdq", "net/minecraft/client/gui/GuiFlatPresets")); - mObInitMap.put(new Pair<String, String>("bhp", "net/minecraft/client/model/ModelLeashKnot")); - mObInitMap.put(new Pair<String, String>("blo", "net/minecraft/client/renderer/WorldRenderer")); - mObInitMap.put(new Pair<String, String>("yf", "net/minecraft/entity/monster/EntityMagmaCube")); - mObInitMap.put(new Pair<String, String>("ug", "net/minecraft/entity/ai/EntityAIFollowOwner")); - mObInitMap.put(new Pair<String, String>("qh", "net/minecraft/util/MathHelper")); - mObInitMap.put(new Pair<String, String>("ij", "net/minecraft/network/play/server/S0DPacketCollectItem")); - mObInitMap.put(new Pair<String, String>("ek", "net/minecraft/network/NetworkManager$1")); - mObInitMap.put(new Pair<String, String>("al", "net/minecraft/command/CommandDefaultGameMode")); - mObInitMap.put(new Pair<String, String>("aeb", "net/minecraft/item/ItemSkull")); - mObInitMap.put(new Pair<String, String>("aac", "net/minecraft/inventory/ICrafting")); - mObInitMap.put(new Pair<String, String>("aia", "net/minecraft/world/biome/BiomeDecorator")); - mObInitMap.put(new Pair<String, String>("c", "net/minecraft/crash/CrashReport$1")); - mObInitMap.put(new Pair<String, String>("bua", "net/minecraft/client/stream/BroadcastController")); - mObInitMap.put(new Pair<String, String>("bqb", "net/minecraft/client/renderer/texture/TextureMap$2")); - mObInitMap.put(new Pair<String, String>("baf", "net/minecraft/scoreboard/ScoreDummyCriteria")); - mObInitMap.put(new Pair<String, String>("bee", "net/minecraft/client/gui/GuiMainMenu")); - mObInitMap.put(new Pair<String, String>("bmc", "net/minecraft/client/renderer/ImageBufferDownload")); - mObInitMap.put(new Pair<String, String>("ye", "net/minecraft/entity/monster/EntityGiantZombie")); - mObInitMap.put(new Pair<String, String>("aav", "net/minecraft/inventory/InventoryEnderChest")); - mObInitMap.put(new Pair<String, String>("v", "net/minecraft/util/Util$EnumOS")); - mObInitMap.put(new Pair<String, String>("bay", "net/minecraft/client/Minecraft$2")); - mObInitMap.put(new Pair<String, String>("bex", "net/minecraft/client/gui/inventory/GuiContainer")); - mObInitMap.put(new Pair<String, String>("bmv", "net/minecraft/client/renderer/culling/ICamera")); - mObInitMap.put(new Pair<String, String>("bs", "net/minecraft/command/CommandSpreadPlayers$Position")); - mObInitMap.put(new Pair<String, String>("yx", "net/minecraft/entity/player/InventoryPlayer")); - mObInitMap.put(new Pair<String, String>("uy", "net/minecraft/entity/ai/EntityAIOpenDoor")); - mObInitMap.put(new Pair<String, String>("aqq", "net/minecraft/world/WorldProviderSurface")); - mObInitMap.put(new Pair<String, String>("amr", "net/minecraft/block/BlockPotato")); - mObInitMap.put(new Pair<String, String>("ais", "net/minecraft/world/biome/BiomeGenSavanna")); - mObInitMap.put( - new Pair<String, String>( - "aup", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$LeftTurn")); - mObInitMap.put(new Pair<String, String>("ayo", "net/minecraft/world/chunk/storage/AnvilSaveConverter$1")); - mObInitMap.put(new Pair<String, String>("bbm", "net/minecraft/client/settings/GameSettings$Options")); - mObInitMap.put(new Pair<String, String>("bus", "net/minecraft/realms/RealmsConnect$1")); - mObInitMap - .put(new Pair<String, String>("bqt", "net/minecraft/client/resources/FoliageColorReloadListener")); - mObInitMap.put(new Pair<String, String>("zl", "net/minecraft/entity/projectile/EntityEgg")); - mObInitMap.put(new Pair<String, String>("vm", "net/minecraft/entity/ai/EntityAIDefendVillage")); - mObInitMap.put(new Pair<String, String>("rn", "net/minecraft/util/CombatTracker")); - mObInitMap.put(new Pair<String, String>("no", "net/minecraft/server/network/NetHandlerLoginServer$1")); - mObInitMap.put(new Pair<String, String>("jp", "net/minecraft/network/handshake/client/C00Handshake")); - mObInitMap.put(new Pair<String, String>("fq", "net/minecraft/util/ChatComponentText")); - mObInitMap.put(new Pair<String, String>("br", "net/minecraft/command/CommandSpreadPlayers")); - mObInitMap.put(new Pair<String, String>("are", "net/minecraft/world/gen/feature/WorldGenForest")); - mObInitMap.put(new Pair<String, String>("anf", "net/minecraft/block/BlockRedstoneRepeater")); - mObInitMap.put(new Pair<String, String>("abi", "net/minecraft/item/ItemReed")); - mObInitMap.put(new Pair<String, String>("afh", "net/minecraft/item/crafting/ShapedRecipes")); - mObInitMap.put(new Pair<String, String>("ajg", "net/minecraft/block/BlockBeacon")); - mObInitMap.put( - new Pair<String, String>( - "avd", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$Stronghold$Door")); - mObInitMap.put(new Pair<String, String>("azc", "net/minecraft/world/storage/ISaveHandler")); - mObInitMap.put( - new Pair<String, String>( - "brh", - "net/minecraft/client/resources/SimpleReloadableResourceManager$1")); - mObInitMap.put(new Pair<String, String>("bfk", "net/minecraft/client/gui/inventory/CreativeCrafting")); - mObInitMap.put(new Pair<String, String>("bjj", "net/minecraft/client/multiplayer/WorldClient$4")); - mObInitMap.put(new Pair<String, String>("bni", "net/minecraft/client/renderer/entity/RenderCreeper")); - mObInitMap.put(new Pair<String, String>("wa", "net/minecraft/village/Village$VillageAgressor")); - mObInitMap.put(new Pair<String, String>("sb", "net/minecraft/entity/Entity$1")); - mObInitMap.put(new Pair<String, String>("oc", "net/minecraft/server/management/PreYggdrasilConverter$3")); - mObInitMap.put( - new Pair<String, String>( - "kd", - "net/minecraft/network/ServerStatusResponse$PlayerCountData$Serializer")); - mObInitMap.put(new Pair<String, String>("ge", "net/minecraft/network/play/server/S25PacketBlockBreakAnim")); - mObInitMap.put(new Pair<String, String>("cf", "net/minecraft/command/SyntaxErrorException")); - mObInitMap.put(new Pair<String, String>("any", "net/minecraft/block/BlockStoneSlab")); - mObInitMap.put(new Pair<String, String>("ajz", "net/minecraft/block/BlockCocoa")); - mObInitMap.put(new Pair<String, String>("azb", "net/minecraft/world/storage/WorldInfo$9")); - mObInitMap.put(new Pair<String, String>("ov", "net/minecraft/network/rcon/RConConsoleSource")); - mObInitMap.put(new Pair<String, String>("kw", "net/minecraft/init/Bootstrap$5$1")); - mObInitMap.put(new Pair<String, String>("gx", "net/minecraft/network/play/server/S21PacketChunkData")); - mObInitMap.put(new Pair<String, String>("cy", "net/minecraft/dispenser/PositionImpl")); - mObInitMap.put(new Pair<String, String>("acp", "net/minecraft/item/ItemExpBottle")); - mObInitMap.put(new Pair<String, String>("bop", "net/minecraft/client/renderer/entity/RenderPlayer")); - mObInitMap.put(new Pair<String, String>("arw", "net/minecraft/world/gen/feature/WorldGenIceSpike")); - mObInitMap.put(new Pair<String, String>("anx", "net/minecraft/block/BlockButtonStone")); - mObInitMap.put( - new Pair<String, String>("avv", "net/minecraft/world/gen/structure/StructureVillagePieces$Hall")); - mObInitMap.put(new Pair<String, String>("azu", "net/minecraft/util/MovingObjectPosition")); - mObInitMap.put(new Pair<String, String>("bcs", "net/minecraft/client/gui/ScreenChatOptions")); - mObInitMap.put( - new Pair<String, String>("bgr", "net/minecraft/client/gui/stream/GuiStreamUnavailable$Reason")); - mObInitMap.put(new Pair<String, String>("bkq", "net/minecraft/client/particle/EffectRenderer$3")); - mObInitMap.put(new Pair<String, String>("dm", "net/minecraft/nbt/NBTTagFloat")); - mObInitMap.put(new Pair<String, String>("ws", "net/minecraft/entity/passive/EntitySquid")); - mObInitMap.put(new Pair<String, String>("st", "net/minecraft/entity/item/EntityItemFrame")); - mObInitMap.put(new Pair<String, String>("ou", "net/minecraft/network/rcon/RConUtils")); - mObInitMap.put(new Pair<String, String>("ask", "net/minecraft/world/gen/feature/WorldGenSavannaTree")); - mObInitMap.put(new Pair<String, String>("aol", "net/minecraft/block/BlockPressurePlateWeighted")); - mObInitMap.put(new Pair<String, String>("akm", "net/minecraft/block/BlockDispenser")); - mObInitMap.put(new Pair<String, String>("aco", "net/minecraft/item/ItemEnderPearl")); - mObInitMap.put(new Pair<String, String>("agn", "net/minecraft/village/MerchantRecipe")); - mObInitMap.put(new Pair<String, String>("awj", "net/minecraft/world/gen/NoiseGeneratorImproved")); - mObInitMap.put(new Pair<String, String>("bdg", "net/minecraft/client/gui/GuiScreenAddServer")); - mObInitMap.put(new Pair<String, String>("bsn", "net/minecraft/client/audio/MovingSoundMinecartRiding")); - mObInitMap.put(new Pair<String, String>("boo", "net/minecraft/client/renderer/entity/RenderPig")); - mObInitMap.put(new Pair<String, String>("xg", "net/minecraft/entity/effect/EntityWeatherEffect")); - mObInitMap.put(new Pair<String, String>("th", "net/minecraft/entity/ai/attributes/IAttribute")); - mObInitMap.put(new Pair<String, String>("pi", "net/minecraft/stats/StatBase$1")); - mObInitMap.put(new Pair<String, String>("lj", "net/minecraft/server/MinecraftServer$3")); - mObInitMap - .put(new Pair<String, String>("hk", "net/minecraft/network/play/server/S39PacketPlayerAbilities")); - mObInitMap.put(new Pair<String, String>("dl", "net/minecraft/nbt/NBTTagEnd")); - mObInitMap.put(new Pair<String, String>("ala", "net/minecraft/block/BlockFenceGate")); - mObInitMap.put(new Pair<String, String>("adc", "net/minecraft/item/Item$ToolMaterial")); - mObInitMap.put(new Pair<String, String>("ahb", "net/minecraft/world/World")); - mObInitMap.put(new Pair<String, String>("btb", "net/minecraft/client/network/LanServerDetector$LanServer")); - mObInitMap.put(new Pair<String, String>("bpc", "net/minecraft/client/renderer/entity/RenderWither")); - mObInitMap.put(new Pair<String, String>("bdf", "net/minecraft/client/gui/GuiDisconnected")); - mObInitMap.put(new Pair<String, String>("bhe", "net/minecraft/client/model/ModelBoat")); - mObInitMap.put(new Pair<String, String>("bld", "net/minecraft/client/particle/EntityDiggingFX")); - mObInitMap.put(new Pair<String, String>("xz", "net/minecraft/entity/monster/EntityCreeper")); - mObInitMap.put(new Pair<String, String>("aa", "net/minecraft/command/ICommand")); - mObInitMap.put(new Pair<String, String>("alt", "net/minecraft/block/BlockLeaves")); - mObInitMap.put(new Pair<String, String>("adv", "net/minecraft/item/ItemSeedFood")); - mObInitMap.put(new Pair<String, String>("ahu", "net/minecraft/world/biome/BiomeGenBase")); - mObInitMap.put(new Pair<String, String>("btu", "net/minecraft/client/audio/ISoundEventAccessor")); - mObInitMap.put(new Pair<String, String>("bpv", "net/minecraft/client/renderer/texture/Stitcher")); - mObInitMap.put(new Pair<String, String>("bdy", "net/minecraft/client/gui/GuiSelectWorld$List")); - mObInitMap.put(new Pair<String, String>("bhx", "net/minecraft/client/model/ModelSheep1")); - mObInitMap.put(new Pair<String, String>("blw", "net/minecraft/client/renderer/EntityRenderer$3")); - mObInitMap.put(new Pair<String, String>("mq", "net/minecraft/server/management/PlayerManager")); - mObInitMap.put(new Pair<String, String>("ir", "net/minecraft/network/play/client/C01PacketChatMessage")); - mObInitMap.put(new Pair<String, String>("es", "net/minecraft/network/EnumConnectionState$1")); - mObInitMap.put(new Pair<String, String>("at", "net/minecraft/command/CommandGive")); - mObInitMap.put(new Pair<String, String>("xy", "net/minecraft/entity/monster/EntityCaveSpider")); - mObInitMap.put(new Pair<String, String>("aej", "net/minecraft/item/ItemLilyPad")); - mObInitMap.put(new Pair<String, String>("aak", "net/minecraft/inventory/SlotFurnace")); - mObInitMap.put(new Pair<String, String>("k", "net/minecraft/crash/CrashReportCategory")); - mObInitMap.put( - new Pair<String, String>( - "atq", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$NetherStalkRoom")); - mObInitMap.put(new Pair<String, String>("apr", "net/minecraft/block/BlockPistonMoving")); - mObInitMap.put(new Pair<String, String>("axp", "net/minecraft/world/gen/layer/GenLayer$2")); - mObInitMap.put(new Pair<String, String>("ban", "net/minecraft/client/renderer/GLAllocation")); - mObInitMap - .put(new Pair<String, String>("bem", "net/minecraft/client/gui/achievement/GuiStats$StatsGeneral")); - mObInitMap.put(new Pair<String, String>("bil", "net/minecraft/client/model/ModelZombieVillager")); - mObInitMap.put( - new Pair<String, String>( - "bmk", - "net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher")); - mObInitMap.put(new Pair<String, String>("bh", "net/minecraft/command/server/CommandSaveAll")); - mObInitMap.put(new Pair<String, String>("ym", "net/minecraft/entity/monster/EntitySlime")); - mObInitMap.put(new Pair<String, String>("un", "net/minecraft/entity/ai/EntityAIWatchClosest")); - mObInitMap.put(new Pair<String, String>("mp", "net/minecraft/world/WorldManager")); - mObInitMap.put(new Pair<String, String>("aqf", "net/minecraft/world/chunk/storage/ChunkLoader")); - mObInitMap.put(new Pair<String, String>("amg", "net/minecraft/block/BlockNetherrack")); - mObInitMap.put(new Pair<String, String>("aei", "net/minecraft/item/EnumAction")); - mObInitMap.put(new Pair<String, String>("aih", "net/minecraft/world/biome/BiomeGenForest$2")); - mObInitMap.put( - new Pair<String, String>( - "aue", - "net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces$Feature")); - mObInitMap.put(new Pair<String, String>("ayd", "net/minecraft/pathfinding/Path")); - mObInitMap.put(new Pair<String, String>("bbb", "net/minecraft/client/Minecraft$5")); - mObInitMap - .put(new Pair<String, String>("bfa", "net/minecraft/client/gui/inventory/GuiBeacon$CancelButton")); - mObInitMap.put(new Pair<String, String>("buh", "net/minecraft/client/stream/ChatController$ChatListener")); - mObInitMap.put(new Pair<String, String>("bqi", "net/minecraft/client/renderer/texture/TextureUtil")); - mObInitMap.put(new Pair<String, String>("za", "net/minecraft/entity/player/EntityPlayer$EnumStatus")); - mObInitMap.put(new Pair<String, String>("vb", "net/minecraft/entity/ai/EntityAILookIdle")); - mObInitMap.put(new Pair<String, String>("rc", "net/minecraft/inventory/IInvBasic")); - mObInitMap.put(new Pair<String, String>("nd", "net/minecraft/network/NetworkSystem$1")); - mObInitMap.put( - new Pair<String, String>( - "je", - "net/minecraft/network/play/client/C03PacketPlayer$C04PacketPlayerPosition")); - mObInitMap.put(new Pair<String, String>("ff", "net/minecraft/util/ChatComponentStyle$1")); - mObInitMap.put(new Pair<String, String>("aqy", "net/minecraft/world/gen/MapGenCavesHell")); - mObInitMap.put(new Pair<String, String>("amz", "net/minecraft/block/BlockRedstoneOre")); - mObInitMap.put(new Pair<String, String>("ayw", "net/minecraft/world/storage/WorldInfo$4")); - mObInitMap.put(new Pair<String, String>("zt", "net/minecraft/inventory/AnimalChest")); - mObInitMap.put(new Pair<String, String>("vu", "net/minecraft/entity/ai/EntityAITarget")); - mObInitMap.put(new Pair<String, String>("rv", "net/minecraft/potion/Potion")); - mObInitMap.put( - new Pair<String, String>("nw", "net/minecraft/server/management/PlayerProfileCache$Serializer")); - mObInitMap.put( - new Pair<String, String>("jx", "net/minecraft/network/login/client/C01PacketEncryptionResponse")); - mObInitMap.put( - new Pair<String, String>("fy", "net/minecraft/network/play/server/S2CPacketSpawnGlobalEntity")); - mObInitMap.put(new Pair<String, String>("bz", "net/minecraft/command/CommandTime")); - mObInitMap.put(new Pair<String, String>("ann", "net/minecraft/block/BlockSnow")); - mObInitMap.put(new Pair<String, String>("abq", "net/minecraft/item/ItemCoal")); - mObInitMap.put(new Pair<String, String>("afp", "net/minecraft/enchantment/EnchantmentArrowKnockback")); - mObInitMap.put(new Pair<String, String>("ajo", "net/minecraft/block/IGrowable")); - mObInitMap.put(new Pair<String, String>("brp", "net/minecraft/client/resources/I18n")); - mObInitMap.put(new Pair<String, String>("ayv", "net/minecraft/world/storage/WorldInfo$3")); - mObInitMap.put(new Pair<String, String>("bbt", "net/minecraft/util/Session$Type")); - mObInitMap.put(new Pair<String, String>("bfs", "net/minecraft/client/gui/GuiHopper")); - mObInitMap.put(new Pair<String, String>("bjr", "net/minecraft/client/network/OldServerPinger$1")); - mObInitMap.put(new Pair<String, String>("bnq", "net/minecraft/client/renderer/entity/RenderFallingBlock")); - mObInitMap.put(new Pair<String, String>("ok", "net/minecraft/server/management/UserListOpsEntry")); - mObInitMap.put(new Pair<String, String>("kl", "net/minecraft/init/Bootstrap")); - mObInitMap.put(new Pair<String, String>("gm", "net/minecraft/network/play/server/S2EPacketCloseWindow")); - mObInitMap.put(new Pair<String, String>("cn", "net/minecraft/util/RegistryNamespacedDefaultedByKey")); - mObInitMap.put(new Pair<String, String>("zs", "net/minecraft/inventory/Container")); - mObInitMap.put(new Pair<String, String>("ace", "net/minecraft/creativetab/CreativeTabs$8")); - mObInitMap.put(new Pair<String, String>("arl", "net/minecraft/world/gen/feature/WorldGenDesertWells")); - mObInitMap.put(new Pair<String, String>("anm", "net/minecraft/block/BlockSnowBlock")); - mObInitMap.put(new Pair<String, String>("avk", "net/minecraft/world/gen/structure/StructureComponent")); - mObInitMap.put(new Pair<String, String>("bch", "net/minecraft/client/gui/GuiListExtended")); - mObInitMap.put(new Pair<String, String>("bgg", "net/minecraft/client/resources/ResourcePackListEntry")); - mObInitMap.put(new Pair<String, String>("bkf", "net/minecraft/client/particle/EntityFlameFX")); - mObInitMap.put(new Pair<String, String>("boe", "net/minecraft/client/renderer/entity/RenderMagmaCube")); - mObInitMap.put(new Pair<String, String>("wh", "net/minecraft/entity/passive/EntityCow")); - mObInitMap.put(new Pair<String, String>("oj", "net/minecraft/server/management/UserListOps")); - mObInitMap.put(new Pair<String, String>("aoa", "net/minecraft/block/BlockPane")); - mObInitMap.put(new Pair<String, String>("akb", "net/minecraft/block/BlockCommandBlock")); - mObInitMap.put(new Pair<String, String>("acd", "net/minecraft/creativetab/CreativeTabs$7")); - mObInitMap.put(new Pair<String, String>("agc", "net/minecraft/enchantment/EnchantmentData")); - mObInitMap.put(new Pair<String, String>("bsc", "net/minecraft/client/resources/data/FontMetadataSection")); - mObInitMap.put(new Pair<String, String>("bod", "net/minecraft/client/renderer/entity/RenderSnowball")); - mObInitMap.put( - new Pair<String, String>("net/minecraft/realms/RealmsBridge", "net/minecraft/realms/RealmsBridge")); - mObInitMap.put(new Pair<String, String>("da", "net/minecraft/util/RegistrySimple")); - mObInitMap.put(new Pair<String, String>("ass", "net/minecraft/world/gen/FlatGeneratorInfo")); - mObInitMap.put(new Pair<String, String>("aot", "net/minecraft/tileentity/TileEntity$2")); - mObInitMap.put(new Pair<String, String>("aku", "net/minecraft/block/BlockEndPortalFrame")); - mObInitMap.put(new Pair<String, String>("acw", "net/minecraft/item/ItemFlintAndSteel")); - mObInitMap.put(new Pair<String, String>("awr", "net/minecraft/block/material/MaterialTransparent")); - mObInitMap.put(new Pair<String, String>("bsv", "net/minecraft/client/audio/ITickableSound")); - mObInitMap.put(new Pair<String, String>("bow", "net/minecraft/client/renderer/entity/RenderSquid")); - mObInitMap.put(new Pair<String, String>("bcz", "net/minecraft/client/gui/GuiCreateFlatWorld")); - mObInitMap.put(new Pair<String, String>("bkx", "net/minecraft/client/particle/EntitySpellParticleFX")); - mObInitMap.put(new Pair<String, String>("xo", "net/minecraft/entity/EntityMinecartCommandBlock$1")); - mObInitMap.put(new Pair<String, String>("pq", "net/minecraft/stats/StatFileWriter")); - mObInitMap.put(new Pair<String, String>("lr", "net/minecraft/server/gui/IUpdatePlayerListBox")); - mObInitMap.put(new Pair<String, String>("hs", "net/minecraft/network/play/server/S07PacketRespawn")); - mObInitMap.put(new Pair<String, String>("dt", "net/minecraft/nbt/NBTSizeTracker$1")); - mObInitMap.put(new Pair<String, String>("aph", "net/minecraft/tileentity/IHopper")); - mObInitMap.put(new Pair<String, String>("ali", "net/minecraft/block/BlockGravel")); - mObInitMap.put(new Pair<String, String>("adk", "net/minecraft/item/ItemMinecart$1")); - mObInitMap.put(new Pair<String, String>("ahj", "net/minecraft/world/WorldSettings")); - mObInitMap.put(new Pair<String, String>("btj", "net/minecraft/client/audio/SoundManager")); - mObInitMap.put(new Pair<String, String>("bpk", "net/minecraft/client/shader/Shader")); - mObInitMap.put(new Pair<String, String>("bdn", "net/minecraft/client/gui/GuiOptions$1")); - mObInitMap.put(new Pair<String, String>("bhm", "net/minecraft/client/model/ModelBiped")); - mObInitMap.put(new Pair<String, String>("bll", "net/minecraft/client/entity/EntityOtherPlayerMP")); - mObInitMap.put(new Pair<String, String>("mf", "net/minecraft/server/gui/StatsComponent")); - mObInitMap.put(new Pair<String, String>("ig", "net/minecraft/network/play/server/S05PacketSpawnPosition")); - mObInitMap.put(new Pair<String, String>("eh", "net/minecraft/network/NettyEncryptingDecoder")); - mObInitMap.put(new Pair<String, String>("ai", "net/minecraft/command/CommandClearInventory")); - mObInitMap.put(new Pair<String, String>("xn", "net/minecraft/entity/EntityMinecartCommandBlock")); - mObInitMap.put( - new Pair<String, String>("atf", "net/minecraft/world/gen/structure/StructureNetherBridgePieces")); - mObInitMap.put(new Pair<String, String>("apg", "net/minecraft/tileentity/TileEntityFurnace")); - mObInitMap.put(new Pair<String, String>("axe", "net/minecraft/world/gen/layer/GenLayerBiomeEdge")); - mObInitMap.put(new Pair<String, String>("bac", "net/minecraft/scoreboard/Scoreboard")); - mObInitMap.put(new Pair<String, String>("beb", "net/minecraft/client/gui/GuiSnooper$List")); - mObInitMap.put(new Pair<String, String>("bia", "net/minecraft/client/model/ModelSilverfish")); - mObInitMap.put(new Pair<String, String>("yb", "net/minecraft/entity/monster/IMob")); - mObInitMap.put(new Pair<String, String>("uc", "net/minecraft/entity/ai/EntityAIDoorInteract")); - mObInitMap.put(new Pair<String, String>("qd", "net/minecraft/util/LongHashMap")); - mObInitMap.put(new Pair<String, String>("s", "net/minecraft/util/ReportedException")); - mObInitMap.put( - new Pair<String, String>( - "net/minecraft/client/ClientBrandRetriever", - "net/minecraft/client/ClientBrandRetriever")); - mObInitMap.put(new Pair<String, String>("apz", "net/minecraft/world/chunk/storage/ExtendedBlockStorage")); - mObInitMap.put( - new Pair<String, String>("aty", "net/minecraft/world/gen/structure/MapGenScatteredFeature$Start")); - mObInitMap.put(new Pair<String, String>("axx", "net/minecraft/world/gen/layer/GenLayerSmooth")); - mObInitMap.put(new Pair<String, String>("bav", "net/minecraft/client/Minecraft$15")); - mObInitMap.put(new Pair<String, String>("beu", "net/minecraft/client/gui/GuiKeyBindingList$CategoryEntry")); - mObInitMap.put(new Pair<String, String>("yu", "net/minecraft/entity/INpc")); - mObInitMap.put(new Pair<String, String>("uv", "net/minecraft/entity/ai/EntityAIOcelotAttack")); - mObInitMap.put(new Pair<String, String>("qw", "net/minecraft/util/WeightedRandom$Item")); - mObInitMap.put(new Pair<String, String>("mx", "net/minecraft/server/management/ItemInWorldManager")); - mObInitMap.put(new Pair<String, String>("iy", "net/minecraft/network/play/client/C0DPacketCloseWindow")); - mObInitMap.put(new Pair<String, String>("ez", "net/minecraft/util/MessageDeserializer")); - mObInitMap.put(new Pair<String, String>("amo", "net/minecraft/block/BlockPackedIce")); - mObInitMap.put(new Pair<String, String>("aip", "net/minecraft/world/biome/BiomeGenPlains")); - mObInitMap.put( - new Pair<String, String>( - "aum", - "net/minecraft/world/gen/structure/StructureStrongholdPieces$ChestCorridor")); - mObInitMap.put(new Pair<String, String>("ayl", "net/minecraft/world/WorldSavedData")); - mObInitMap.put(new Pair<String, String>("bup", "net/minecraft/client/stream/TwitchStream$1")); - mObInitMap.put(new Pair<String, String>("bqq", "net/minecraft/client/resources/FallbackResourceManager")); - mObInitMap.put(new Pair<String, String>("bet", "net/minecraft/client/gui/GuiKeyBindingList$1")); - mObInitMap.put(new Pair<String, String>("bis", "net/minecraft/client/model/ModelBox")); - mObInitMap.put( - new Pair<String, String>("bmr", "net/minecraft/client/renderer/tileentity/TileEntitySignRenderer")); - mObInitMap.put(new Pair<String, String>("zi", "net/minecraft/entity/projectile/EntitySmallFireball")); - mObInitMap.put(new Pair<String, String>("vj", "net/minecraft/entity/ai/EntityAIFollowGolem")); - mObInitMap.put(new Pair<String, String>("rk", "net/minecraft/profiler/IPlayerUsage")); - mObInitMap.put(new Pair<String, String>("nl", "net/minecraft/server/network/NetHandlerHandshakeTCP")); - mObInitMap.put( - new Pair<String, String>( - "jm", - "net/minecraft/network/play/client/C10PacketCreativeInventoryAction")); - mObInitMap.put(new Pair<String, String>("fn", "net/minecraft/util/ChatStyle")); - mObInitMap.put(new Pair<String, String>("bo", "net/minecraft/command/CommandSetPlayerTimeout")); - mObInitMap.put(new Pair<String, String>("anc", "net/minecraft/block/BlockRedstoneTorch")); - mObInitMap.put(new Pair<String, String>("abf", "net/minecraft/item/ItemAxe")); - mObInitMap.put(new Pair<String, String>("afe", "net/minecraft/item/crafting/CraftingManager")); - mObInitMap.put(new Pair<String, String>("ajd", "net/minecraft/block/BlockBasePressurePlate")); - mObInitMap.put(new Pair<String, String>("bre", "net/minecraft/client/resources/ResourcePackRepository$2")); - mObInitMap.put(new Pair<String, String>("ayk", "net/minecraft/world/storage/MapData$MapCoord")); - mObInitMap.put(new Pair<String, String>("bfh", "net/minecraft/client/gui/GuiCommandBlock")); - mObInitMap.put(new Pair<String, String>("bjg", "net/minecraft/client/multiplayer/WorldClient$1")); - mObInitMap.put(new Pair<String, String>("bnf", "net/minecraft/client/renderer/entity/RenderCaveSpider")); - mObInitMap.put(new Pair<String, String>("ka", "net/minecraft/network/status/server/S00PacketServerInfo")); - mObInitMap.put(new Pair<String, String>("gb", "net/minecraft/network/play/server/S0CPacketSpawnPlayer")); - mObInitMap.put(new Pair<String, String>("cc", "net/minecraft/command/server/CommandWhitelist")); - mObInitMap.put(new Pair<String, String>("zh", "net/minecraft/entity/IProjectile")); - mObInitMap.put(new Pair<String, String>("aby", "net/minecraft/creativetab/CreativeTabs$2")); - mObInitMap.put(new Pair<String, String>("ara", "net/minecraft/world/gen/ChunkProviderEnd")); - mObInitMap.put(new Pair<String, String>("anb", "net/minecraft/block/BlockRedstoneLight")); - mObInitMap.put( - new Pair<String, String>("bjz", "net/minecraft/client/particle/EntityEnchantmentTableParticleFX")); - mObInitMap.put(new Pair<String, String>("bny", "net/minecraft/client/renderer/entity/RenderItem")); - mObInitMap.put(new Pair<String, String>("cv", "net/minecraft/dispenser/ILocation")); - mObInitMap.put(new Pair<String, String>("anu", "net/minecraft/block/BlockStem")); - mObInitMap.put(new Pair<String, String>("afw", "net/minecraft/enchantment/EnchantmentHelper$1")); - mObInitMap.put(new Pair<String, String>("ajv", "net/minecraft/block/BlockCarrot")); - mObInitMap.put( - new Pair<String, String>("avs", "net/minecraft/world/gen/structure/StructureVillagePieces$Field2")); - mObInitMap.put(new Pair<String, String>("azr", "net/minecraft/world/storage/ThreadedFileIOBase")); - mObInitMap.put(new Pair<String, String>("bcp", "net/minecraft/client/gui/GuiButtonRealmsProxy")); - mObInitMap.put(new Pair<String, String>("brw", "net/minecraft/client/resources/data/IMetadataSerializer")); - mObInitMap.put(new Pair<String, String>("bnx", "net/minecraft/client/renderer/tileentity/RenderItemFrame")); - mObInitMap.put(new Pair<String, String>("wp", "net/minecraft/entity/passive/EntitySheep")); - mObInitMap.put(new Pair<String, String>("sq", "net/minecraft/entity/item/EntityXPOrb")); - mObInitMap.put(new Pair<String, String>("or", "net/minecraft/server/management/UserListWhitelist")); - mObInitMap.put(new Pair<String, String>("ks", "net/minecraft/init/Bootstrap$2")); - mObInitMap.put(new Pair<String, String>("gt", "net/minecraft/network/play/server/S19PacketEntityStatus")); - mObInitMap.put(new Pair<String, String>("cu", "net/minecraft/dispenser/ILocatableSource")); - mObInitMap.put(new Pair<String, String>("ash", "net/minecraft/world/gen/feature/WorldGenReed")); - mObInitMap.put(new Pair<String, String>("aoi", "net/minecraft/block/BlockWall")); - mObInitMap.put(new Pair<String, String>("akj", "net/minecraft/block/BlockRedstoneDiode")); - mObInitMap.put(new Pair<String, String>("acl", "net/minecraft/item/ItemEmptyMap")); - mObInitMap.put(new Pair<String, String>("agk", "net/minecraft/enchantment/EnchantmentUntouching")); - mObInitMap.put(new Pair<String, String>("bsk", "net/minecraft/client/audio/PositionedSound")); - mObInitMap.put(new Pair<String, String>("bol", "net/minecraft/client/renderer/entity/RenderMooshroom")); - mObInitMap.put( - new Pair<String, String>("bgn", "net/minecraft/client/gui/stream/GuiIngestServers$ServerList")); - mObInitMap.put(new Pair<String, String>("bkm", "net/minecraft/client/particle/EntityFX")); - mObInitMap.put(new Pair<String, String>("xd", "net/minecraft/entity/boss/EntityWither$1")); - mObInitMap.put(new Pair<String, String>("te", "net/minecraft/entity/DataWatcher")); - mObInitMap.put(new Pair<String, String>("pf", "net/minecraft/stats/StatCrafting")); - mObInitMap.put(new Pair<String, String>("lg", "net/minecraft/server/ServerEula")); - mObInitMap.put( - new Pair<String, String>( - "hh", - "net/minecraft/network/play/server/S14PacketEntity$S17PacketEntityLookMove")); - mObInitMap.put(new Pair<String, String>("di", "net/minecraft/nbt/NBTTagCompound$1")); - mObInitMap.put(new Pair<String, String>("bdc", "net/minecraft/client/gui/GuiGameOver")); - mObInitMap.put(new Pair<String, String>("bla", "net/minecraft/client/particle/EntityAuraFX")); - mObInitMap.put(new Pair<String, String>("py", "net/minecraft/server/management/LowerStringMap")); - mObInitMap.put(new Pair<String, String>("lz", "net/minecraft/server/gui/MinecraftServerGui$1")); - mObInitMap.put(new Pair<String, String>("ads", "net/minecraft/item/ItemRedstone")); - mObInitMap.put(new Pair<String, String>("bps", "net/minecraft/client/renderer/ThreadDownloadImageData$1")); - mObInitMap.put( - new Pair<String, String>( - "asz", - "net/minecraft/world/gen/structure/StructureMineshaftPieces$Cross")); - mObInitMap.put(new Pair<String, String>("awy", "net/minecraft/world/gen/layer/GenLayerEdge")); - mObInitMap.put(new Pair<String, String>("bdv", "net/minecraft/client/gui/GuiRenameWorld")); - mObInitMap.put(new Pair<String, String>("bhu", "net/minecraft/client/model/ModelPig")); - mObInitMap.put(new Pair<String, String>("blt", "net/minecraft/client/renderer/EntityRenderer")); - mObInitMap.put(new Pair<String, String>("ep", "net/minecraft/network/EnumConnectionState$2")); - mObInitMap.put(new Pair<String, String>("aq", "net/minecraft/command/CommandDifficulty")); - mObInitMap.put(new Pair<String, String>("xv", "net/minecraft/entity/item/EntityMinecartTNT")); - mObInitMap.put(new Pair<String, String>("tw", "net/minecraft/entity/ai/EntityAIAvoidEntity")); - mObInitMap.put(new Pair<String, String>("px", "net/minecraft/util/HttpUtil$DownloadListener")); - mObInitMap.put(new Pair<String, String>("h", "net/minecraft/crash/CrashReport$6")); - mObInitMap.put( - new Pair<String, String>( - "atn", - "net/minecraft/world/gen/structure/StructureNetherBridgePieces$Corridor")); - mObInitMap.put(new Pair<String, String>("apo", "net/minecraft/tileentity/TileEntityEndPortal")); - mObInitMap.put(new Pair<String, String>("alp", "net/minecraft/block/BlockIce")); - mObInitMap.put(new Pair<String, String>("adr", "net/minecraft/item/ItemRecord")); - mObInitMap.put(new Pair<String, String>("ahq", "net/minecraft/world/Teleporter$PortalPosition")); - mObInitMap.put(new Pair<String, String>("axm", "net/minecraft/world/gen/layer/GenLayerIsland")); - mObInitMap.put(new Pair<String, String>("bak", "net/minecraft/client/gui/ChatLine")); - mObInitMap.put(new Pair<String, String>("bej", "net/minecraft/client/gui/achievement/GuiStats")); - mObInitMap.put(new Pair<String, String>("btq", "net/minecraft/client/audio/SoundHandler$1")); - mObInitMap.put(new Pair<String, String>("bpr", "net/minecraft/client/renderer/ThreadDownloadImageData")); - mObInitMap.put(new Pair<String, String>("yj", "net/minecraft/entity/SharedMonsterAttributes")); - } - } -} diff --git a/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java b/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java index 471476be60..477e1371e3 100644 --- a/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java +++ b/src/main/java/gtPlusPlus/preloader/Preloader_Logger.java @@ -9,15 +9,9 @@ public class Preloader_Logger { private Preloader_Logger() {} // Logging Functions - public static final Logger MODLOGGER = Preloader_Logger.makeLogger(); + public static final Logger MODLOGGER = LogManager.getLogger("GT++ ASM"); - // Generate GT++ Logger - public static Logger makeLogger() { - final Logger gtPlusPlusLogger = LogManager.getLogger("GT++ ASM"); - return gtPlusPlusLogger; - } - - public static final org.apache.logging.log4j.Logger getLogger() { + public static Logger getLogger() { return MODLOGGER; } diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java index 35684c267a..8cdc772c39 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java +++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java @@ -13,7 +13,6 @@ import gtPlusPlus.preloader.Preloader_Logger; public class AsmConfig { - public static boolean loaded; public static Configuration config; public static boolean enableOreDictPatch; @@ -30,16 +29,14 @@ public class AsmConfig { public static boolean disableAllLogging; public static boolean debugMode; - public AsmConfig(File file) { - if (!loaded) { - config = new Configuration(file); - syncConfig(true); - } + static { + config = new Configuration(new File("config/GTplusplus/asm.cfg")); + syncConfig(true); } public static void syncConfig(boolean load) { - ArrayList<String> propOrder = new ArrayList<String>(); - ArrayList<String> propOrderDebug = new ArrayList<String>(); + ArrayList<String> propOrder = new ArrayList<>(); + ArrayList<String> propOrderDebug = new ArrayList<>(); try { if (!config.isChild && load) { diff --git a/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java deleted file mode 100644 index d2a03b2522..0000000000 --- a/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java +++ /dev/null @@ -1,37 +0,0 @@ -package gtPlusPlus.preloader.asm; - -public class ClassesToTransform { - - public static final String LWJGL_KEYBOARD = "org.lwjgl.input.Keyboard"; - - public static final String MINECRAFT_GAMESETTINGS = "net.minecraft.client.settings.GameSettings"; - public static final String MINECRAFT_GAMESETTINGS_OBF = "bbj"; - - public static final String FORGE_CHUNK_MANAGER = "net.minecraftforge.common.ForgeChunkManager"; - public static final String FORGE_ORE_DICTIONARY = "net.minecraftforge.oredict.OreDictionary"; - - public static final String COFH_ORE_DICTIONARY_ARBITER = "cofh.core.util.oredict.OreDictionaryArbiter"; - - public static final String THAUMCRAFT_ITEM_WISP_ESSENCE = "thaumcraft.common.items.ItemWispEssence"; - public static final String THAUMCRAFT_CRAFTING_MANAGER = "thaumcraft.common.lib.crafting.ThaumcraftCraftingManager"; - public static final String THAUMCRAFT_TILE_ALCHEMY_FURNACE = "thaumcraft.common.tiles.TileAlchemyFurnace"; - public static final String THAUMICTINKERER_TILE_REPAIRER = "thaumic.tinkerer.common.block.tile.TileRepairer"; - - public static final String IC2_ITEM_ARMOUR_HAZMAT = "ic2.core.item.armor.ItemArmorHazmat"; - public static final String IC2_BLOCK_BASE_TILE_ENTITY = "ic2.core.block.BlockTileEntity"; - public static final String IC2_BLOCK_MACHINE1 = "ic2.core.block.machine.BlockMachine"; - public static final String IC2_BLOCK_MACHINE2 = "ic2.core.block.machine.BlockMachine2"; - public static final String IC2_BLOCK_MACHINE3 = "ic2.core.block.machine.BlockMachine3"; - public static final String IC2_BLOCK_KINETIC_GENERATOR = "ic2.core.block.kineticgenerator.block.BlockKineticGenerator"; - public static final String IC2_BLOCK_HEAT_GENERATOR = "ic2.core.block.heatgenerator.block.BlockHeatGenerator"; - public static final String IC2_BLOCK_GENERATOR = "ic2.core.block.generator.block.BlockGenerator"; - public static final String IC2_BLOCK_REACTOR_ACCESS_HATCH = "ic2.core.block.reactor.block.BlockReactorAccessHatch"; - public static final String IC2_BLOCK_REACTOR_CHAMBER = "ic2.core.block.reactor.block.BlockReactorChamber"; - public static final String IC2_BLOCK_REACTOR_FLUID_PORT = "ic2.core.block.reactor.block.BlockReactorFluidPort"; - public static final String IC2_BLOCK_REACTOR_REDSTONE_PORT = "ic2.core.block.reactor.block.BlockReactorRedstonePort"; - public static final String IC2_BLOCK_REACTOR_VESSEL = "ic2.core.block.reactor.block.BlockReactorVessel"; - public static final String IC2_BLOCK_PERSONAL = "ic2.core.block.personal.BlockPersonal.class"; - public static final String IC2_BLOCK_CHARGEPAD = "ic2.core.block.wiring.BlockChargepad.class"; - public static final String IC2_BLOCK_ELECTRIC = "ic2.core.block.wiring.BlockElectric.class"; - public static final String IC2_BLOCK_LUMINATOR = "ic2.core.block.wiring.BlockLuminator.class"; -} diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java index 41cba8d85b..b157424e6e 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java @@ -4,7 +4,7 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import java.io.File; -import java.util.Arrays; +import java.util.Collections; import net.minecraftforge.common.config.Configuration; @@ -14,9 +14,6 @@ import com.google.common.eventbus.Subscribe; import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.ModMetadata; -import cpw.mods.fml.common.event.FMLConstructionEvent; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.Preloader_Logger; @@ -30,15 +27,9 @@ public class Preloader_DummyContainer extends DummyModContainer { meta.name = CORE_Preloader.NAME; meta.version = CORE_Preloader.VERSION; meta.credits = "Roll Credits ..."; - meta.authorList = Arrays.asList("Alkalus"); - meta.description = ""; - meta.url = ""; - meta.updateUrl = ""; + meta.authorList = Collections.singletonList("Alkalus"); meta.screenshots = new String[0]; - meta.logoFile = ""; meta.parent = GTPlusPlus.ID; - // meta.dependencies = (List<ArtifactVersion>) CORE_Preloader.DEPENDENCIES; - Preloader_Logger.INFO("Initializing DummyModContainer"); } @Override @@ -48,27 +39,12 @@ public class Preloader_DummyContainer extends DummyModContainer { } @Subscribe - public void modConstruction(FMLConstructionEvent evt) { - Preloader_Logger.INFO("Constructing DummyModContainer"); - } - - @Subscribe public void preInit(FMLPreInitializationEvent event) { Preloader_Logger.INFO("Loading " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION); // Handle GT++ Config handleConfigFile(event); } - @Subscribe - public void init(FMLInitializationEvent evt) { - Preloader_Logger.INFO("Begin resource allocation for " + CORE_Preloader.MODID + " V" + CORE_Preloader.VERSION); - } - - @Subscribe - public void postInit(FMLPostInitializationEvent evt) { - Preloader_Logger.INFO("Finished loading."); - } - public static void handleConfigFile(final FMLPreInitializationEvent event) { final Configuration config = new Configuration( new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg")); @@ -91,29 +67,4 @@ public class Preloader_DummyContainer extends DummyModContainer { "Restores circuits and their recipes from Pre-5.09.28 times."); } - public static boolean getConfig() { - final Configuration config = new Configuration( - new File(gtPlusPlus.preloader.CORE_Preloader.MC_DIR, "config/GTplusplus/GTplusplus.cfg")); - if (config != null) { - config.load(); - // Circuits - CORE_Preloader.enableOldGTcircuits = config.getBoolean( - "enableOldGTcircuits", - GregTech.ID, - false, - "Restores circuits and their recipes from Pre-5.09.28 times."); - CORE_Preloader.enableWatchdogBGM = config.getInt( - "enableWatchdogBGM", - "features", - 0, - 0, - Short.MAX_VALUE, - "Set to a value greater than 0 to reduce the ticks taken to delay between BGM tracks. Acceptable Values are 1-32767, where 0 is disabled. Vanilla Uses 12,000 & 24,000. 200 is 10s."); - - Preloader_Logger.INFO("Loaded the configuration file."); - return true; - } - Preloader_Logger.INFO("Failed loading the configuration file."); - return false; - } } diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java index 16095d00e4..cdd25bb268 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java @@ -1,18 +1,12 @@ package gtPlusPlus.preloader.asm; import java.io.File; -import java.text.NumberFormat; -import java.util.Locale; import java.util.Map; -import net.minecraft.launchwrapper.Launch; - import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; -import gtPlusPlus.preloader.Preloader_Logger; import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; @SortingIndex(10097) @@ -21,12 +15,6 @@ import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; @IFMLLoadingPlugin.Name(CORE_Preloader.NAME) public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { - // -Dfml.coreMods.load=gtPlusPlus.preloader.asm.Preloader_FMLLoadingPlugin - - static { - Preloader_Logger.INFO("Initializing IFMLLoadingPlugin"); - } - @Override public String getAccessTransformerClass() { return null; @@ -34,61 +22,26 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { - // This will return the name of the class return new String[] { Preloader_Transformer_Handler.class.getName() }; } @Override public String getModContainerClass() { - // This is the name of our dummy container return Preloader_DummyContainer.class.getName(); } @Override public String getSetupClass() { - // return Preloader_SetupClass.class.getName(); return null; } @Override public void injectData(Map<String, Object> data) { - boolean isDeObf = (boolean) data.get("runtimeDeobfuscationEnabled"); + CORE_Preloader.DEV_ENVIRONMENT = !(boolean) data.get("runtimeDeobfuscationEnabled"); File mcDir = (File) data.get("mcLocation"); - // LaunchClassLoader classLoader = (LaunchClassLoader) data.get("classLoader"); - File coremodLocation = (File) data.get("coremodLocation"); - String deobfuscationFileName = (String) data.get("deobfuscationFileName"); if (mcDir != null && mcDir.exists()) { CORE_Preloader.setMinecraftDirectory(mcDir); - Preloader_Logger.INFO("Set McDir via Preloader_SetupClass"); - } - Preloader_Logger.INFO("runtimeDeobfuscationEnabled: " + isDeObf); - Preloader_Logger.INFO("deobfuscationFileName: " + deobfuscationFileName); - if (coremodLocation != null && coremodLocation.exists()) { - Preloader_Logger.INFO("coremodLocation: " + coremodLocation.getPath()); - } else { - Preloader_Logger.INFO("coremodLocation: null"); - Preloader_Logger.ERROR("Unable to determine CoreMod location"); } - CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode; - Preloader_Logger.INFO( - "Running on " + gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION - + " | Development Environment: " - + CORE_Preloader.DEV_ENVIRONMENT); - // Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer()); - Locale aDefaultLocale = Locale.getDefault(); - NumberFormat aFormat = NumberFormat.getInstance(); - Locale aDisplayLocale = ReflectionUtils - .getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale")); - Locale aFormatLocale = ReflectionUtils - .getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale")); - Preloader_Logger.INFO( - "Locale: " + aDefaultLocale - + " | Test: " - + aFormat.format(1000000000) - + " | Display: " - + aDisplayLocale - + " | Format: " - + aFormatLocale); } } diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java deleted file mode 100644 index 28f28e783b..0000000000 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java +++ /dev/null @@ -1,18 +0,0 @@ -package gtPlusPlus.preloader.asm; - -import java.util.Map; - -import cpw.mods.fml.relauncher.IFMLCallHook; -import gtPlusPlus.preloader.Preloader_Logger; - -public class Preloader_SetupClass implements IFMLCallHook { - - @Override - public Void call() throws Exception { - Preloader_Logger.INFO("Executing IFMLCallHook"); - return null; - } - - @Override - public void injectData(Map<String, Object> data) {} -} diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java index 29998800a0..84fecda974 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java @@ -29,7 +29,6 @@ import cpw.mods.fml.relauncher.FMLRelaunchLog; import gnu.trove.map.TMap; import gnu.trove.map.hash.THashMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; public class ClassTransformer_COFH_OreDictionaryArbiter { @@ -75,14 +74,7 @@ public class ClassTransformer_COFH_OreDictionaryArbiter { public void injectMethod(String aMethodName) { - boolean isObfuscated; - try { - isObfuscated = Class.forName("net.minecraft.item.ItemStack") != null ? false : true; - } catch (ClassNotFoundException e) { - isObfuscated = true; - } - String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") - : "net/minecraft/item/ItemStack"; + String aItemStack = "net/minecraft/item/ItemStack"; MethodVisitor mv; if (aMethodName.equals("registerOreDictionaryEntry")) { FMLRelaunchLog.log( @@ -158,9 +150,9 @@ public class ClassTransformer_COFH_OreDictionaryArbiter { .getField(OreDictionaryArbiter.class, "stackNames").get(null); } catch (Throwable t) { oreIDs = HashBiMap.create(); - oreStacks = new THashMap<Integer, ArrayList<ItemStack>>(); - stackIDs = new THashMap<ItemWrapper, ArrayList<Integer>>(); - stackNames = new THashMap<ItemWrapper, ArrayList<String>>(); + oreStacks = new THashMap<>(); + stackIDs = new THashMap<>(); + stackNames = new THashMap<>(); } } @@ -173,13 +165,13 @@ public class ClassTransformer_COFH_OreDictionaryArbiter { int arg1 = OreDictionary.getOreID(arg0); oreIDs.put(arg0, Integer.valueOf(arg1)); if (!oreStacks.containsKey(Integer.valueOf(arg1))) { - oreStacks.put(Integer.valueOf(arg1), new ArrayList<ItemStack>()); + oreStacks.put(Integer.valueOf(arg1), new ArrayList<>()); } ((ArrayList<ItemStack>) oreStacks.get(Integer.valueOf(arg1))).add(arg); ItemWrapper arg2 = ItemWrapper.fromItemStack(arg); if (!stackIDs.containsKey(arg2)) { - stackIDs.put(arg2, new ArrayList<Integer>()); - stackNames.put(arg2, new ArrayList<String>()); + stackIDs.put(arg2, new ArrayList<>()); + stackNames.put(arg2, new ArrayList<>()); } ((ArrayList<Integer>) stackIDs.get(arg2)).add(Integer.valueOf(arg1)); ((ArrayList<String>) stackNames.get(arg2)).add(arg0); diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java index cda4384f7d..9b6ec4bb25 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java @@ -50,7 +50,6 @@ import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.preloader.DevHelper; public class ClassTransformer_Forge_ChunkLoading { @@ -71,8 +70,8 @@ public class ClassTransformer_Forge_ChunkLoading { public ClassTransformer_Forge_ChunkLoading(byte[] basicClass, boolean obfuscated) { - ClassReader aTempReader = null; - ClassWriter aTempWriter = null; + ClassReader aTempReader; + ClassWriter aTempWriter; aTempReader = new ClassReader(basicClass); aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES); @@ -88,11 +87,9 @@ public class ClassTransformer_Forge_ChunkLoading { if (reader != null && writer != null && !doesMethodAlreadyExist) { - aChunkCoordIntPair = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/ChunkCoordIntPair") - : "net/minecraft/world/ChunkCoordIntPair"; - aWorld = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World"; - aEntity = obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") - : "net/minecraft/entity/Entity"; + aChunkCoordIntPair = "net/minecraft/world/ChunkCoordIntPair"; + aWorld = "net/minecraft/world/World"; + aEntity = "net/minecraft/entity/Entity"; injectMethod("forceChunk"); injectMethod("unforceChunk"); @@ -101,14 +98,6 @@ public class ClassTransformer_Forge_ChunkLoading { } } - public boolean isValidTransformer() { - return isValid; - } - - public ClassReader getReader() { - return reader; - } - public ClassWriter getWriter() { return writer; } @@ -119,993 +108,1115 @@ public class ClassTransformer_Forge_ChunkLoading { "[GT++ ASM] Chunkloading Patch", Level.INFO, "Injecting " + aMethodName + " into " + className + "."); - if (aMethodName.equals("forceChunk")) { + switch (aMethodName) { + case "forceChunk" -> { - mv = getWriter().visitMethod( - ACC_PUBLIC + ACC_STATIC, - "forceChunk", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - null, - null); - mv.visitCode(); - Label l0 = new Label(); - mv.visitLabel(l0); - mv.visitLineNumber(730, l0); - mv.visitVarInsn(ALOAD, 0); - Label l1 = new Label(); - mv.visitJumpInsn(IFNULL, l1); - mv.visitVarInsn(ALOAD, 1); - Label l2 = new Label(); - mv.visitJumpInsn(IFNONNULL, l2); - mv.visitLabel(l1); - mv.visitLineNumber(732, l1); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitInsn(RETURN); - mv.visitLabel(l2); - mv.visitLineNumber(734, l2); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$500", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Lnet/minecraftforge/common/ForgeChunkManager$Type;", - false); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager$Type", - "ENTITY", - "Lnet/minecraftforge/common/ForgeChunkManager$Type;"); - Label l3 = new Label(); - mv.visitJumpInsn(IF_ACMPNE, l3); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$600", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)L" + aEntity + ";", - false); - mv.visitJumpInsn(IFNONNULL, l3); - Label l4 = new Label(); - mv.visitLabel(l4); - mv.visitLineNumber(736, l4); - mv.visitTypeInsn(NEW, "java/lang/RuntimeException"); - mv.visitInsn(DUP); - mv.visitLdcInsn("Attempted to use an entity ticket to force a chunk, without an entity"); - mv.visitMethodInsn(INVOKESPECIAL, "java/lang/RuntimeException", "<init>", "(Ljava/lang/String;)V", false); - mv.visitInsn(ATHROW); - mv.visitLabel(l3); - mv.visitLineNumber(738, l3); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "isPlayerTicket", - "()Z", - false); - Label l5 = new Label(); - mv.visitJumpInsn(IFEQ, l5); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "playerTickets", - "Lcom/google/common/collect/SetMultimap;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/SetMultimap", - "containsValue", - "(Ljava/lang/Object;)Z", - true); - Label l6 = new Label(); - mv.visitJumpInsn(IFNE, l6); - Label l7 = new Label(); - mv.visitJumpInsn(GOTO, l7); - mv.visitLabel(l5); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$200", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", - false); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/Multimap", - "containsEntry", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - true); - mv.visitJumpInsn(IFNE, l6); - mv.visitLabel(l7); - mv.visitLineNumber(740, l7); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitLdcInsn( - "The mod %s attempted to force load a chunk with an invalid ticket. This is not permitted."); - mv.visitInsn(ICONST_1); - mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_0); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$200", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", - false); - mv.visitInsn(AASTORE); - mv.visitMethodInsn( - INVOKESTATIC, - "cpw/mods/fml/common/FMLLog", - "severe", - "(Ljava/lang/String;[Ljava/lang/Object;)V", - false); - Label l8 = new Label(); - mv.visitLabel(l8); - mv.visitLineNumber(741, l8); - mv.visitInsn(RETURN); - mv.visitLabel(l6); - mv.visitLineNumber(743, l6); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$700", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", - false); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "add", "(Ljava/lang/Object;)Z", false); - mv.visitInsn(POP); - Label l9 = new Label(); - mv.visitLabel(l9); - mv.visitLineNumber(744, l9); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESTATIC, - "gtPlusPlus/preloader/ChunkDebugger", - "storeLoadChunkToCache", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - false); - Label l10 = new Label(); - mv.visitLabel(l10); - mv.visitLineNumber(745, l10); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/MinecraftForge", - "EVENT_BUS", - "Lcpw/mods/fml/common/eventhandler/EventBus;"); - mv.visitTypeInsn(NEW, "net/minecraftforge/common/ForgeChunkManager$ForceChunkEvent"); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESPECIAL, - "net/minecraftforge/common/ForgeChunkManager$ForceChunkEvent", - "<init>", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - false); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "cpw/mods/fml/common/eventhandler/EventBus", - "post", - "(Lcpw/mods/fml/common/eventhandler/Event;)Z", - false); - mv.visitInsn(POP); - Label l11 = new Label(); - mv.visitLabel(l11); - mv.visitLineNumber(747, l11); - mv.visitMethodInsn( - INVOKESTATIC, - "com/google/common/collect/ImmutableSetMultimap", - "builder", - "()Lcom/google/common/collect/ImmutableSetMultimap$Builder;", - false); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "forcedChunks", - "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "com/google/common/collect/ImmutableSetMultimap$Builder", - "putAll", - "(Lcom/google/common/collect/Multimap;)Lcom/google/common/collect/ImmutableSetMultimap$Builder;", - false); - mv.visitVarInsn(ALOAD, 1); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "com/google/common/collect/ImmutableSetMultimap$Builder", - "put", - "(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableSetMultimap$Builder;", - false); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "com/google/common/collect/ImmutableSetMultimap$Builder", - "build", - "()Lcom/google/common/collect/ImmutableSetMultimap;", - false); - mv.visitVarInsn(ASTORE, 2); - Label l12 = new Label(); - mv.visitLabel(l12); - mv.visitLineNumber(748, l12); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "forcedChunks", - "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitVarInsn(ALOAD, 2); - mv.visitMethodInsn( - INVOKEINTERFACE, - "java/util/Map", - "put", - "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", - true); - mv.visitInsn(POP); - Label l13 = new Label(); - mv.visitLabel(l13); - mv.visitLineNumber(749, l13); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$800", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)I", - false); - Label l14 = new Label(); - mv.visitJumpInsn(IFLE, l14); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$700", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", - false); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "size", "()I", false); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$800", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)I", - false); - mv.visitJumpInsn(IF_ICMPLE, l14); - Label l15 = new Label(); - mv.visitLabel(l15); - mv.visitLineNumber(751, l15); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$700", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", - false); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "iterator", "()Ljava/util/Iterator;", false); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "" + aChunkCoordIntPair + ""); - mv.visitVarInsn(ASTORE, 3); - Label l16 = new Label(); - mv.visitLabel(l16); - mv.visitLineNumber(752, l16); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 3); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "unforceChunk", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - false); - mv.visitLabel(l14); - mv.visitLineNumber(754, l14); - mv.visitFrame(F_APPEND, 1, new Object[] { "com/google/common/collect/ImmutableSetMultimap" }, 0, null); - mv.visitInsn(RETURN); - Label l17 = new Label(); - mv.visitLabel(l17); - mv.visitLocalVariable("ticket", "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", null, l0, l17, 0); - mv.visitLocalVariable("chunk", "L" + aChunkCoordIntPair + ";", null, l0, l17, 1); - mv.visitLocalVariable( - "newMap", - "Lcom/google/common/collect/ImmutableSetMultimap;", - "Lcom/google/common/collect/ImmutableSetMultimap<L" + aChunkCoordIntPair - + ";Lnet/minecraftforge/common/ForgeChunkManager$Ticket;>;", - l12, - l17, - 2); - mv.visitLocalVariable("removed", "L" + aChunkCoordIntPair + ";", null, l16, l14, 3); - mv.visitMaxs(5, 4); - mv.visitEnd(); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "forceChunk", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + null, + null); + mv.visitCode(); + Label l0 = new Label(); + mv.visitLabel(l0); + mv.visitLineNumber(730, l0); + mv.visitVarInsn(ALOAD, 0); + Label l1 = new Label(); + mv.visitJumpInsn(IFNULL, l1); + mv.visitVarInsn(ALOAD, 1); + Label l2 = new Label(); + mv.visitJumpInsn(IFNONNULL, l2); + mv.visitLabel(l1); + mv.visitLineNumber(732, l1); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitInsn(RETURN); + mv.visitLabel(l2); + mv.visitLineNumber(734, l2); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$500", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Lnet/minecraftforge/common/ForgeChunkManager$Type;", + false); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager$Type", + "ENTITY", + "Lnet/minecraftforge/common/ForgeChunkManager$Type;"); + Label l3 = new Label(); + mv.visitJumpInsn(IF_ACMPNE, l3); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$600", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)L" + aEntity + ";", + false); + mv.visitJumpInsn(IFNONNULL, l3); + Label l4 = new Label(); + mv.visitLabel(l4); + mv.visitLineNumber(736, l4); + mv.visitTypeInsn(NEW, "java/lang/RuntimeException"); + mv.visitInsn(DUP); + mv.visitLdcInsn("Attempted to use an entity ticket to force a chunk, without an entity"); + mv.visitMethodInsn( + INVOKESPECIAL, + "java/lang/RuntimeException", + "<init>", + "(Ljava/lang/String;)V", + false); + mv.visitInsn(ATHROW); + mv.visitLabel(l3); + mv.visitLineNumber(738, l3); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "isPlayerTicket", + "()Z", + false); + Label l5 = new Label(); + mv.visitJumpInsn(IFEQ, l5); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "playerTickets", + "Lcom/google/common/collect/SetMultimap;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/SetMultimap", + "containsValue", + "(Ljava/lang/Object;)Z", + true); + Label l6 = new Label(); + mv.visitJumpInsn(IFNE, l6); + Label l7 = new Label(); + mv.visitJumpInsn(GOTO, l7); + mv.visitLabel(l5); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "tickets", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$200", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", + false); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/Multimap", + "containsEntry", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + true); + mv.visitJumpInsn(IFNE, l6); + mv.visitLabel(l7); + mv.visitLineNumber(740, l7); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitLdcInsn( + "The mod %s attempted to force load a chunk with an invalid ticket. This is not permitted."); + mv.visitInsn(ICONST_1); + mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_0); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$200", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", + false); + mv.visitInsn(AASTORE); + mv.visitMethodInsn( + INVOKESTATIC, + "cpw/mods/fml/common/FMLLog", + "severe", + "(Ljava/lang/String;[Ljava/lang/Object;)V", + false); + Label l8 = new Label(); + mv.visitLabel(l8); + mv.visitLineNumber(741, l8); + mv.visitInsn(RETURN); + mv.visitLabel(l6); + mv.visitLineNumber(743, l6); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$700", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", + false); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "add", "(Ljava/lang/Object;)Z", false); + mv.visitInsn(POP); + Label l9 = new Label(); + mv.visitLabel(l9); + mv.visitLineNumber(744, l9); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESTATIC, + "gtPlusPlus/preloader/ChunkDebugger", + "storeLoadChunkToCache", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + false); + Label l10 = new Label(); + mv.visitLabel(l10); + mv.visitLineNumber(745, l10); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/MinecraftForge", + "EVENT_BUS", + "Lcpw/mods/fml/common/eventhandler/EventBus;"); + mv.visitTypeInsn(NEW, "net/minecraftforge/common/ForgeChunkManager$ForceChunkEvent"); + mv.visitInsn(DUP); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESPECIAL, + "net/minecraftforge/common/ForgeChunkManager$ForceChunkEvent", + "<init>", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + false); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "cpw/mods/fml/common/eventhandler/EventBus", + "post", + "(Lcpw/mods/fml/common/eventhandler/Event;)Z", + false); + mv.visitInsn(POP); + Label l11 = new Label(); + mv.visitLabel(l11); + mv.visitLineNumber(747, l11); + mv.visitMethodInsn( + INVOKESTATIC, + "com/google/common/collect/ImmutableSetMultimap", + "builder", + "()Lcom/google/common/collect/ImmutableSetMultimap$Builder;", + false); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "com/google/common/collect/ImmutableSetMultimap$Builder", + "putAll", + "(Lcom/google/common/collect/Multimap;)Lcom/google/common/collect/ImmutableSetMultimap$Builder;", + false); + mv.visitVarInsn(ALOAD, 1); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "com/google/common/collect/ImmutableSetMultimap$Builder", + "put", + "(Ljava/lang/Object;Ljava/lang/Object;)Lcom/google/common/collect/ImmutableSetMultimap$Builder;", + false); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "com/google/common/collect/ImmutableSetMultimap$Builder", + "build", + "()Lcom/google/common/collect/ImmutableSetMultimap;", + false); + mv.visitVarInsn(ASTORE, 2); + Label l12 = new Label(); + mv.visitLabel(l12); + mv.visitLineNumber(748, l12); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitVarInsn(ALOAD, 2); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "put", + "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitInsn(POP); + Label l13 = new Label(); + mv.visitLabel(l13); + mv.visitLineNumber(749, l13); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$800", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)I", + false); + Label l14 = new Label(); + mv.visitJumpInsn(IFLE, l14); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$700", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", + false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "size", "()I", false); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$800", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)I", + false); + mv.visitJumpInsn(IF_ICMPLE, l14); + Label l15 = new Label(); + mv.visitLabel(l15); + mv.visitLineNumber(751, l15); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$700", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", + false); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "java/util/LinkedHashSet", + "iterator", + "()Ljava/util/Iterator;", + false); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;", true); + mv.visitTypeInsn(CHECKCAST, "" + aChunkCoordIntPair + ""); + mv.visitVarInsn(ASTORE, 3); + Label l16 = new Label(); + mv.visitLabel(l16); + mv.visitLineNumber(752, l16); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 3); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "unforceChunk", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + false); + mv.visitLabel(l14); + mv.visitLineNumber(754, l14); + mv.visitFrame(F_APPEND, 1, new Object[] { "com/google/common/collect/ImmutableSetMultimap" }, 0, null); + mv.visitInsn(RETURN); + Label l17 = new Label(); + mv.visitLabel(l17); + mv.visitLocalVariable( + "ticket", + "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", + null, + l0, + l17, + 0); + mv.visitLocalVariable("chunk", "L" + aChunkCoordIntPair + ";", null, l0, l17, 1); + mv.visitLocalVariable( + "newMap", + "Lcom/google/common/collect/ImmutableSetMultimap;", + "Lcom/google/common/collect/ImmutableSetMultimap<L" + aChunkCoordIntPair + + ";Lnet/minecraftforge/common/ForgeChunkManager$Ticket;>;", + l12, + l17, + 2); + mv.visitLocalVariable("removed", "L" + aChunkCoordIntPair + ";", null, l16, l14, 3); + mv.visitMaxs(5, 4); + mv.visitEnd(); - } else if (aMethodName.equals("unforceChunk")) { + } + case "unforceChunk" -> { - mv = getWriter().visitMethod( - ACC_PUBLIC + ACC_STATIC, - "unforceChunk", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - null, - null); - mv.visitCode(); - Label l0 = new Label(); - mv.visitLabel(l0); - mv.visitLineNumber(781, l0); - mv.visitVarInsn(ALOAD, 0); - Label l1 = new Label(); - mv.visitJumpInsn(IFNULL, l1); - mv.visitVarInsn(ALOAD, 1); - Label l2 = new Label(); - mv.visitJumpInsn(IFNONNULL, l2); - mv.visitLabel(l1); - mv.visitLineNumber(783, l1); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitInsn(RETURN); - mv.visitLabel(l2); - mv.visitLineNumber(785, l2); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$700", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", - false); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "remove", "(Ljava/lang/Object;)Z", false); - mv.visitInsn(POP); - Label l3 = new Label(); - mv.visitLabel(l3); - mv.visitLineNumber(786, l3); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESTATIC, - "gtPlusPlus/preloader/ChunkDebugger", - "removeLoadedChunkFromCache", - "(L" + aChunkCoordIntPair + ";)V", - false); - Label l4 = new Label(); - mv.visitLabel(l4); - mv.visitLineNumber(787, l4); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/MinecraftForge", - "EVENT_BUS", - "Lcpw/mods/fml/common/eventhandler/EventBus;"); - mv.visitTypeInsn(NEW, "net/minecraftforge/common/ForgeChunkManager$UnforceChunkEvent"); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESPECIAL, - "net/minecraftforge/common/ForgeChunkManager$UnforceChunkEvent", - "<init>", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - false); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "cpw/mods/fml/common/eventhandler/EventBus", - "post", - "(Lcpw/mods/fml/common/eventhandler/Event;)Z", - false); - mv.visitInsn(POP); - Label l5 = new Label(); - mv.visitLabel(l5); - mv.visitLineNumber(788, l5); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "forcedChunks", - "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitMethodInsn( - INVOKESTATIC, - "com/google/common/collect/LinkedHashMultimap", - "create", - "(Lcom/google/common/collect/Multimap;)Lcom/google/common/collect/LinkedHashMultimap;", - false); - mv.visitVarInsn(ASTORE, 2); - Label l6 = new Label(); - mv.visitLabel(l6); - mv.visitLineNumber(789, l6); - mv.visitVarInsn(ALOAD, 2); - mv.visitVarInsn(ALOAD, 1); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "com/google/common/collect/LinkedHashMultimap", - "remove", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - false); - mv.visitInsn(POP); - Label l7 = new Label(); - mv.visitLabel(l7); - mv.visitLineNumber(790, l7); - mv.visitVarInsn(ALOAD, 2); - mv.visitMethodInsn( - INVOKESTATIC, - "com/google/common/collect/ImmutableSetMultimap", - "copyOf", - "(Lcom/google/common/collect/Multimap;)Lcom/google/common/collect/ImmutableSetMultimap;", - false); - mv.visitVarInsn(ASTORE, 3); - Label l8 = new Label(); - mv.visitLabel(l8); - mv.visitLineNumber(791, l8); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "forcedChunks", - "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitVarInsn(ALOAD, 3); - mv.visitMethodInsn( - INVOKEINTERFACE, - "java/util/Map", - "put", - "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", - true); - mv.visitInsn(POP); - Label l9 = new Label(); - mv.visitLabel(l9); - mv.visitLineNumber(792, l9); - mv.visitInsn(RETURN); - Label l10 = new Label(); - mv.visitLabel(l10); - mv.visitLocalVariable("ticket", "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", null, l0, l10, 0); - mv.visitLocalVariable("chunk", "L" + aChunkCoordIntPair + ";", null, l0, l10, 1); - mv.visitLocalVariable( - "copy", - "Lcom/google/common/collect/LinkedHashMultimap;", - "Lcom/google/common/collect/LinkedHashMultimap<L" + aChunkCoordIntPair - + ";Lnet/minecraftforge/common/ForgeChunkManager$Ticket;>;", - l6, - l10, - 2); - mv.visitLocalVariable( - "newMap", - "Lcom/google/common/collect/ImmutableSetMultimap;", - "Lcom/google/common/collect/ImmutableSetMultimap<L" + aChunkCoordIntPair - + ";Lnet/minecraftforge/common/ForgeChunkManager$Ticket;>;", - l8, - l10, - 3); - mv.visitMaxs(5, 4); - mv.visitEnd(); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "unforceChunk", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + null, + null); + mv.visitCode(); + Label l0 = new Label(); + mv.visitLabel(l0); + mv.visitLineNumber(781, l0); + mv.visitVarInsn(ALOAD, 0); + Label l1 = new Label(); + mv.visitJumpInsn(IFNULL, l1); + mv.visitVarInsn(ALOAD, 1); + Label l2 = new Label(); + mv.visitJumpInsn(IFNONNULL, l2); + mv.visitLabel(l1); + mv.visitLineNumber(783, l1); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitInsn(RETURN); + mv.visitLabel(l2); + mv.visitLineNumber(785, l2); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$700", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", + false); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/util/LinkedHashSet", "remove", "(Ljava/lang/Object;)Z", false); + mv.visitInsn(POP); + Label l3 = new Label(); + mv.visitLabel(l3); + mv.visitLineNumber(786, l3); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESTATIC, + "gtPlusPlus/preloader/ChunkDebugger", + "removeLoadedChunkFromCache", + "(L" + aChunkCoordIntPair + ";)V", + false); + Label l4 = new Label(); + mv.visitLabel(l4); + mv.visitLineNumber(787, l4); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/MinecraftForge", + "EVENT_BUS", + "Lcpw/mods/fml/common/eventhandler/EventBus;"); + mv.visitTypeInsn(NEW, "net/minecraftforge/common/ForgeChunkManager$UnforceChunkEvent"); + mv.visitInsn(DUP); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESPECIAL, + "net/minecraftforge/common/ForgeChunkManager$UnforceChunkEvent", + "<init>", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + false); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "cpw/mods/fml/common/eventhandler/EventBus", + "post", + "(Lcpw/mods/fml/common/eventhandler/Event;)Z", + false); + mv.visitInsn(POP); + Label l5 = new Label(); + mv.visitLabel(l5); + mv.visitLineNumber(788, l5); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitMethodInsn( + INVOKESTATIC, + "com/google/common/collect/LinkedHashMultimap", + "create", + "(Lcom/google/common/collect/Multimap;)Lcom/google/common/collect/LinkedHashMultimap;", + false); + mv.visitVarInsn(ASTORE, 2); + Label l6 = new Label(); + mv.visitLabel(l6); + mv.visitLineNumber(789, l6); + mv.visitVarInsn(ALOAD, 2); + mv.visitVarInsn(ALOAD, 1); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "com/google/common/collect/LinkedHashMultimap", + "remove", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + false); + mv.visitInsn(POP); + Label l7 = new Label(); + mv.visitLabel(l7); + mv.visitLineNumber(790, l7); + mv.visitVarInsn(ALOAD, 2); + mv.visitMethodInsn( + INVOKESTATIC, + "com/google/common/collect/ImmutableSetMultimap", + "copyOf", + "(Lcom/google/common/collect/Multimap;)Lcom/google/common/collect/ImmutableSetMultimap;", + false); + mv.visitVarInsn(ASTORE, 3); + Label l8 = new Label(); + mv.visitLabel(l8); + mv.visitLineNumber(791, l8); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitVarInsn(ALOAD, 3); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "put", + "(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitInsn(POP); + Label l9 = new Label(); + mv.visitLabel(l9); + mv.visitLineNumber(792, l9); + mv.visitInsn(RETURN); + Label l10 = new Label(); + mv.visitLabel(l10); + mv.visitLocalVariable( + "ticket", + "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", + null, + l0, + l10, + 0); + mv.visitLocalVariable("chunk", "L" + aChunkCoordIntPair + ";", null, l0, l10, 1); + mv.visitLocalVariable( + "copy", + "Lcom/google/common/collect/LinkedHashMultimap;", + "Lcom/google/common/collect/LinkedHashMultimap<L" + aChunkCoordIntPair + + ";Lnet/minecraftforge/common/ForgeChunkManager$Ticket;>;", + l6, + l10, + 2); + mv.visitLocalVariable( + "newMap", + "Lcom/google/common/collect/ImmutableSetMultimap;", + "Lcom/google/common/collect/ImmutableSetMultimap<L" + aChunkCoordIntPair + + ";Lnet/minecraftforge/common/ForgeChunkManager$Ticket;>;", + l8, + l10, + 3); + mv.visitMaxs(5, 4); + mv.visitEnd(); - } else if (aMethodName.equals("requestTicket")) { + } + case "requestTicket" -> { - mv = getWriter().visitMethod( - ACC_PUBLIC + ACC_STATIC, - "requestTicket", - "(Ljava/lang/Object;L" + aWorld - + ";Lnet/minecraftforge/common/ForgeChunkManager$Type;)Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", - null, - null); - mv.visitCode(); - Label l0 = new Label(); - mv.visitLabel(l0); - mv.visitLineNumber(656, l0); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "getContainer", - "(Ljava/lang/Object;)Lcpw/mods/fml/common/ModContainer;", - false); - mv.visitVarInsn(ASTORE, 3); - Label l1 = new Label(); - mv.visitLabel(l1); - mv.visitLineNumber(657, l1); - mv.visitVarInsn(ALOAD, 3); - Label l2 = new Label(); - mv.visitJumpInsn(IFNONNULL, l2); - Label l3 = new Label(); - mv.visitLabel(l3); - mv.visitLineNumber(659, l3); - mv.visitFieldInsn(GETSTATIC, "org/apache/logging/log4j/Level", "ERROR", "Lorg/apache/logging/log4j/Level;"); - mv.visitLdcInsn("Failed to locate the container for mod instance %s (%s : %x)"); - mv.visitInsn(ICONST_3); - mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_0); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(AASTORE); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_1); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "getClass", "()Ljava/lang/Class;", false); - mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "getName", "()Ljava/lang/String;", false); - mv.visitInsn(AASTORE); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_2); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/System", "identityHashCode", "(Ljava/lang/Object;)I", false); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false); - mv.visitInsn(AASTORE); - mv.visitMethodInsn( - INVOKESTATIC, - "cpw/mods/fml/common/FMLLog", - "log", - "(Lorg/apache/logging/log4j/Level;Ljava/lang/String;[Ljava/lang/Object;)V", - false); - Label l4 = new Label(); - mv.visitLabel(l4); - mv.visitLineNumber(660, l4); - mv.visitInsn(ACONST_NULL); - mv.visitInsn(ARETURN); - mv.visitLabel(l2); - mv.visitLineNumber(662, l2); - mv.visitFrame(F_APPEND, 1, new Object[] { "cpw/mods/fml/common/ModContainer" }, 0, null); - mv.visitVarInsn(ALOAD, 3); - mv.visitMethodInsn( - INVOKEINTERFACE, - "cpw/mods/fml/common/ModContainer", - "getModId", - "()Ljava/lang/String;", - true); - mv.visitVarInsn(ASTORE, 4); - Label l5 = new Label(); - mv.visitLabel(l5); - mv.visitLineNumber(663, l5); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "callbacks", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 4); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "containsKey", "(Ljava/lang/Object;)Z", true); - Label l6 = new Label(); - mv.visitJumpInsn(IFNE, l6); - Label l7 = new Label(); - mv.visitLabel(l7); - mv.visitLineNumber(665, l7); - mv.visitLdcInsn("The mod %s has attempted to request a ticket without a listener in place"); - mv.visitInsn(ICONST_1); - mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_0); - mv.visitVarInsn(ALOAD, 4); - mv.visitInsn(AASTORE); - mv.visitMethodInsn( - INVOKESTATIC, - "cpw/mods/fml/common/FMLLog", - "severe", - "(Ljava/lang/String;[Ljava/lang/Object;)V", - false); - Label l8 = new Label(); - mv.visitLabel(l8); - mv.visitLineNumber(666, l8); - mv.visitTypeInsn(NEW, "java/lang/RuntimeException"); - mv.visitInsn(DUP); - mv.visitLdcInsn("Invalid ticket request"); - mv.visitMethodInsn(INVOKESPECIAL, "java/lang/RuntimeException", "<init>", "(Ljava/lang/String;)V", false); - mv.visitInsn(ATHROW); - mv.visitLabel(l6); - mv.visitLineNumber(669, l6); - mv.visitFrame(F_APPEND, 1, new Object[] { "java/lang/String" }, 0, null); - mv.visitVarInsn(ALOAD, 4); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "getMaxTicketLengthFor", - "(Ljava/lang/String;)I", - false); - mv.visitVarInsn(ISTORE, 5); - Label l9 = new Label(); - mv.visitLabel(l9); - mv.visitLineNumber(671, l9); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitVarInsn(ALOAD, 4); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/Multimap", - "get", - "(Ljava/lang/Object;)Ljava/util/Collection;", - true); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Collection", "size", "()I", true); - mv.visitVarInsn(ILOAD, 5); - Label l10 = new Label(); - mv.visitJumpInsn(IF_ICMPLT, l10); - Label l11 = new Label(); - mv.visitLabel(l11); - mv.visitLineNumber(673, l11); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "warnedMods", - "Ljava/util/Set;"); - mv.visitVarInsn(ALOAD, 4); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "contains", "(Ljava/lang/Object;)Z", true); - Label l12 = new Label(); - mv.visitJumpInsn(IFNE, l12); - Label l13 = new Label(); - mv.visitLabel(l13); - mv.visitLineNumber(675, l13); - mv.visitLdcInsn( - "The mod %s has attempted to allocate a chunkloading ticket beyond it's currently allocated maximum : %d"); - mv.visitInsn(ICONST_2); - mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_0); - mv.visitVarInsn(ALOAD, 4); - mv.visitInsn(AASTORE); - mv.visitInsn(DUP); - mv.visitInsn(ICONST_1); - mv.visitVarInsn(ILOAD, 5); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false); - mv.visitInsn(AASTORE); - mv.visitMethodInsn( - INVOKESTATIC, - "cpw/mods/fml/common/FMLLog", - "info", - "(Ljava/lang/String;[Ljava/lang/Object;)V", - false); - Label l14 = new Label(); - mv.visitLabel(l14); - mv.visitLineNumber(676, l14); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "warnedMods", - "Ljava/util/Set;"); - mv.visitVarInsn(ALOAD, 4); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "add", "(Ljava/lang/Object;)Z", true); - mv.visitInsn(POP); - mv.visitLabel(l12); - mv.visitLineNumber(678, l12); - mv.visitFrame(F_APPEND, 1, new Object[] { INTEGER }, 0, null); - mv.visitInsn(ACONST_NULL); - mv.visitInsn(ARETURN); - mv.visitLabel(l10); - mv.visitLineNumber(680, l10); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitTypeInsn(NEW, "net/minecraftforge/common/ForgeChunkManager$Ticket"); - mv.visitInsn(DUP); - mv.visitVarInsn(ALOAD, 4); - mv.visitVarInsn(ALOAD, 2); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESPECIAL, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "<init>", - "(Ljava/lang/String;Lnet/minecraftforge/common/ForgeChunkManager$Type;L" + aWorld + ";)V", - false); - mv.visitVarInsn(ASTORE, 6); - Label l15 = new Label(); - mv.visitLabel(l15); - mv.visitLineNumber(681, l15); - mv.visitVarInsn(ALOAD, 6); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESTATIC, - "gtPlusPlus/preloader/ChunkDebugger", - "storeTicketToCache", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aWorld + ";)V", - false); - Label l16 = new Label(); - mv.visitLabel(l16); - mv.visitLineNumber(682, l16); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitVarInsn(ALOAD, 4); - mv.visitVarInsn(ALOAD, 6); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/Multimap", - "put", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - true); - mv.visitInsn(POP); - Label l17 = new Label(); - mv.visitLabel(l17); - mv.visitLineNumber(683, l17); - mv.visitVarInsn(ALOAD, 6); - mv.visitInsn(ARETURN); - Label l18 = new Label(); - mv.visitLabel(l18); - mv.visitLocalVariable("mod", "Ljava/lang/Object;", null, l0, l18, 0); - mv.visitLocalVariable("world", "L" + aWorld + ";", null, l0, l18, 1); - mv.visitLocalVariable("type", "Lnet/minecraftforge/common/ForgeChunkManager$Type;", null, l0, l18, 2); - mv.visitLocalVariable("container", "Lcpw/mods/fml/common/ModContainer;", null, l1, l18, 3); - mv.visitLocalVariable("modId", "Ljava/lang/String;", null, l5, l18, 4); - mv.visitLocalVariable("allowedCount", "I", null, l9, l18, 5); - mv.visitLocalVariable("ticket", "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", null, l15, l18, 6); - mv.visitMaxs(6, 7); - mv.visitEnd(); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "requestTicket", + "(Ljava/lang/Object;L" + aWorld + + ";Lnet/minecraftforge/common/ForgeChunkManager$Type;)Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", + null, + null); + mv.visitCode(); + Label l0 = new Label(); + mv.visitLabel(l0); + mv.visitLineNumber(656, l0); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "getContainer", + "(Ljava/lang/Object;)Lcpw/mods/fml/common/ModContainer;", + false); + mv.visitVarInsn(ASTORE, 3); + Label l1 = new Label(); + mv.visitLabel(l1); + mv.visitLineNumber(657, l1); + mv.visitVarInsn(ALOAD, 3); + Label l2 = new Label(); + mv.visitJumpInsn(IFNONNULL, l2); + Label l3 = new Label(); + mv.visitLabel(l3); + mv.visitLineNumber(659, l3); + mv.visitFieldInsn( + GETSTATIC, + "org/apache/logging/log4j/Level", + "ERROR", + "Lorg/apache/logging/log4j/Level;"); + mv.visitLdcInsn("Failed to locate the container for mod instance %s (%s : %x)"); + mv.visitInsn(ICONST_3); + mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_0); + mv.visitVarInsn(ALOAD, 0); + mv.visitInsn(AASTORE); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_1); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "getClass", "()Ljava/lang/Class;", false); + mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Class", "getName", "()Ljava/lang/String;", false); + mv.visitInsn(AASTORE); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_2); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "java/lang/System", + "identityHashCode", + "(Ljava/lang/Object;)I", + false); + mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false); + mv.visitInsn(AASTORE); + mv.visitMethodInsn( + INVOKESTATIC, + "cpw/mods/fml/common/FMLLog", + "log", + "(Lorg/apache/logging/log4j/Level;Ljava/lang/String;[Ljava/lang/Object;)V", + false); + Label l4 = new Label(); + mv.visitLabel(l4); + mv.visitLineNumber(660, l4); + mv.visitInsn(ACONST_NULL); + mv.visitInsn(ARETURN); + mv.visitLabel(l2); + mv.visitLineNumber(662, l2); + mv.visitFrame(F_APPEND, 1, new Object[] { "cpw/mods/fml/common/ModContainer" }, 0, null); + mv.visitVarInsn(ALOAD, 3); + mv.visitMethodInsn( + INVOKEINTERFACE, + "cpw/mods/fml/common/ModContainer", + "getModId", + "()Ljava/lang/String;", + true); + mv.visitVarInsn(ASTORE, 4); + Label l5 = new Label(); + mv.visitLabel(l5); + mv.visitLineNumber(663, l5); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "callbacks", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 4); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "containsKey", "(Ljava/lang/Object;)Z", true); + Label l6 = new Label(); + mv.visitJumpInsn(IFNE, l6); + Label l7 = new Label(); + mv.visitLabel(l7); + mv.visitLineNumber(665, l7); + mv.visitLdcInsn("The mod %s has attempted to request a ticket without a listener in place"); + mv.visitInsn(ICONST_1); + mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_0); + mv.visitVarInsn(ALOAD, 4); + mv.visitInsn(AASTORE); + mv.visitMethodInsn( + INVOKESTATIC, + "cpw/mods/fml/common/FMLLog", + "severe", + "(Ljava/lang/String;[Ljava/lang/Object;)V", + false); + Label l8 = new Label(); + mv.visitLabel(l8); + mv.visitLineNumber(666, l8); + mv.visitTypeInsn(NEW, "java/lang/RuntimeException"); + mv.visitInsn(DUP); + mv.visitLdcInsn("Invalid ticket request"); + mv.visitMethodInsn( + INVOKESPECIAL, + "java/lang/RuntimeException", + "<init>", + "(Ljava/lang/String;)V", + false); + mv.visitInsn(ATHROW); + mv.visitLabel(l6); + mv.visitLineNumber(669, l6); + mv.visitFrame(F_APPEND, 1, new Object[] { "java/lang/String" }, 0, null); + mv.visitVarInsn(ALOAD, 4); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "getMaxTicketLengthFor", + "(Ljava/lang/String;)I", + false); + mv.visitVarInsn(ISTORE, 5); + Label l9 = new Label(); + mv.visitLabel(l9); + mv.visitLineNumber(671, l9); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "tickets", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitVarInsn(ALOAD, 4); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/Multimap", + "get", + "(Ljava/lang/Object;)Ljava/util/Collection;", + true); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Collection", "size", "()I", true); + mv.visitVarInsn(ILOAD, 5); + Label l10 = new Label(); + mv.visitJumpInsn(IF_ICMPLT, l10); + Label l11 = new Label(); + mv.visitLabel(l11); + mv.visitLineNumber(673, l11); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "warnedMods", + "Ljava/util/Set;"); + mv.visitVarInsn(ALOAD, 4); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "contains", "(Ljava/lang/Object;)Z", true); + Label l12 = new Label(); + mv.visitJumpInsn(IFNE, l12); + Label l13 = new Label(); + mv.visitLabel(l13); + mv.visitLineNumber(675, l13); + mv.visitLdcInsn( + "The mod %s has attempted to allocate a chunkloading ticket beyond it's currently allocated maximum : %d"); + mv.visitInsn(ICONST_2); + mv.visitTypeInsn(ANEWARRAY, "java/lang/Object"); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_0); + mv.visitVarInsn(ALOAD, 4); + mv.visitInsn(AASTORE); + mv.visitInsn(DUP); + mv.visitInsn(ICONST_1); + mv.visitVarInsn(ILOAD, 5); + mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false); + mv.visitInsn(AASTORE); + mv.visitMethodInsn( + INVOKESTATIC, + "cpw/mods/fml/common/FMLLog", + "info", + "(Ljava/lang/String;[Ljava/lang/Object;)V", + false); + Label l14 = new Label(); + mv.visitLabel(l14); + mv.visitLineNumber(676, l14); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "warnedMods", + "Ljava/util/Set;"); + mv.visitVarInsn(ALOAD, 4); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "add", "(Ljava/lang/Object;)Z", true); + mv.visitInsn(POP); + mv.visitLabel(l12); + mv.visitLineNumber(678, l12); + mv.visitFrame(F_APPEND, 1, new Object[] { INTEGER }, 0, null); + mv.visitInsn(ACONST_NULL); + mv.visitInsn(ARETURN); + mv.visitLabel(l10); + mv.visitLineNumber(680, l10); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitTypeInsn(NEW, "net/minecraftforge/common/ForgeChunkManager$Ticket"); + mv.visitInsn(DUP); + mv.visitVarInsn(ALOAD, 4); + mv.visitVarInsn(ALOAD, 2); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESPECIAL, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "<init>", + "(Ljava/lang/String;Lnet/minecraftforge/common/ForgeChunkManager$Type;L" + aWorld + ";)V", + false); + mv.visitVarInsn(ASTORE, 6); + Label l15 = new Label(); + mv.visitLabel(l15); + mv.visitLineNumber(681, l15); + mv.visitVarInsn(ALOAD, 6); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESTATIC, + "gtPlusPlus/preloader/ChunkDebugger", + "storeTicketToCache", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aWorld + ";)V", + false); + Label l16 = new Label(); + mv.visitLabel(l16); + mv.visitLineNumber(682, l16); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "tickets", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitVarInsn(ALOAD, 4); + mv.visitVarInsn(ALOAD, 6); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/Multimap", + "put", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + true); + mv.visitInsn(POP); + Label l17 = new Label(); + mv.visitLabel(l17); + mv.visitLineNumber(683, l17); + mv.visitVarInsn(ALOAD, 6); + mv.visitInsn(ARETURN); + Label l18 = new Label(); + mv.visitLabel(l18); + mv.visitLocalVariable("mod", "Ljava/lang/Object;", null, l0, l18, 0); + mv.visitLocalVariable("world", "L" + aWorld + ";", null, l0, l18, 1); + mv.visitLocalVariable("type", "Lnet/minecraftforge/common/ForgeChunkManager$Type;", null, l0, l18, 2); + mv.visitLocalVariable("container", "Lcpw/mods/fml/common/ModContainer;", null, l1, l18, 3); + mv.visitLocalVariable("modId", "Ljava/lang/String;", null, l5, l18, 4); + mv.visitLocalVariable("allowedCount", "I", null, l9, l18, 5); + mv.visitLocalVariable( + "ticket", + "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", + null, + l15, + l18, + 6); + mv.visitMaxs(6, 7); + mv.visitEnd(); - } else if (aMethodName.equals("releaseTicket")) { + } + case "releaseTicket" -> { - mv = getWriter().visitMethod( - ACC_PUBLIC + ACC_STATIC, - "releaseTicket", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V", - null, - null); - mv.visitCode(); - Label l0 = new Label(); - mv.visitLabel(l0); - mv.visitLineNumber(693, l0); - mv.visitVarInsn(ALOAD, 0); - Label l1 = new Label(); - mv.visitJumpInsn(IFNONNULL, l1); - Label l2 = new Label(); - mv.visitLabel(l2); - mv.visitLineNumber(695, l2); - mv.visitInsn(RETURN); - mv.visitLabel(l1); - mv.visitLineNumber(697, l1); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "isPlayerTicket", - "()Z", - false); - Label l3 = new Label(); - mv.visitJumpInsn(IFEQ, l3); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "playerTickets", - "Lcom/google/common/collect/SetMultimap;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/SetMultimap", - "containsValue", - "(Ljava/lang/Object;)Z", - true); - Label l4 = new Label(); - mv.visitJumpInsn(IFNE, l4); - Label l5 = new Label(); - mv.visitJumpInsn(GOTO, l5); - mv.visitLabel(l3); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$200", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", - false); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/Multimap", - "containsEntry", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - true); - mv.visitJumpInsn(IFNE, l4); - mv.visitLabel(l5); - mv.visitLineNumber(699, l5); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitInsn(RETURN); - mv.visitLabel(l4); - mv.visitLineNumber(701, l4); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$700", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", - false); - Label l6 = new Label(); - mv.visitJumpInsn(IFNULL, l6); - Label l7 = new Label(); - mv.visitLabel(l7); - mv.visitLineNumber(703, l7); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$700", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", - false); - mv.visitMethodInsn( - INVOKESTATIC, - "com/google/common/collect/ImmutableSet", - "copyOf", - "(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableSet;", - false); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "com/google/common/collect/ImmutableSet", - "iterator", - "()Ljava/util/Iterator;", - false); - mv.visitVarInsn(ASTORE, 2); - Label l8 = new Label(); - mv.visitJumpInsn(GOTO, l8); - Label l9 = new Label(); - mv.visitLabel(l9); - mv.visitFrame( - F_FULL, - 3, - new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket", TOP, "java/util/Iterator" }, - 0, - new Object[] {}); - mv.visitVarInsn(ALOAD, 2); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "" + aChunkCoordIntPair + ""); - mv.visitVarInsn(ASTORE, 1); - Label l10 = new Label(); - mv.visitLabel(l10); - mv.visitLineNumber(705, l10); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 1); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "unforceChunk", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - false); - mv.visitLabel(l8); - mv.visitLineNumber(703, l8); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 2); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "hasNext", "()Z", true); - mv.visitJumpInsn(IFNE, l9); - mv.visitLabel(l6); - mv.visitLineNumber(708, l6); - mv.visitFrame( - F_FULL, - 1, - new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket" }, - 0, - new Object[] {}); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "gtPlusPlus/preloader/ChunkDebugger", - "removeTicketFromCache", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V", - false); - Label l11 = new Label(); - mv.visitLabel(l11); - mv.visitLineNumber(709, l11); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "isPlayerTicket", - "()Z", - false); - Label l12 = new Label(); - mv.visitJumpInsn(IFEQ, l12); - Label l13 = new Label(); - mv.visitLabel(l13); - mv.visitLineNumber(711, l13); - mv.visitFieldInsn( - GETSTATIC, - "net/minecraftforge/common/ForgeChunkManager", - "playerTickets", - "Lcom/google/common/collect/SetMultimap;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$100", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", - false); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/SetMultimap", - "remove", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - true); - mv.visitInsn(POP); - Label l14 = new Label(); - mv.visitLabel(l14); - mv.visitLineNumber(712, l14); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitLdcInsn("Forge"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/Multimap", - "remove", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - true); - mv.visitInsn(POP); - Label l15 = new Label(); - mv.visitLabel(l15); - mv.visitLineNumber(713, l15); - Label l16 = new Label(); - mv.visitJumpInsn(GOTO, l16); - mv.visitLabel(l12); - mv.visitLineNumber(716, l12); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "world", - "L" + aWorld + ";"); - mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); - mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "net/minecraftforge/common/ForgeChunkManager$Ticket", - "access$200", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", - false); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEINTERFACE, - "com/google/common/collect/Multimap", - "remove", - "(Ljava/lang/Object;Ljava/lang/Object;)Z", - true); - mv.visitInsn(POP); - mv.visitLabel(l16); - mv.visitLineNumber(718, l16); - mv.visitFrame(F_SAME, 0, null, 0, null); - mv.visitInsn(RETURN); - Label l17 = new Label(); - mv.visitLabel(l17); - mv.visitLocalVariable("ticket", "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", null, l0, l17, 0); - mv.visitLocalVariable("chunk", "L" + aChunkCoordIntPair + ";", null, l10, l8, 1); - mv.visitMaxs(3, 3); - mv.visitEnd(); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "releaseTicket", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V", + null, + null); + mv.visitCode(); + Label l0 = new Label(); + mv.visitLabel(l0); + mv.visitLineNumber(693, l0); + mv.visitVarInsn(ALOAD, 0); + Label l1 = new Label(); + mv.visitJumpInsn(IFNONNULL, l1); + Label l2 = new Label(); + mv.visitLabel(l2); + mv.visitLineNumber(695, l2); + mv.visitInsn(RETURN); + mv.visitLabel(l1); + mv.visitLineNumber(697, l1); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "isPlayerTicket", + "()Z", + false); + Label l3 = new Label(); + mv.visitJumpInsn(IFEQ, l3); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "playerTickets", + "Lcom/google/common/collect/SetMultimap;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/SetMultimap", + "containsValue", + "(Ljava/lang/Object;)Z", + true); + Label l4 = new Label(); + mv.visitJumpInsn(IFNE, l4); + Label l5 = new Label(); + mv.visitJumpInsn(GOTO, l5); + mv.visitLabel(l3); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "tickets", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$200", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", + false); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/Multimap", + "containsEntry", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + true); + mv.visitJumpInsn(IFNE, l4); + mv.visitLabel(l5); + mv.visitLineNumber(699, l5); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitInsn(RETURN); + mv.visitLabel(l4); + mv.visitLineNumber(701, l4); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$700", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", + false); + Label l6 = new Label(); + mv.visitJumpInsn(IFNULL, l6); + Label l7 = new Label(); + mv.visitLabel(l7); + mv.visitLineNumber(703, l7); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$700", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/util/LinkedHashSet;", + false); + mv.visitMethodInsn( + INVOKESTATIC, + "com/google/common/collect/ImmutableSet", + "copyOf", + "(Ljava/util/Collection;)Lcom/google/common/collect/ImmutableSet;", + false); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "com/google/common/collect/ImmutableSet", + "iterator", + "()Ljava/util/Iterator;", + false); + mv.visitVarInsn(ASTORE, 2); + Label l8 = new Label(); + mv.visitJumpInsn(GOTO, l8); + Label l9 = new Label(); + mv.visitLabel(l9); + mv.visitFrame( + F_FULL, + 3, + new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket", TOP, + "java/util/Iterator" }, + 0, + new Object[] {}); + mv.visitVarInsn(ALOAD, 2); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;", true); + mv.visitTypeInsn(CHECKCAST, "" + aChunkCoordIntPair + ""); + mv.visitVarInsn(ASTORE, 1); + Label l10 = new Label(); + mv.visitLabel(l10); + mv.visitLineNumber(705, l10); + mv.visitVarInsn(ALOAD, 0); + mv.visitVarInsn(ALOAD, 1); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "unforceChunk", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + false); + mv.visitLabel(l8); + mv.visitLineNumber(703, l8); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitVarInsn(ALOAD, 2); + mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "hasNext", "()Z", true); + mv.visitJumpInsn(IFNE, l9); + mv.visitLabel(l6); + mv.visitLineNumber(708, l6); + mv.visitFrame( + F_FULL, + 1, + new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket" }, + 0, + new Object[] {}); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "gtPlusPlus/preloader/ChunkDebugger", + "removeTicketFromCache", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V", + false); + Label l11 = new Label(); + mv.visitLabel(l11); + mv.visitLineNumber(709, l11); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEVIRTUAL, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "isPlayerTicket", + "()Z", + false); + Label l12 = new Label(); + mv.visitJumpInsn(IFEQ, l12); + Label l13 = new Label(); + mv.visitLabel(l13); + mv.visitLineNumber(711, l13); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "playerTickets", + "Lcom/google/common/collect/SetMultimap;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$100", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", + false); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/SetMultimap", + "remove", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + true); + mv.visitInsn(POP); + Label l14 = new Label(); + mv.visitLabel(l14); + mv.visitLineNumber(712, l14); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "tickets", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitLdcInsn("Forge"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/Multimap", + "remove", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + true); + mv.visitInsn(POP); + Label l15 = new Label(); + mv.visitLabel(l15); + mv.visitLineNumber(713, l15); + Label l16 = new Label(); + mv.visitJumpInsn(GOTO, l16); + mv.visitLabel(l12); + mv.visitLineNumber(716, l12); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitFieldInsn( + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "tickets", + "Ljava/util/Map;"); + mv.visitVarInsn(ALOAD, 0); + mv.visitFieldInsn( + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); + mv.visitMethodInsn( + INVOKEINTERFACE, + "java/util/Map", + "get", + "(Ljava/lang/Object;)Ljava/lang/Object;", + true); + mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKESTATIC, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "access$200", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)Ljava/lang/String;", + false); + mv.visitVarInsn(ALOAD, 0); + mv.visitMethodInsn( + INVOKEINTERFACE, + "com/google/common/collect/Multimap", + "remove", + "(Ljava/lang/Object;Ljava/lang/Object;)Z", + true); + mv.visitInsn(POP); + mv.visitLabel(l16); + mv.visitLineNumber(718, l16); + mv.visitFrame(F_SAME, 0, null, 0, null); + mv.visitInsn(RETURN); + Label l17 = new Label(); + mv.visitLabel(l17); + mv.visitLocalVariable( + "ticket", + "Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", + null, + l0, + l17, + 0); + mv.visitLocalVariable("chunk", "L" + aChunkCoordIntPair + ";", null, l10, l8, 1); + mv.visitMaxs(3, 3); + mv.visitEnd(); + } } FMLRelaunchLog.log("[GT++ ASM] Chunkloading Patch", Level.INFO, "Method injection complete."); @@ -1125,8 +1236,7 @@ public class ClassTransformer_Forge_ChunkLoading { FMLRelaunchLog.log("[GT++ ASM] Chunkloading Patch", Level.INFO, "Found method " + name + ", Patching."); return null; } - MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions); - return methodVisitor; + return super.visitMethod(access, name, desc, signature, exceptions); } } } diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java index 3f6de75f9d..f478a0f1f1 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java @@ -32,7 +32,7 @@ public class ClassTransformer_LWJGL_Keyboard { private final ClassReader reader; private final ClassWriter writer; - private static final HashMap<String, String> mBadKeyCache = new HashMap<String, String>(); + private static final HashMap<String, String> mBadKeyCache = new HashMap<>(); /** * Gets a key's name @@ -74,8 +74,7 @@ public class ClassTransformer_LWJGL_Keyboard { GameSettings options = Minecraft.getMinecraft().gameSettings; KeyBinding[] akeybinding = Minecraft.getMinecraft().gameSettings.keyBindings; int i = akeybinding.length; - for (int j = 0; j < i; ++j) { - KeyBinding keybinding = akeybinding[j]; + for (KeyBinding keybinding : akeybinding) { if (keybinding != null && keybinding.getKeyCode() == aKey) { options.setOptionKeyBinding(keybinding, 0); FMLRelaunchLog.log( @@ -113,8 +112,7 @@ public class ClassTransformer_LWJGL_Keyboard { if (init()) { try { Object o = mKeyName.get(null); - if (o instanceof String[]) { - String[] y = (String[]) o; + if (o instanceof String[]y) { return y; } } catch (IllegalArgumentException | IllegalAccessException e) {} diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java index cb88d7bc07..98e1e7d473 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java @@ -41,7 +41,6 @@ import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.preloader.DevHelper; public class ClassTransformer_TC_ItemWispEssence { @@ -52,17 +51,16 @@ public class ClassTransformer_TC_ItemWispEssence { public ClassTransformer_TC_ItemWispEssence(byte[] basicClass, boolean obfuscated2) { ClassReader aTempReader = null; ClassWriter aTempWriter = null; - boolean obfuscated = obfuscated2; FMLRelaunchLog.log( "[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, - "Are we patching obfuscated methods? " + obfuscated); - String aGetColour = obfuscated ? DevHelper.getSRG("getColorFromItemStack") : "getColorFromItemStack"; + "Are we patching obfuscated methods? " + obfuscated2); + String aGetColour = obfuscated2 ? "func_82790_a" : "getColorFromItemStack"; aTempReader = new ClassReader(basicClass); aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES); aTempReader.accept(new AddAdapter(aTempWriter, new String[] { "getAspects", aGetColour }), 0); - injectMethod("getAspects", aTempWriter, obfuscated); - injectMethod(aGetColour, aTempWriter, obfuscated); + injectMethod("getAspects", aTempWriter, obfuscated2); + injectMethod(aGetColour, aTempWriter, obfuscated2); if (aTempReader != null && aTempWriter != null) { isValid = true; } else { diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java deleted file mode 100644 index 9f48313f8f..0000000000 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java +++ /dev/null @@ -1,769 +0,0 @@ -package gtPlusPlus.preloader.asm.transformers; - -import static gregtech.api.enums.Mods.TinkerConstruct; -import static org.objectweb.asm.Opcodes.AALOAD; -import static org.objectweb.asm.Opcodes.ACC_PUBLIC; -import static org.objectweb.asm.Opcodes.ALOAD; -import static org.objectweb.asm.Opcodes.ASM5; -import static org.objectweb.asm.Opcodes.BIPUSH; -import static org.objectweb.asm.Opcodes.D2F; -import static org.objectweb.asm.Opcodes.DADD; -import static org.objectweb.asm.Opcodes.DDIV; -import static org.objectweb.asm.Opcodes.DUP; -import static org.objectweb.asm.Opcodes.DUP_X1; -import static org.objectweb.asm.Opcodes.GETFIELD; -import static org.objectweb.asm.Opcodes.GETSTATIC; -import static org.objectweb.asm.Opcodes.GOTO; -import static org.objectweb.asm.Opcodes.I2D; -import static org.objectweb.asm.Opcodes.IADD; -import static org.objectweb.asm.Opcodes.ICONST_0; -import static org.objectweb.asm.Opcodes.ICONST_1; -import static org.objectweb.asm.Opcodes.IFEQ; -import static org.objectweb.asm.Opcodes.IFLE; -import static org.objectweb.asm.Opcodes.IFNE; -import static org.objectweb.asm.Opcodes.IFNONNULL; -import static org.objectweb.asm.Opcodes.IFNULL; -import static org.objectweb.asm.Opcodes.IF_ICMPEQ; -import static org.objectweb.asm.Opcodes.ILOAD; -import static org.objectweb.asm.Opcodes.INVOKESTATIC; -import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL; -import static org.objectweb.asm.Opcodes.IREM; -import static org.objectweb.asm.Opcodes.ISTORE; -import static org.objectweb.asm.Opcodes.ISUB; -import static org.objectweb.asm.Opcodes.POP; -import static org.objectweb.asm.Opcodes.PUTFIELD; -import static org.objectweb.asm.Opcodes.RETURN; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; - -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; - -import org.apache.logging.log4j.Level; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; - -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.Preloader_Logger; - -public class ClassTransformer_TT_ThaumicRestorer { - - private final boolean isValid; - private final ClassReader reader; - private final ClassWriter writer; - - private static boolean mInit = false; - - private static Class mTileRepairerClass; - private static Class mTTConfigHandler; - private static Class mTinkersConstructCompat; - private static Class mThaumicTinkerer; - private static Class mTCProxy; - - private static Method mIsTcTool; - private static Method mGetTcDamage; - private static Method mFixTcDamage; - private static Method mSparkle; - private static Method mDrawEssentia; - - private static Field mRepairTiconTools; - private static Field mTicksExisted; - private static Field mInventory; - private static Field mTookLastTick; - private static Field mDamageLastTick; - private static Field mProxyTC; - - private static boolean repairTConTools = false; - - // thaumic.tinkerer.common.block.tile.TileRepairer - - private static final boolean isTConstructTool(ItemStack aStack) { - return ReflectionUtils.invoke(null, mIsTcTool, new Object[] { aStack }); - } - - private static final int getDamage(ItemStack aStack) { - return (int) ReflectionUtils.invokeNonBool(null, mGetTcDamage, new Object[] { aStack }); - } - - private static final boolean fixDamage(ItemStack aStack, int aAmount) { - return ReflectionUtils.invoke(null, mFixTcDamage, new Object[] { aStack, aAmount }); - } - - private static final int drawEssentia(TileEntity aTile) { - return (int) ReflectionUtils.invokeNonBool(aTile, mDrawEssentia, new Object[] {}); - } - - private static final void sparkle(float a, float b, float c, int d) { - ReflectionUtils.invokeVoid(ReflectionUtils.getFieldValue(mProxyTC), mSparkle, new Object[] { a, b, c, d }); - } - - public static void updateEntity(TileEntity aTile) { - if (!mInit) { - // Set the classes we need - mTileRepairerClass = ReflectionUtils.getClass("thaumic.tinkerer.common.block.tile.TileRepairer"); - mTTConfigHandler = ReflectionUtils.getClass("thaumic.tinkerer.common.core.handler.ConfigHandler"); - mTinkersConstructCompat = ReflectionUtils.getClass("thaumic.tinkerer.common.compat.TinkersConstructCompat"); - mThaumicTinkerer = ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer"); - mTCProxy = ReflectionUtils.getClass("thaumcraft.common.CommonProxy"); - // Set the methods we need - mIsTcTool = ReflectionUtils - .getMethod(mTinkersConstructCompat, "isTConstructTool", new Class[] { ItemStack.class }); - mGetTcDamage = ReflectionUtils - .getMethod(mTinkersConstructCompat, "getDamage", new Class[] { ItemStack.class }); - mFixTcDamage = ReflectionUtils - .getMethod(mTinkersConstructCompat, "fixDamage", new Class[] { ItemStack.class, int.class }); - mSparkle = ReflectionUtils - .getMethod(mTCProxy, "sparkle", new Class[] { float.class, float.class, float.class, int.class }); - mDrawEssentia = ReflectionUtils.getMethod(mTileRepairerClass, "drawEssentia", new Class[] {}); - // Set the fields we need - mRepairTiconTools = ReflectionUtils.getField(mTTConfigHandler, "repairTConTools"); - mTicksExisted = ReflectionUtils.getField(mTileRepairerClass, "ticksExisted"); - mInventory = ReflectionUtils.getField(mTileRepairerClass, "inventorySlots"); - mTookLastTick = ReflectionUtils.getField(mTileRepairerClass, "tookLastTick"); - mDamageLastTick = ReflectionUtils.getField(mTileRepairerClass, "dmgLastTick"); - mProxyTC = ReflectionUtils.getField(mThaumicTinkerer, "tcProxy"); - repairTConTools = ReflectionUtils.getFieldValue(mRepairTiconTools); - mInit = true; - } - if (mInit) { - if (mTileRepairerClass.isInstance(aTile)) { - int ticksExisted = (int) ReflectionUtils.getFieldValue(mTicksExisted, aTile); - ItemStack[] inventorySlots = (ItemStack[]) ReflectionUtils.getFieldValue(mInventory, aTile); - boolean tookLastTick = (boolean) ReflectionUtils.getFieldValue(mTookLastTick, aTile); - int dmgLastTick = (int) ReflectionUtils.getFieldValue(mDamageLastTick, aTile); - ticksExisted++; - ReflectionUtils.setField(aTile, mTicksExisted, ticksExisted); - boolean aDidRun = false; - if (ticksExisted % 10 == 0) { - if (TinkerConstruct.isModLoaded() && repairTConTools - && inventorySlots[0] != null - && isTConstructTool(inventorySlots[0])) { - final int dmg = getDamage(inventorySlots[0]); - if (dmg > 0) { - final int essentia = drawEssentia(aTile); - fixDamage(inventorySlots[0], essentia); - aTile.markDirty(); - if (dmgLastTick != 0 && dmgLastTick != dmg) { - sparkle( - (float) (aTile.xCoord + 0.25 + Math.random() / 2.0), - (float) (aTile.yCoord + 1 + Math.random() / 2.0), - (float) (aTile.zCoord + 0.25 + Math.random() / 2.0), - 0); - tookLastTick = true; - } else { - tookLastTick = false; - } - } else { - tookLastTick = false; - } - dmgLastTick = ((inventorySlots[0] == null) ? 0 : getDamage(inventorySlots[0])); - aDidRun = true; - } - if (inventorySlots[0] != null && inventorySlots[0].getItemDamage() > 0 - && inventorySlots[0].getItem().isRepairable()) { - final int essentia2 = drawEssentia(aTile); - final int dmg2 = inventorySlots[0].getItemDamage(); - inventorySlots[0].setItemDamage(Math.max(0, dmg2 - essentia2)); - aTile.markDirty(); - if (dmgLastTick != 0 && dmgLastTick != dmg2) { - sparkle( - (float) (aTile.xCoord + 0.25 + Math.random() / 2.0), - (float) (aTile.yCoord + 1 + Math.random() / 2.0), - (float) (aTile.zCoord + 0.25 + Math.random() / 2.0), - 0); - tookLastTick = true; - } else { - tookLastTick = false; - } - } else { - tookLastTick = false; - } - dmgLastTick = ((inventorySlots[0] == null) ? 0 : inventorySlots[0].getItemDamage()); - aDidRun = true; - } - if (aDidRun) { - ReflectionUtils.setField(aTile, mInventory, inventorySlots); - ReflectionUtils.setField(aTile, mTookLastTick, tookLastTick); - ReflectionUtils.setField(aTile, mDamageLastTick, dmgLastTick); - } - } - } - } - - public ClassTransformer_TT_ThaumicRestorer(byte[] basicClass) { - ClassReader aTempReader = null; - ClassWriter aTempWriter = null; - boolean obfuscated = false; - aTempReader = new ClassReader(basicClass); - aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES); - AddAdapter aMethodStripper = new AddAdapter(aTempWriter); - aTempReader.accept(aMethodStripper, 0); - obfuscated = aMethodStripper.isObfuscated; - String aUpdateEntity = obfuscated ? "func_145845_h" : "updateEntity"; - Preloader_Logger.LOG( - "Thaumic Tinkerer RepairItem Patch", - Level.INFO, - "Patching: " + aUpdateEntity + ", Are we patching obfuscated methods? " + obfuscated); - // injectMethod(aUpdateEntity, aTempWriter, obfuscated); - injectMethodNew(aTempWriter, obfuscated); - if (aTempReader != null && aTempWriter != null) { - isValid = true; - } else { - isValid = false; - } - Preloader_Logger.LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Valid? " + isValid + "."); - reader = aTempReader; - writer = aTempWriter; - } - - public boolean isValidTransformer() { - return isValid; - } - - public ClassReader getReader() { - return reader; - } - - public ClassWriter getWriter() { - return writer; - } - - public boolean injectMethodNew(ClassWriter cw, boolean obfuscated) { - MethodVisitor mv; - boolean didInject = false; - String aUpdateEntity = obfuscated ? "func_145845_h" : "updateEntity"; - String aTileEntity = obfuscated ? "aor" : "net/minecraft/tileentity/TileEntity"; - Preloader_Logger.LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Injecting " + aUpdateEntity + "."); - mv = cw.visitMethod(ACC_PUBLIC, aUpdateEntity, "()V", null, null); - mv.visitCode(); - Label l0 = new Label(); - mv.visitLabel(l0); - mv.visitLineNumber(60, l0); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKESTATIC, - "gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer", - "updateEntity", - "(L" + aTileEntity + ";)V", - false); - Label l1 = new Label(); - mv.visitLabel(l1); - mv.visitLineNumber(61, l1); - mv.visitInsn(RETURN); - Label l2 = new Label(); - mv.visitLabel(l2); - mv.visitLocalVariable("this", "Lthaumic/tinkerer/common/block/tile/TileRepairer;", null, l0, l2, 0); - mv.visitMaxs(1, 1); - mv.visitEnd(); - didInject = true; - Preloader_Logger.LOG( - "Thaumic Tinkerer RepairItem Patch", - Level.INFO, - "Method injection complete. " + (obfuscated ? "Obfuscated" : "Non-Obfuscated")); - return didInject; - } - - public boolean injectMethod(String aMethodName, ClassWriter cw, boolean obfuscated) { - MethodVisitor mv; - boolean didInject = false; - Preloader_Logger.LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Injecting " + aMethodName + "."); - - String aItemStack = obfuscated ? "add" : "net/minecraft/item/ItemStack"; - String aItem = obfuscated ? "adb" : "net/minecraft/item/Item"; - String aGetItemDamage = obfuscated ? "func_150976_a" : "getItemDamage"; - String aGetItem = obfuscated ? "func_77973_b" : "getItem"; - String aSetItemDamage = obfuscated ? "func_77964_b" : "setItemDamage"; - String aIsRepairable = obfuscated ? "func_82789_a" : "isRepairable"; - - mv = cw.visitMethod(ACC_PUBLIC, aMethodName, "()V", null, null); - mv.visitCode(); - Label l0 = new Label(); - mv.visitLabel(l0); - mv.visitLineNumber(59, l0); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(DUP); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "ticksExisted", "I"); - mv.visitInsn(ICONST_1); - mv.visitInsn(IADD); - mv.visitInsn(DUP_X1); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "ticksExisted", "I"); - mv.visitIntInsn(BIPUSH, 10); - mv.visitInsn(IREM); - Label l1 = new Label(); - mv.visitJumpInsn(IFNE, l1); - Label l2 = new Label(); - mv.visitLabel(l2); - mv.visitLineNumber(60, l2); - mv.visitLdcInsn(TinkerConstruct.ID); - mv.visitMethodInsn(INVOKESTATIC, "cpw/mods/fml/common/Loader", "isModLoaded", "(Ljava/lang/String;)Z", false); - Label l3 = new Label(); - mv.visitJumpInsn(IFEQ, l3); - mv.visitFieldInsn(GETSTATIC, "thaumic/tinkerer/common/core/handler/ConfigHandler", "repairTConTools", "Z"); - mv.visitJumpInsn(IFEQ, l3); - Label l4 = new Label(); - mv.visitLabel(l4); - mv.visitLineNumber(61, l4); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitJumpInsn(IFNULL, l3); - Label l5 = new Label(); - mv.visitLabel(l5); - mv.visitLineNumber(62, l5); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn( - INVOKESTATIC, - "thaumic/tinkerer/common/compat/TinkersConstructCompat", - "isTConstructTool", - "(L" + aItemStack + ";)Z", - false); - mv.visitJumpInsn(IFEQ, l3); - Label l6 = new Label(); - mv.visitLabel(l6); - mv.visitLineNumber(63, l6); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn( - INVOKESTATIC, - "thaumic/tinkerer/common/compat/TinkersConstructCompat", - "getDamage", - "(L" + aItemStack + ";)I", - false); - mv.visitVarInsn(ISTORE, 1); - Label l7 = new Label(); - mv.visitLabel(l7); - mv.visitLineNumber(64, l7); - mv.visitVarInsn(ILOAD, 1); - Label l8 = new Label(); - mv.visitJumpInsn(IFLE, l8); - Label l9 = new Label(); - mv.visitLabel(l9); - mv.visitLineNumber(65, l9); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "drawEssentia", - "()I", - false); - mv.visitVarInsn(ISTORE, 2); - Label l10 = new Label(); - mv.visitLabel(l10); - mv.visitLineNumber(66, l10); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitVarInsn(ILOAD, 2); - mv.visitMethodInsn( - INVOKESTATIC, - "thaumic/tinkerer/common/compat/TinkersConstructCompat", - "fixDamage", - "(L" + aItemStack + ";I)Z", - false); - mv.visitInsn(POP); - Label l11 = new Label(); - mv.visitLabel(l11); - mv.visitLineNumber(67, l11); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKEVIRTUAL, "thaumic/tinkerer/common/block/tile/TileRepairer", "markDirty", "()V", false); - Label l12 = new Label(); - mv.visitLabel(l12); - mv.visitLineNumber(68, l12); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); - Label l13 = new Label(); - mv.visitJumpInsn(IFEQ, l13); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); - mv.visitVarInsn(ILOAD, 1); - mv.visitJumpInsn(IF_ICMPEQ, l13); - Label l14 = new Label(); - mv.visitLabel(l14); - mv.visitLineNumber(69, l14); - mv.visitFieldInsn( - GETSTATIC, - "thaumic/tinkerer/common/ThaumicTinkerer", - "tcProxy", - "Lthaumcraft/common/CommonProxy;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "xCoord", "I"); - mv.visitInsn(I2D); - mv.visitLdcInsn(new Double("0.25")); - mv.visitInsn(DADD); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "random", "()D", false); - mv.visitLdcInsn(new Double("2.0")); - mv.visitInsn(DDIV); - mv.visitInsn(DADD); - mv.visitInsn(D2F); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "yCoord", "I"); - mv.visitInsn(ICONST_1); - mv.visitInsn(IADD); - mv.visitInsn(I2D); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "random", "()D", false); - mv.visitLdcInsn(new Double("2.0")); - mv.visitInsn(DDIV); - mv.visitInsn(DADD); - mv.visitInsn(D2F); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "zCoord", "I"); - mv.visitInsn(I2D); - mv.visitLdcInsn(new Double("0.25")); - mv.visitInsn(DADD); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "random", "()D", false); - mv.visitLdcInsn(new Double("2.0")); - mv.visitInsn(DDIV); - mv.visitInsn(DADD); - mv.visitInsn(D2F); - mv.visitInsn(ICONST_0); - mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/common/CommonProxy", "sparkle", "(FFFI)V", false); - Label l15 = new Label(); - mv.visitLabel(l15); - mv.visitLineNumber(70, l15); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(ICONST_1); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); - Label l16 = new Label(); - mv.visitLabel(l16); - mv.visitLineNumber(71, l16); - Label l17 = new Label(); - mv.visitJumpInsn(GOTO, l17); - mv.visitLabel(l13); - mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] { Opcodes.INTEGER, Opcodes.INTEGER }, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(ICONST_0); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); - Label l18 = new Label(); - mv.visitLabel(l18); - mv.visitLineNumber(72, l18); - mv.visitJumpInsn(GOTO, l17); - mv.visitLabel(l8); - mv.visitFrame(Opcodes.F_CHOP, 1, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(ICONST_0); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); - mv.visitLabel(l17); - mv.visitLineNumber(73, l17); - mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - Label l19 = new Label(); - mv.visitJumpInsn(IFNONNULL, l19); - mv.visitInsn(ICONST_0); - Label l20 = new Label(); - mv.visitJumpInsn(GOTO, l20); - mv.visitLabel(l19); - mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" }); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn( - INVOKESTATIC, - "thaumic/tinkerer/common/compat/TinkersConstructCompat", - "getDamage", - "(L" + aItemStack + ";)I", - false); - mv.visitLabel(l20); - mv.visitFrame( - Opcodes.F_FULL, - 2, - new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER }, - 2, - new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER }); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); - Label l21 = new Label(); - mv.visitLabel(l21); - mv.visitLineNumber(74, l21); - mv.visitInsn(RETURN); - mv.visitLabel(l3); - mv.visitLineNumber(78, l3); - mv.visitFrame(Opcodes.F_CHOP, 1, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - Label l22 = new Label(); - mv.visitJumpInsn(IFNULL, l22); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false); - mv.visitJumpInsn(IFLE, l22); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItem + "", "()L" + aItem + ";", false); - mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItem + "", "" + aIsRepairable + "", "()Z", false); - mv.visitJumpInsn(IFEQ, l22); - Label l23 = new Label(); - mv.visitLabel(l23); - mv.visitLineNumber(79, l23); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn( - INVOKEVIRTUAL, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "drawEssentia", - "()I", - false); - mv.visitVarInsn(ISTORE, 1); - Label l24 = new Label(); - mv.visitLabel(l24); - mv.visitLineNumber(80, l24); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false); - mv.visitVarInsn(ISTORE, 2); - Label l25 = new Label(); - mv.visitLabel(l25); - mv.visitLineNumber(81, l25); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitInsn(ICONST_0); - mv.visitVarInsn(ILOAD, 2); - mv.visitVarInsn(ILOAD, 1); - mv.visitInsn(ISUB); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "max", "(II)I", false); - mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aSetItemDamage + "", "(I)V", false); - Label l26 = new Label(); - mv.visitLabel(l26); - mv.visitLineNumber(82, l26); - mv.visitVarInsn(ALOAD, 0); - mv.visitMethodInsn(INVOKEVIRTUAL, "thaumic/tinkerer/common/block/tile/TileRepairer", "markDirty", "()V", false); - Label l27 = new Label(); - mv.visitLabel(l27); - mv.visitLineNumber(84, l27); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); - Label l28 = new Label(); - mv.visitJumpInsn(IFEQ, l28); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); - mv.visitVarInsn(ILOAD, 2); - mv.visitJumpInsn(IF_ICMPEQ, l28); - Label l29 = new Label(); - mv.visitLabel(l29); - mv.visitLineNumber(85, l29); - mv.visitFieldInsn( - GETSTATIC, - "thaumic/tinkerer/common/ThaumicTinkerer", - "tcProxy", - "Lthaumcraft/common/CommonProxy;"); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "xCoord", "I"); - mv.visitInsn(I2D); - mv.visitLdcInsn(new Double("0.25")); - mv.visitInsn(DADD); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "random", "()D", false); - mv.visitLdcInsn(new Double("2.0")); - mv.visitInsn(DDIV); - mv.visitInsn(DADD); - mv.visitInsn(D2F); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "yCoord", "I"); - mv.visitInsn(ICONST_1); - mv.visitInsn(IADD); - mv.visitInsn(I2D); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "random", "()D", false); - mv.visitLdcInsn(new Double("2.0")); - mv.visitInsn(DDIV); - mv.visitInsn(DADD); - mv.visitInsn(D2F); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "zCoord", "I"); - mv.visitInsn(I2D); - mv.visitLdcInsn(new Double("0.25")); - mv.visitInsn(DADD); - mv.visitMethodInsn(INVOKESTATIC, "java/lang/Math", "random", "()D", false); - mv.visitLdcInsn(new Double("2.0")); - mv.visitInsn(DDIV); - mv.visitInsn(DADD); - mv.visitInsn(D2F); - mv.visitInsn(ICONST_0); - mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/common/CommonProxy", "sparkle", "(FFFI)V", false); - Label l30 = new Label(); - mv.visitLabel(l30); - mv.visitLineNumber(86, l30); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(ICONST_1); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); - Label l31 = new Label(); - mv.visitLabel(l31); - mv.visitLineNumber(87, l31); - Label l32 = new Label(); - mv.visitJumpInsn(GOTO, l32); - mv.visitLabel(l28); - mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] { Opcodes.INTEGER, Opcodes.INTEGER }, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(ICONST_0); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); - Label l33 = new Label(); - mv.visitLabel(l33); - mv.visitLineNumber(88, l33); - mv.visitJumpInsn(GOTO, l32); - mv.visitLabel(l22); - mv.visitFrame(Opcodes.F_CHOP, 2, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitInsn(ICONST_0); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); - mv.visitLabel(l32); - mv.visitLineNumber(90, l32); - mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null); - mv.visitVarInsn(ALOAD, 0); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - Label l34 = new Label(); - mv.visitJumpInsn(IFNONNULL, l34); - mv.visitInsn(ICONST_0); - Label l35 = new Label(); - mv.visitJumpInsn(GOTO, l35); - mv.visitLabel(l34); - mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" }); - mv.visitVarInsn(ALOAD, 0); - mv.visitFieldInsn( - GETFIELD, - "thaumic/tinkerer/common/block/tile/TileRepairer", - "inventorySlots", - "[L" + aItemStack + ";"); - mv.visitInsn(ICONST_0); - mv.visitInsn(AALOAD); - mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false); - mv.visitLabel(l35); - mv.visitFrame( - Opcodes.F_FULL, - 1, - new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" }, - 2, - new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER }); - mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); - mv.visitLabel(l1); - mv.visitLineNumber(92, l1); - mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null); - mv.visitInsn(RETURN); - Label l36 = new Label(); - mv.visitLabel(l36); - mv.visitLocalVariable("this", "Lthaumic/tinkerer/common/block/tile/TileRepairer;", null, l0, l36, 0); - mv.visitLocalVariable("dmg", "I", null, l7, l3, 1); - mv.visitLocalVariable("essentia", "I", null, l10, l18, 2); - mv.visitLocalVariable("essentia", "I", null, l24, l33, 1); - mv.visitLocalVariable("dmg", "I", null, l25, l33, 2); - mv.visitMaxs(9, 3); - mv.visitEnd(); - didInject = true; - Preloader_Logger.LOG( - "Thaumic Tinkerer RepairItem Patch", - Level.INFO, - "Method injection complete. " + (obfuscated ? "Obfuscated" : "Non-Obfuscated")); - return didInject; - } - - public class AddAdapter extends ClassVisitor { - - public AddAdapter(ClassVisitor cv) { - super(ASM5, cv); - this.cv = cv; - } - - private final String[] aMethodsToStrip = new String[] { "updateEntity", "func_145845_h" }; - public boolean isObfuscated = false; - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - - MethodVisitor methodVisitor; - boolean found = false; - - for (String s : aMethodsToStrip) { - if (name.equals(s)) { - found = true; - if (s.equals(aMethodsToStrip[1])) { - isObfuscated = true; - } - break; - } - } - if (!found) { - methodVisitor = super.visitMethod(access, name, desc, signature, exceptions); - } else { - methodVisitor = null; - } - - if (found) { - Preloader_Logger - .LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Found method " + name + ", removing."); - } - return methodVisitor; - } - } -} diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java deleted file mode 100644 index 7e5f4d3f6f..0000000000 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.preloader.asm.transformers; - -public class Preloader_ClassTransformer2 { - - /** - * - * So what I'd try is something like patch a new field into BaseMetaTileEntity to hold the ItemNBT, then patch - * GT_Block_Machines.breakBlock to store the ItemNBT into that field by calling setItemNBT, and then patch - * BaseMetaTileEntity.getDrops to retrieve that field instead of calling setItemNBT But there's probably a simpler - * solution if all you want to do is fix this for your super tanks rather than for all GT machines (which would only - * include saving the output count for chest buffers and item distributors...) - * - */ -} diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java index 405a804329..30a5bae031 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java @@ -1,117 +1,56 @@ package gtPlusPlus.preloader.asm.transformers; -import static gtPlusPlus.preloader.asm.ClassesToTransform.COFH_ORE_DICTIONARY_ARBITER; -import static gtPlusPlus.preloader.asm.ClassesToTransform.FORGE_CHUNK_MANAGER; -import static gtPlusPlus.preloader.asm.ClassesToTransform.FORGE_ORE_DICTIONARY; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_BASE_TILE_ENTITY; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_CHARGEPAD; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_ELECTRIC; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_GENERATOR; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_HEAT_GENERATOR; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_KINETIC_GENERATOR; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_LUMINATOR; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_MACHINE1; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_MACHINE2; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_MACHINE3; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_PERSONAL; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_ACCESS_HATCH; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_CHAMBER; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_FLUID_PORT; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_REDSTONE_PORT; -import static gtPlusPlus.preloader.asm.ClassesToTransform.IC2_BLOCK_REACTOR_VESSEL; -import static gtPlusPlus.preloader.asm.ClassesToTransform.LWJGL_KEYBOARD; -import static gtPlusPlus.preloader.asm.ClassesToTransform.MINECRAFT_GAMESETTINGS; -import static gtPlusPlus.preloader.asm.ClassesToTransform.MINECRAFT_GAMESETTINGS_OBF; -import static gtPlusPlus.preloader.asm.ClassesToTransform.THAUMCRAFT_ITEM_WISP_ESSENCE; - -import java.io.File; -import java.io.IOException; +import java.util.HashSet; +import java.util.Set; import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.Launch; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassWriter; -import cpw.mods.fml.relauncher.CoreModManager; -import cpw.mods.fml.relauncher.ReflectionHelper; -import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.DevHelper; +import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.Preloader_Logger; import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor; public class Preloader_Transformer_Handler implements IClassTransformer { - public static final AsmConfig mConfig; - public static final AutoMap<String> IC2_WRENCH_PATCH_CLASS_NAMES = new AutoMap<String>(); + private static final Set<String> IC2_WRENCH_PATCH_CLASS_NAMES = new HashSet<>(); + private static final String LWJGL_KEYBOARD = "org.lwjgl.input.Keyboard"; + private static final String MINECRAFT_GAMESETTINGS = "net.minecraft.client.settings.GameSettings"; + private static final String FORGE_CHUNK_MANAGER = "net.minecraftforge.common.ForgeChunkManager"; + private static final String FORGE_ORE_DICTIONARY = "net.minecraftforge.oredict.OreDictionary"; + private static final String COFH_ORE_DICTIONARY_ARBITER = "cofh.core.util.oredict.OreDictionaryArbiter"; + private static final String THAUMCRAFT_ITEM_WISP_ESSENCE = "thaumcraft.common.items.ItemWispEssence"; static { - mConfig = new AsmConfig(new File("config/GTplusplus/asm.cfg")); - Preloader_Logger.INFO("Config Location: " + AsmConfig.config.getConfigFile().getAbsolutePath()); - Preloader_Logger.INFO("Is DevHelper Valid? " + DevHelper.mIsValidHelper); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_BASE_TILE_ENTITY); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_MACHINE1); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_MACHINE2); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_MACHINE3); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_KINETIC_GENERATOR); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_HEAT_GENERATOR); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_GENERATOR); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_REACTOR_ACCESS_HATCH); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_REACTOR_CHAMBER); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_REACTOR_FLUID_PORT); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_REACTOR_REDSTONE_PORT); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_REACTOR_VESSEL); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_PERSONAL); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_CHARGEPAD); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_ELECTRIC); - IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_LUMINATOR); - } - - private static Boolean mObf = null; - - public boolean checkObfuscated() { - if (mObf != null) { - return mObf; - } - boolean obfuscated = false; - try { - obfuscated = !(boolean) ReflectionHelper.findField(CoreModManager.class, "deobfuscatedEnvironment") - .get(null); - } catch (IllegalArgumentException | IllegalAccessException e) { - e.printStackTrace(); - byte[] bs; - try { - bs = Launch.classLoader.getClassBytes("net.minecraft.world.World"); - if (bs != null) { - obfuscated = false; - } else { - obfuscated = true; - } - } catch (IOException e1) { - e1.printStackTrace(); - obfuscated = false; - } - } - mObf = obfuscated; - return obfuscated; + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.BlockTileEntity"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.machine.BlockMachine"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.machine.BlockMachine2"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.machine.BlockMachine3"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.kineticgenerator.block.BlockKineticGenerator"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.heatgenerator.block.BlockHeatGenerator"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.generator.block.BlockGenerator"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorAccessHatch"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorChamber"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorFluidPort"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorRedstonePort"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.reactor.block.BlockReactorVessel"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.personal.BlockPersonal.class"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.wiring.BlockChargepad.class"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.wiring.BlockElectric.class"); + IC2_WRENCH_PATCH_CLASS_NAMES.add("ic2.core.block.wiring.BlockLuminator.class"); } @Override public byte[] transform(String name, String transformedName, byte[] basicClass) { - // Is this environment obfuscated? (Extra checks just in case some weird stuff happens during the check) - final boolean obfuscated = checkObfuscated(); - // Fix LWJGL index array out of bounds on keybinding IDs - if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS_OBF) - || transformedName.equals(MINECRAFT_GAMESETTINGS)) && AsmConfig.enabledLwjglKeybindingFix - // Do not transform if using lwjgl3 + if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS)) + && AsmConfig.enabledLwjglKeybindingFix + // Do not transform if using lwjgl3 && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) { - boolean isClientSettingsClass = false; - if (!transformedName.equals("org.lwjgl.input.Keyboard")) { - isClientSettingsClass = true; - } + boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard"); Preloader_Logger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName); return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter().toByteArray(); } @@ -131,25 +70,24 @@ public class Preloader_Transformer_Handler implements IClassTransformer { } // Fix the OreDictionary COFH - if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) && (AsmConfig.enableCofhPatch || !obfuscated)) { + if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) + && (AsmConfig.enableCofhPatch || CORE_Preloader.DEV_ENVIRONMENT)) { Preloader_Logger.INFO("COFH", "Transforming " + transformedName); return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter().toByteArray(); } - // Fix IC2 Wrench Harvesting - for (String y : IC2_WRENCH_PATCH_CLASS_NAMES) { - if (transformedName.equals(y)) { - Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName); - return new ClassTransformer_IC2_GetHarvestTool(basicClass, obfuscated, transformedName).getWriter() - .toByteArray(); - } + if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) { + Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName); + return new ClassTransformer_IC2_GetHarvestTool(basicClass, !CORE_Preloader.DEV_ENVIRONMENT, transformedName) + .getWriter().toByteArray(); } // Fix Thaumcraft stuff // Patching ItemWispEssence to allow invalid item handling if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) { Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName); - return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated).getWriter().toByteArray(); + return new ClassTransformer_TC_ItemWispEssence(basicClass, !CORE_Preloader.DEV_ENVIRONMENT).getWriter() + .toByteArray(); } return basicClass; diff --git a/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java b/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java deleted file mode 100644 index 164d1b8b37..0000000000 --- a/src/main/java/gtPlusPlus/preloader/keyboard/BetterKeyboard.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (c) 2002-2008 LWJGL Project All rights reserved. Redistribution and use in source and binary forms, with or - * without modification, are permitted provided that the following conditions are met: * Redistributions of source code - * must retain the above copyright notice, this list of conditions and the following disclaimer. * Redistributions in - * binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. * Neither the name of 'LWJGL' nor the names of - * its contributors may be used to endorse or promote products derived from this software without specific prior written - * permission. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package gtPlusPlus.preloader.keyboard; - -import java.lang.reflect.Field; -import java.nio.ByteBuffer; -import java.util.HashMap; -import java.util.Map; - -import net.minecraft.client.resources.I18n; - -import org.apache.logging.log4j.Level; -import org.lwjgl.BufferUtils; -import org.lwjgl.input.Keyboard; - -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.asm.transformers.ClassTransformer_LWJGL_Keyboard; - -/** - * <br> - * A raw Keyboard interface. This can be used to poll the current state of the keys, or read all the keyboard presses / - * releases since the last read. - * - * @author cix_foo <cix_foo@users.sourceforge.net> - * @author elias_naur <elias_naur@users.sourceforge.net> - * @author Brian Matzon <brian@matzon.dk> - * @version $Revision$ $Id$ - */ -public class BetterKeyboard { - - public static final int KEYBOARD_SIZE = Short.MAX_VALUE; - - private static boolean init = false; - - public static void init() { - if (!init) { - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Trying to patch out LWJGL internal arrays with larger ones."); - Field aKeyNameSize = ReflectionUtils.getField(Keyboard.class, "keyName"); - Field aKeyMapSize = ReflectionUtils.getField(Keyboard.class, "keyMap"); - Field aKeyDownBuffer = ReflectionUtils.getField(Keyboard.class, "keyDownBuffer"); - String[] aOldKeyNameArray = ReflectionUtils.getFieldValue(aKeyNameSize); - if (aOldKeyNameArray != null && aOldKeyNameArray.length < Short.MAX_VALUE) { - String[] aNewKeyNameArray = new String[Short.MAX_VALUE]; - for (int i = 0; i < aOldKeyNameArray.length; i++) { - aNewKeyNameArray[i] = aOldKeyNameArray[i]; - } - try { - ReflectionUtils.setFinalFieldValue(Keyboard.class, aKeyNameSize.getName(), aNewKeyNameArray); - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Patched Field: " + aKeyNameSize.getName()); - } catch (Throwable t) { - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Failed Patching Field: " + aKeyDownBuffer.getName()); - } - } - Map<String, Integer> aOldKeyMapArray = ReflectionUtils.getFieldValue(aKeyMapSize); - if (aOldKeyNameArray != null && aOldKeyMapArray.size() < Short.MAX_VALUE) { - Map<String, Integer> aNewKeyMapArray = new HashMap<String, Integer>(Short.MAX_VALUE); - aNewKeyMapArray.putAll(aOldKeyMapArray); - try { - ReflectionUtils.setFinalFieldValue(Keyboard.class, aKeyMapSize.getName(), aNewKeyMapArray); - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Patched Field: " + aKeyMapSize.getName()); - } catch (Throwable t) { - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Failed Patching Field: " + aKeyDownBuffer.getName()); - } - } - ByteBuffer aOldByteBuffer = ReflectionUtils.getFieldValue(aKeyDownBuffer); - if (aOldByteBuffer != null && aOldByteBuffer.capacity() == Keyboard.KEYBOARD_SIZE) { - ByteBuffer aNewByteBuffer = BufferUtils.createByteBuffer(Short.MAX_VALUE); - try { - ReflectionUtils.setFinalFieldValue(Keyboard.class, aKeyDownBuffer.getName(), aNewByteBuffer); - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Patched Field: " + aKeyDownBuffer.getName()); - } catch (Throwable t) { - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", - Level.INFO, - "Failed Patching Field: " + aKeyDownBuffer.getName()); - } - } - init = true; - } - } - - /** - * Gets a key's name - * - * @param key The key - * @return a String with the key's human readable name in it or null if the key is unnamed - */ - public static synchronized String getKeyName(int key) { - return ClassTransformer_LWJGL_Keyboard.getKeyName(key); - } - - /** - * Represents a key or mouse button as a string. Args: key - */ - public static String getKeyDisplayString(int aKeyValue) { - return aKeyValue < 0 ? I18n.format("key.mouseButton", new Object[] { Integer.valueOf(aKeyValue + 101) }) - : getKeyName(aKeyValue); - } -} diff --git a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java index aae5f988f3..16d99494d3 100644 --- a/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java +++ b/src/main/java/gtPlusPlus/recipes/RecipeRemovals.java @@ -60,22 +60,22 @@ public class RecipeRemovals { int aCutoff; String aType; switch (aMeta) { - case 170: + case 170 -> { aCutoff = CUT; aType = "Small "; - break; - case 172: + } + case 172 -> { aCutoff = 2 * CUT; aType = ""; - break; - case 174: + } + case 174 -> { aCutoff = 3 * CUT; aType = "Large "; - break; - default: // 176 + } + default -> { // 176 aCutoff = 4 * CUT; aType = "Huge "; - break; + } } Materials aMainMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(aI); Materials aSecondaryMaterial = GT_MetaGenerated_Tool.getSecondaryMaterial(aI); diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java index e1b1d53b45..c3c2f0b6cc 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/LoaderOfTheCrops.java @@ -19,7 +19,7 @@ import ic2.api.crops.Crops; */ public class LoaderOfTheCrops { - private static List<Boolean> mHasCropObj = new ArrayList<Boolean>(); + private static List<Boolean> mHasCropObj = new ArrayList<>(); private CropCard mCropObj; private ItemStack mBaseSeed; private static List<LoaderOfTheCrops> mCropList = cropLoader(); @@ -46,35 +46,35 @@ public class LoaderOfTheCrops { } public static List<LoaderOfTheCrops> cropLoader() { - List<LoaderOfTheCrops> p = new ArrayList<LoaderOfTheCrops>(); + List<LoaderOfTheCrops> p = new ArrayList<>(); p.add(new LoaderOfTheCrops(new Crop_Hemp(), new ItemStack(Item.getItemById(111), 3))); return p; } - private static final List<CropCard> cropObjs() { - List<CropCard> p = new ArrayList<CropCard>(); + private static List<CropCard> cropObjs() { + List<CropCard> p = new ArrayList<>(); - for (int i = 0; i < mCropList.size(); ++i) { - p.add(cropUnpackerCC((LoaderOfTheCrops) mCropList.get(i))); + for (LoaderOfTheCrops loaderOfTheCrops : mCropList) { + p.add(cropUnpackerCC((LoaderOfTheCrops) loaderOfTheCrops)); } return p; } - private static final List<ItemStack> setBaseSeed() { - List<ItemStack> p = new ArrayList<ItemStack>(); + private static List<ItemStack> setBaseSeed() { + List<ItemStack> p = new ArrayList<>(); - for (int i = 0; i < mCropList.size(); ++i) { - p.add(cropUnpackerCG((LoaderOfTheCrops) mCropList.get(i))); + for (LoaderOfTheCrops loaderOfTheCrops : mCropList) { + p.add(cropUnpackerCG((LoaderOfTheCrops) loaderOfTheCrops)); } return p; } - private static final List<String> setnames() { - List<String> s = new ArrayList<String>(); + private static List<String> setnames() { + List<String> s = new ArrayList<>(); for (int i = 0; i < mCropList.size(); ++i) { s.add(((CropCard) cropObjs().get(i)).name()); @@ -98,7 +98,7 @@ public class LoaderOfTheCrops { } public static void registerBaseSeed() { - List<ItemStack> baseseed = new ArrayList<ItemStack>(setBaseSeed()); + List<ItemStack> baseseed = new ArrayList<>(setBaseSeed()); for (int i = 0; i < mCropList.size(); ++i) { if (baseseed.get(i) != null && cropObjs().get(i) != null) { diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java index 60d4601132..c794c40878 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseAestheticCrop.java @@ -12,20 +12,14 @@ public abstract class BaseAestheticCrop extends BaseHarvestableCrop { @Override public int stat(int n) { - switch (n) { - case 0: - return 0; - case 1: - return 0; - case 2: - return 0; - case 3: - return 4; - case 4: - return 0; - default: - return 0; - } + return switch (n) { + case 0 -> 0; + case 1 -> 0; + case 2 -> 0; + case 3 -> 4; + case 4 -> 0; + default -> 0; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java index dec6413a82..22fce2ae5a 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseCrop.java @@ -56,7 +56,7 @@ public abstract class BaseCrop extends CropCard implements ICropCardInfo { @Override public List<String> getCropInformation() { - List<String> ret = new ArrayList<String>(); + List<String> ret = new ArrayList<>(); ret.add(Arrays.toString(this.attributes())); return ret; } diff --git a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java index f5daa20fdf..80325edff0 100644 --- a/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java +++ b/src/main/java/gtPlusPlus/xmod/bartcrops/abstracts/BaseHarvestableCrop.java @@ -12,20 +12,14 @@ public abstract class BaseHarvestableCrop extends BaseCrop { @Override public int stat(int n) { - switch (n) { - case 0: - return 0; - case 1: - return 4; - case 2: - return 0; - case 3: - return 4; - case 4: - return 0; - default: - return 0; - } + return switch (n) { + case 0 -> 0; + case 1 -> 4; + case 2 -> 0; + case 3 -> 4; + case 4 -> 0; + default -> 0; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java index 3fb8229b7f..3e7a6a0105 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LeavesBase.java @@ -40,7 +40,7 @@ public class LeavesBase extends BlockLeaves { Blocks.fire.setFireInfo(this, 80, 150); } - private final void setVanillaVariable(Object toSet, Object value) { + private void setVanillaVariable(Object toSet, Object value) { toSet = value; } @@ -52,9 +52,9 @@ public class LeavesBase extends BlockLeaves { @Override // Drops when Leaf is broken protected void func_150124_c(World world, int x, int y, int z, int meta, int randomChance) { Logger.INFO("Dropping Bonus Drops"); - for (int i = 0; i < this.bonusDrops.length; ++i) { - if (this.bonusDrops[i] != null && world.rand.nextInt(randomChance) == 0) { - this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(this.bonusDrops[i], 1)); + for (ItemStack bonusDrop : this.bonusDrops) { + if (bonusDrop != null && world.rand.nextInt(randomChance) == 0) { + this.dropBlockAsItem(world, x, y, z, ItemUtils.getSimpleStack(bonusDrop, 1)); } } } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java index 6c4ea6a556..3270fea55b 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/LogBase.java @@ -40,7 +40,7 @@ public abstract class LogBase extends BlockLog { Blocks.fire.setFireInfo(this, 20, 100); } - private final void setVanillaVariable(Object toSet, Object value) { + private void setVanillaVariable(Object toSet, Object value) { toSet = value; } diff --git a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java index 1c1cd515bb..51dd580ab4 100644 --- a/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java +++ b/src/main/java/gtPlusPlus/xmod/bop/blocks/base/SaplingBase.java @@ -48,7 +48,7 @@ public class SaplingBase extends BlockSapling { this.setCreativeTab(AddToCreativeTab.tabBOP); } - private final void setVanillaVariable(Object toSet, Object value) { + private void setVanillaVariable(Object toSet, Object value) { toSet = value; } @@ -121,33 +121,12 @@ public class SaplingBase extends BlockSapling { int j1 = 0; boolean flag = false; - switch (l) { - case 0: - default: - Logger.WARNING("Case 0 - Grow Tree"); - break; - } - Block block = Blocks.air; - if (flag) { - world.setBlock(x + i1, y, z + j1, block, 0, 4); - world.setBlock(x + i1 + 1, y, z + j1, block, 0, 4); - world.setBlock(x + i1, y, z + j1 + 1, block, 0, 4); - world.setBlock(x + i1 + 1, y, z + j1 + 1, block, 0, 4); - } else { - world.setBlock(x, y, z, block, 0, 4); - } + world.setBlock(x, y, z, block, 0, 4); if (!((WorldGenerator) object).generate(world, rand, x + i1, y, z + j1)) { - if (flag) { - world.setBlock(x + i1, y, z + j1, this, l, 4); - world.setBlock(x + i1 + 1, y, z + j1, this, l, 4); - world.setBlock(x + i1, y, z + j1 + 1, this, l, 4); - world.setBlock(x + i1 + 1, y, z + j1 + 1, this, l, 4); - } else { - world.setBlock(x, y, z, this, l, 4); - } + world.setBlock(x, y, z, this, l, 4); } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java index 0b9702acb1..80d1620f02 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/HANDLER_FR.java @@ -3,12 +3,7 @@ package gtPlusPlus.xmod.forestry; import static gregtech.api.enums.Mods.ExtraTrees; import static gregtech.api.enums.Mods.Forestry; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -import net.minecraft.block.Block; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import binnie.extratrees.genetics.ExtraTreeSpecies; import cpw.mods.fml.common.Optional; @@ -43,39 +38,6 @@ public class HANDLER_FR { } } - public static boolean createBlockBreakParticles(final World world, final int x, final int y, final int z, - final Block block) { - if (Forestry.isModLoaded()) { - createBlockBreakParticles_INTERNAL(world, x, y, z, block); - } - return false; - } - - @Optional.Method(modid = Mods.Names.FORESTRY) - private static void createBlockBreakParticles_INTERNAL(final World world, final int x, final int y, final int z, - final Block block) { - if (Forestry.isModLoaded()) { - Class oClass; - try { - oClass = ReflectionUtils.getClass("forestry.core.proxy.ProxyCommon"); - Object oProxy = ReflectionUtils.getField(oClass, "common"); - if (oProxy != null && oClass.isInstance(oProxy)) { - Method mParticles = ReflectionUtils.getMethod( - oClass, - "addBlockDestroyEffects", - World.class, - int.class, - int.class, - int.class, - Block.class, - int.class); - mParticles.invoke(oProxy, world, x, y, z, block, 0); - } - } catch (SecurityException | IllegalAccessException | IllegalArgumentException - | InvocationTargetException e) {} - } - } - @Optional.Method(modid = Mods.Names.FORESTRY) private static void mapForestrySaplingToLog() { for (TreeDefinition value : TreeDefinition.values()) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java index 031061bfc3..94f61296d6 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/custom/CustomCombs.java @@ -34,7 +34,7 @@ public enum CustomCombs { SALT("salt", true, Materials.Salt, 75), SAND("sand", true, Materials.Sand, 100),; - private static int[][] colours = new int[][] { + private static final int[][] colours = new int[][] { { Utils.rgbtoHexValue(75, 75, 75), Utils.rgbtoHexValue(125, 125, 125) }, // SILICON { Utils.rgbtoHexValue(55, 55, 55), Utils.rgbtoHexValue(75, 75, 75) }, // RUBBER { Utils.rgbtoHexValue(245, 245, 245), Utils.rgbtoHexValue(175, 175, 175) }, // PLASTIC @@ -65,9 +65,9 @@ public enum CustomCombs { { 0xEBA1EB, 0xF2C3F2 }, { 0x62626D, 0x161620 }, { 0xE6E6E6, 0xFFFFCC }, { 0xDADADA, 0xD1D1E0 }, { 0x19AF19, 0x169E16 }, { 0x335C33, 0x6B8F00 }, { 0x003300, 0x002400 }, }; public boolean showInList; - public Materials material; - public int chance; - private String name; + public final Materials material; + public final int chance; + private final String name; private CustomCombs(String pName, boolean show, Materials material, int chance) { this.name = pName; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java index 3495869c97..4bc47fa7bd 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_CombType.java @@ -13,13 +13,13 @@ public enum GTPP_CombType { FORCE(1, "Force", true, 30, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)); public boolean mShowInList; - public Material mMaterial; - public int mChance; - public int mID; + public final Material mMaterial; + public final int mChance; + public final int mID; - private String mName; - private String mNameUnlocal; - private int[] mColour; + private final String mName; + private final String mNameUnlocal; + private final int[] mColour; private static void map(int aId, GTPP_CombType aType) { GTPP_Bees.sCombMappings.put(aId, aType); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java index cbf448b7f6..6f43d4a43e 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_DropType.java @@ -13,13 +13,13 @@ public enum GTPP_DropType { FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20), Utils.rgbtoHexValue(200, 200, 5)); public boolean mShowInList; - public Material mMaterial; + public final Material mMaterial; public int mChance; - public int mID; + public final int mID; - private String mName; - private String mNameUnlocal; - private int[] mColour; + private final String mName; + private final String mNameUnlocal; + private final int[] mColour; private static void map(int aId, GTPP_DropType aType) { GTPP_Bees.sDropMappings.put(aId, aType); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java index ec49643001..acca5b810f 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PollenType.java @@ -12,13 +12,13 @@ public enum GTPP_PollenType { DRAGONBLOOD(0, "Dragon Blood", true, Utils.rgbtoHexValue(220, 20, 20), Utils.rgbtoHexValue(20, 20, 20)); public boolean mShowInList; - public Material mMaterial; + public final Material mMaterial; public int mChance; - public int mID; + public final int mID; - private String mName; - private String mNameUnlocal; - private int[] mColour; + private final String mName; + private final String mNameUnlocal; + private final int[] mColour; private static void map(int aId, GTPP_PollenType aType) { GTPP_Bees.sPollenMappings.put(aId, aType); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java index b857827d62..b76d79d387 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/handler/GTPP_PropolisType.java @@ -13,13 +13,13 @@ public enum GTPP_PropolisType { FORCE(1, "Force", true, Utils.rgbtoHexValue(250, 250, 20)); public boolean mShowInList; - public Material mMaterial; + public final Material mMaterial; public int mChance; - public int mID; + public final int mID; - private String mName; - private String mNameUnlocal; - private int mColour; + private final String mName; + private final String mNameUnlocal; + private final int mColour; private static void map(int aId, GTPP_PropolisType aType) { GTPP_Bees.sPropolisMappings.put(aId, aType); diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index 8af5b97b00..ab8771e6db 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -22,9 +22,6 @@ import gregtech.api.enums.Mods; public class FR_ItemRegistry { // ----- Apiary Frames ---------------------- - // public static FR_ItemHiveFrame frameUntreated; - // public static FR_ItemHiveFrame frameImpregnated; - // public static FR_ItemHiveFrame frameProven; // Magic Bee Frame Items public static MB_ItemFrame hiveFrameAccelerated; diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java index 8ce963fa7a..c63401aecf 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/items/FR_StringUtil.java @@ -11,10 +11,4 @@ public class FR_StringUtil { return StatCollector.translateToFallback(key); } - public static String getLocalizedString(final String key, final Object... objects) { - if (StatCollector.canTranslate(key)) { - return String.format(StatCollector.translateToLocal(key), objects); - } - return String.format(StatCollector.translateToFallback(key), objects); - } } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java index 6fea628473..dcfd524840 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BeeDefinition.java @@ -146,82 +146,49 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { } } - protected static IAlleleBeeEffect getEffect(byte modid, String name) { - String s; - switch (modid) { - case GTPP_Bees.EXTRABEES: - s = "extrabees.effect." + name; - break; - case GTPP_Bees.GENDUSTRY: - s = "gendustry.effect." + name; - break; - case GTPP_Bees.MAGICBEES: - s = "magicbees.effect" + name; - break; - case GTPP_Bees.GREGTECH: - s = "gregtech.effect" + name; - break; - default: - s = "forestry.effect" + name; - break; - } + private static IAlleleBeeEffect getEffect(byte modid, String name) { + String s = switch (modid) { + case GTPP_Bees.EXTRABEES -> "extrabees.effect." + name; + case GTPP_Bees.GENDUSTRY -> "gendustry.effect." + name; + case GTPP_Bees.MAGICBEES -> "magicbees.effect" + name; + case GTPP_Bees.GREGTECH -> "gregtech.effect" + name; + default -> "forestry.effect" + name; + }; return (IAlleleBeeEffect) AlleleManager.alleleRegistry.getAllele(s); } - protected static IAlleleFlowers getFlowers(byte modid, String name) { - String s; - switch (modid) { - case GTPP_Bees.EXTRABEES: - s = "extrabees.flower." + name; - break; - case GTPP_Bees.GENDUSTRY: - s = "gendustry.flower." + name; - break; - case GTPP_Bees.MAGICBEES: - s = "magicbees.flower" + name; - break; - case GTPP_Bees.GREGTECH: - s = "gregtech.flower" + name; - break; - default: - s = "forestry.flowers" + name; - break; - } + private static IAlleleFlowers getFlowers(byte modid, String name) { + String s = switch (modid) { + case GTPP_Bees.EXTRABEES -> "extrabees.flower." + name; + case GTPP_Bees.GENDUSTRY -> "gendustry.flower." + name; + case GTPP_Bees.MAGICBEES -> "magicbees.flower" + name; + case GTPP_Bees.GREGTECH -> "gregtech.flower" + name; + default -> "forestry.flowers" + name; + }; return (IAlleleFlowers) AlleleManager.alleleRegistry.getAllele(s); } - protected static IAlleleBeeSpecies getSpecies(byte modid, String name) { - String s; - switch (modid) { - case GTPP_Bees.EXTRABEES: - s = "extrabees.species." + name; - break; - case GTPP_Bees.GENDUSTRY: - s = "gendustry.bee." + name; - break; - case GTPP_Bees.MAGICBEES: - s = "magicbees.species" + name; - break; - case GTPP_Bees.GREGTECH: - s = "gregtech.species" + name; - break; - default: - s = "forestry.species" + name; - break; - } + private static IAlleleBeeSpecies getSpecies(byte modid, String name) { + String s = switch (modid) { + case GTPP_Bees.EXTRABEES -> "extrabees.species." + name; + case GTPP_Bees.GENDUSTRY -> "gendustry.bee." + name; + case GTPP_Bees.MAGICBEES -> "magicbees.species" + name; + case GTPP_Bees.GREGTECH -> "gregtech.species" + name; + default -> "forestry.species" + name; + }; IAlleleBeeSpecies ret = (IAlleleBeeSpecies) AlleleManager.alleleRegistry.getAllele(s); return ret; } - protected final void setSpeciesProperties(GTPP_AlleleBeeSpecies species2) { + private final void setSpeciesProperties(GTPP_AlleleBeeSpecies species2) { this.mSpeciesProperties.accept(species2); } - protected final void setAlleles(IAllele[] template) { + private final void setAlleles(IAllele[] template) { this.mAlleles.accept(template); } - protected final void registerMutations() { + private final void registerMutations() { this.mMutations.accept(this); } @@ -237,27 +204,27 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { BeeManager.beeRoot.registerTemplate(template); } - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, + private final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, + private final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, + private final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, + private final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance) { return registerMutation(parent1, parent2, chance, 1f); } - protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance) { + private final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance) { return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, 1f); } @@ -266,28 +233,27 @@ public enum GTPP_BeeDefinition implements IBeeDefinition { * chancedivider This new function allows Mutation percentages under 1%. Set them as a fraction with chance / * chancedivider */ - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, - int chance, float chancedivider) { + private final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, IAlleleBeeSpecies parent2, int chance, + float chancedivider) { return new GTPP_Bee_Mutation(parent1, parent2, this.getTemplate(), chance, chancedivider); } - protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, - int chance, float chancedivider) { + private final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, IAlleleBeeSpecies parent2, int chance, + float chancedivider) { return registerMutation(parent1.species, parent2, chance, chancedivider); } - protected final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, - int chance, float chancedivider) { + private final IBeeMutationCustom registerMutation(IAlleleBeeSpecies parent1, GTPP_BeeDefinition parent2, int chance, + float chancedivider) { return registerMutation(parent1, parent2.species, chance, chancedivider); } - protected final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, + private final IBeeMutationCustom registerMutation(GTPP_BeeDefinition parent1, GTPP_BeeDefinition parent2, int chance, float chancedivider) { return registerMutation(parent1.species, parent2, chance, chancedivider); } - protected final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance, - float chancedivider) { + private final IBeeMutationCustom registerMutation(String parent1, String parent2, int chance, float chancedivider) { return registerMutation(getGregtechBeeType(parent1), getGregtechBeeType(parent2), chance, chancedivider); } diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java index 69d9319884..77b7d57954 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_Bees.java @@ -30,11 +30,11 @@ public class GTPP_Bees { public static GTPP_Drop drop; public static GTPP_Comb combs; - public static HashMap<String, Material> sMaterialMappings = new HashMap<String, Material>(); - public static HashMap<Integer, GTPP_PropolisType> sPropolisMappings = new HashMap<Integer, GTPP_PropolisType>(); - public static HashMap<Integer, GTPP_PollenType> sPollenMappings = new HashMap<Integer, GTPP_PollenType>(); - public static HashMap<Integer, GTPP_DropType> sDropMappings = new HashMap<Integer, GTPP_DropType>(); - public static HashMap<Integer, GTPP_CombType> sCombMappings = new HashMap<Integer, GTPP_CombType>(); + public static HashMap<String, Material> sMaterialMappings = new HashMap<>(); + public static HashMap<Integer, GTPP_PropolisType> sPropolisMappings = new HashMap<>(); + public static HashMap<Integer, GTPP_PollenType> sPollenMappings = new HashMap<>(); + public static HashMap<Integer, GTPP_DropType> sDropMappings = new HashMap<>(); + public static HashMap<Integer, GTPP_CombType> sCombMappings = new HashMap<>(); public GTPP_Bees() { if (Forestry.isModLoaded() && GT_Mod.gregtechproxy.mGTBees) { diff --git a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java index 4c367e25d4..39af813dec 100644 --- a/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java +++ b/src/main/java/gtPlusPlus/xmod/forestry/bees/registry/GTPP_BranchDefinition.java @@ -73,7 +73,7 @@ public enum GTPP_BranchDefinition { return Arrays.copyOf(defaultTemplate, defaultTemplate.length); } - protected final void setBranchProperties(IAllele[] template) { + private final void setBranchProperties(IAllele[] template) { this.mBranchProperties.accept(template); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 977eb8a2c9..1a188153d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -37,8 +37,6 @@ import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GregtechMTE_ElementalDuplicator; import gtPlusPlus.xmod.gregtech.loaders.Gregtech_Blocks; import gtPlusPlus.xmod.gregtech.loaders.ProcessingAngleGrinder; -import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricButcherKnife; -import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricLighter; import gtPlusPlus.xmod.gregtech.loaders.ProcessingElectricSnips; import gtPlusPlus.xmod.gregtech.loaders.misc.AddCustomMachineToPA; import gtPlusPlus.xmod.gregtech.loaders.recipe.RecipeLoader_AlgaeFarm; @@ -80,8 +78,6 @@ public class HANDLER_GT { // Only loads if the config option is true (default: true) new ProcessingAngleGrinder().run(); new ProcessingElectricSnips().run(); - new ProcessingElectricButcherKnife().run(); - new ProcessingElectricLighter().run(); // Register custom singles to the PA AddCustomMachineToPA.register(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 90fd1e2358..ed2bc20c32 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -53,18 +53,7 @@ public enum GregtechItemList implements GregtechItemContainer { Sensor_ZPM, Sensor_UV, - // ULV Components - Electric_Motor_ULV, - Electric_Pump_ULV, - Conveyor_Module_ULV, - Electric_Piston_ULV, - Robot_Arm_ULV, - Field_Generator_ULV, - Emitter_ULV, - Sensor_ULV, - // Mixed Components - TransmissionComponent_ULV, TransmissionComponent_LV, TransmissionComponent_MV, TransmissionComponent_HV, @@ -73,7 +62,7 @@ public enum GregtechItemList implements GregtechItemContainer { TransmissionComponent_LuV, TransmissionComponent_ZPM, TransmissionComponent_UV, - TransmissionComponent_MAX, + TransmissionComponent_UHV, // Recipe Circuit Circuit_BioRecipeSelector, @@ -176,13 +165,6 @@ public enum GregtechItemList implements GregtechItemContainer { Laser_Lens_WoodsGlass, Laser_Lens_Special, - // Bombs - Bomb_Cast, - Bomb_Cast_Molten, - Bomb_Cast_Set, - Bomb_Cast_Broken, - Bomb_Cast_Mold, - // Pellet Mold Pellet_Mold, @@ -210,7 +192,7 @@ public enum GregtechItemList implements GregtechItemContainer { GTPP_Casing_LuV, GTPP_Casing_ZPM, GTPP_Casing_UV, - GTPP_Casing_MAX, + GTPP_Casing_UHV, // IronBlastFurnace Machine_Bronze_BlastFurnace Casing_IronPlatedBricks, @@ -552,7 +534,6 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_Muffler_Adv_MAX, // Super Input Busses - Hatch_SuperBus_Input_ULV, Hatch_SuperBus_Input_LV, Hatch_SuperBus_Input_MV, Hatch_SuperBus_Input_HV, @@ -564,7 +545,6 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_SuperBus_Input_MAX, // Super Output Busses - Hatch_SuperBus_Output_ULV, Hatch_SuperBus_Output_LV, Hatch_SuperBus_Output_MV, Hatch_SuperBus_Output_HV, @@ -576,10 +556,9 @@ public enum GregtechItemList implements GregtechItemContainer { Hatch_SuperBus_Output_MAX, // Chisel Buses for Industrial Chisel - GT_MetaTileEntity_ChiselBus_I, - GT_MetaTileEntity_ChiselBus_II, - GT_MetaTileEntity_ChiselBus_III, - GT_MetaTileEntity_ChiselBus_IV, + GT_MetaTileEntity_ChiselBus_LV, + GT_MetaTileEntity_ChiselBus_MV, + GT_MetaTileEntity_ChiselBus_HV, // ---------------------------------------------------------------------------- @@ -602,11 +581,6 @@ public enum GregtechItemList implements GregtechItemContainer { * Single Block Tile Entities */ - // ULV Generators - Generator_Diesel_ULV, - Generator_Gas_Turbine_ULV, - Generator_Steam_Turbine_ULV, - // Crate Box CrateStorage, @@ -616,17 +590,6 @@ public enum GregtechItemList implements GregtechItemContainer { // infinite Items Infinite_Item_Chest, - // GT4 Redstone - GT4_Redstone_Lamp, - GT4_Redstone_Button_Panel, - GT4_Redstone_Scale, - GT4_Redstone_Display, - GT4_Redstone_Circuit, - - // Gt4 Workbenches - GT4_Workbench_Bronze, - GT4_Workbench_Advanced, - // GT4 automation GT4_Electric_Auto_Workbench_LV, GT4_Electric_Auto_Workbench_MV, @@ -671,7 +634,6 @@ public enum GregtechItemList implements GregtechItemContainer { // Fancy Pollution Devices Pollution_Detector, - Pollution_Cleaner_ULV, Pollution_Cleaner_LV, Pollution_Cleaner_MV, Pollution_Cleaner_HV, @@ -702,11 +664,6 @@ public enum GregtechItemList implements GregtechItemContainer { Super_Chest_EV, Super_Chest_IV, - // Chunkloader - GT_Chunkloader_HV, - GT_Chunkloader_ZPM, - GT_Chunkloader_IV, - // Wireless Chargers Charger_LV, Charger_MV, @@ -716,7 +673,7 @@ public enum GregtechItemList implements GregtechItemContainer { Charger_LuV, Charger_ZPM, Charger_UV, - Charger_MAX, + Charger_UHV, // Reactor Processing Unit ReactorProcessingUnit_IV, @@ -752,21 +709,6 @@ public enum GregtechItemList implements GregtechItemContainer { Energy_Buffer_1by1_UV, Energy_Buffer_1by1_MAX, - // Cobble Generators - Cobble_Generator_ULV, - Cobble_Generator_LV, - Cobble_Generator_MV, - Cobble_Generator_HV, - Cobble_Generator_EV, - Cobble_Generator_IV, - Cobble_Generator_LuV, - Cobble_Generator_ZPM, - Cobble_Generator_UV, - Cobble_Generator_MAX, - - // The max Steam condenser - Condensor_MAX, - // Rocket Engines Rocket_Engine_EV, Rocket_Engine_IV, @@ -856,7 +798,6 @@ public enum GregtechItemList implements GregtechItemContainer { */ // Fluid Void Covers - Cover_Overflow_ULV, Cover_Overflow_LV, Cover_Overflow_MV, Cover_Overflow_HV, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 61abc48a18..03ec5f3fc5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -109,7 +109,7 @@ public enum GregtechOrePrefixes { chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced ; - public static volatile int VERSION = 508; + public static final int VERSION = 508; static { ingotHot.mHeatDamage = 3.0F; @@ -132,11 +132,11 @@ public enum GregtechOrePrefixes { mGeneratedItems = new HashSet<>(); private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>(); private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); - public ItemStack mContainerItem = null; - public ICondition<ISubTagContainer> mCondition = null; + public final ItemStack mContainerItem = null; + public final ICondition<ISubTagContainer> mCondition = null; public byte mDefaultStackSize = 64; - public GregtechMaterialStack mSecondaryMaterial = null; - public GregtechOrePrefixes mPrefixInto = this; + public final GregtechMaterialStack mSecondaryMaterial = null; + public final GregtechOrePrefixes mPrefixInto = this; public float mHeatDamage = 0.0F; // Negative for Frost Damage /** * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check. @@ -657,15 +657,22 @@ public enum GregtechOrePrefixes { mOreMultiplier = 1, mByProductMultiplier = 1, mSmeltingMultiplier = 1; public long mDensity = M; public Element mElement = null; - public GT_Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this, - mArcSmeltInto = this, mHandleMaterial = this; + public GT_Materials mDirectSmelting = this; + public GT_Materials mOreReplacement = this; + public GT_Materials mMacerateInto = this; + public GT_Materials mSmeltInto = this; + public GT_Materials mArcSmeltInto = this; + public final GT_Materials mHandleMaterial = this; public byte mToolQuality = 0; - public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null; + public final Fluid mSolid = null; + public Fluid mFluid = null; + public Fluid mGas = null; + public Fluid mPlasma = null; /** * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one * Material Unit worth */ - public Fluid mStandardMoltenFluid = null; + public final Fluid mStandardMoltenFluid = null; private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, final int aToolDurability, final int aToolQuality, final boolean aUnificatable) { @@ -1283,6 +1290,6 @@ public enum GregtechOrePrefixes { return this.mRGBa; } - public static volatile int VERSION = 508; + public static final int VERSION = 508; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java index 5437f65aff..e6f7933fd7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaItem_Base.java @@ -294,7 +294,9 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item + " / " + GT_Utility.formatNumbers(Math.abs(tStats[0])) + " EU - Voltage: " - + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 : 1)] + + GT_Utility.formatNumbers( + V[(int) (tStats[2] >= 0 ? tStats[2] < V.length ? tStats[2] : V.length - 1 + : 1)]) + EnumChatFormatting.GRAY); } } @@ -308,7 +310,10 @@ public abstract class Gregtech_MetaItem_Base extends Gregtech_Generic_Item + ((tFluid == null ? "No Fluids Contained" : GT_Utility.getFluidName(tFluid, true))) + EnumChatFormatting.GRAY); aList.add( - EnumChatFormatting.BLUE + ((tFluid == null ? 0 : tFluid.amount) + "L / " + tStats[0] + "L") + EnumChatFormatting.BLUE + + (GT_Utility.formatNumbers(tFluid == null ? 0 : tFluid.amount) + "L / " + + GT_Utility.formatNumbers(tStats[0]) + + "L") + EnumChatFormatting.GRAY); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java index a66cce394d..259aa2760c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/items/Gregtech_MetaTool.java @@ -480,10 +480,7 @@ public abstract class Gregtech_MetaTool extends GT_MetaGenerated_Tool } this.doDamage(aStack, tStats.getToolDamagePerContainerCraft()); aStack = aStack.stackSize > 0 ? aStack : null; - if (playSound) { - // String sound = (aStack == null) ? tStats.getBreakingSound() : tStats.getCraftingSound(); - // GT_Utility.doSoundAtClient(sound, 1, 1.0F); - } + if (playSound) {} return aStack; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java index 6a8b3a9af6..68aaa75aa1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_ElementalDataOrbHolder.java @@ -150,7 +150,7 @@ public class GT_MetaTileEntity_Hatch_ElementalDataOrbHolder extends GT_MetaTileE } public ArrayList<ItemStack> getInventory() { - ArrayList<ItemStack> aContents = new ArrayList<ItemStack>(); + ArrayList<ItemStack> aContents = new ArrayList<>(); for (int i = getBaseMetaTileEntity().getSizeInventory() - 2; i >= 0; i--) { if (getBaseMetaTileEntity().getStackInSlot(i) != null) aContents.add(getBaseMetaTileEntity().getStackInSlot(i)); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java index 1fca67d295..254c81a515 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_InputBattery.java @@ -128,8 +128,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc fillStacksIntoFirstSlots(); } if (aBaseMetaTileEntity.isServerSide()) { - if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity(); + if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { if (mMetaTileEntity.rechargerSlotCount() > 0 && aBaseMetaTileEntity.getStoredEU() > 0) { for (int i = mMetaTileEntity.rechargerSlotStartIndex(), k = mMetaTileEntity.rechargerSlotCount() + i; i < k; i++) { @@ -149,11 +148,7 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc } } } - } else { - // Utils.LOG_INFO("reCharger Slot Count = "+mMetaTileEntity.rechargerSlotCount()); - // Utils.LOG_INFO("getStoredEU = "+aBaseMetaTileEntity.getStoredEU()); - // Utils.LOG_INFO("getEUVar = "+mMetaTileEntity.getEUVar()); - } + } else {} } } super.onPostTick(aBaseMetaTileEntity, aTimer); @@ -202,14 +197,11 @@ public class GT_MetaTileEntity_Hatch_InputBattery extends GT_MetaTileEntity_Hatc @Override public int rechargerSlotCount() { - switch (mTier) { - case 2: - return 4; - case 4: - return 16; - default: - return 16; - } + return switch (mTier) { + case 2 -> 4; + case 4 -> 16; + default -> 16; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java index d8ec187fff..8c0ebe60e9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler_Adv.java @@ -195,10 +195,7 @@ public class GT_MetaTileEntity_Hatch_Muffler_Adv extends GT_MetaTileEntity_Hatch // return; } else { // Logger.INFO("B2"); - if (this.getInventoryStack() == null) { - // Logger.INFO("D1"); - // Logger.INFO("Empty - "+this.mInventory.length); - } else { + if (this.getInventoryStack() == null) {} else { // Logger.INFO("D2"); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java index 502dd0ee0b..f70be9aa89 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_OutputBattery.java @@ -174,8 +174,7 @@ public class GT_MetaTileEntity_Hatch_OutputBattery extends GT_MetaTileEntity_Hat } if (aBaseMetaTileEntity.isServerSide()) { - if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity) { - MetaTileEntity mMetaTileEntity = (MetaTileEntity) aBaseMetaTileEntity.getMetaTileEntity(); + if (aBaseMetaTileEntity.getMetaTileEntity() instanceof MetaTileEntity mMetaTileEntity) { if (mMetaTileEntity.dechargerSlotCount() > 0 && mMetaTileEntity.getEUVar() < aBaseMetaTileEntity.getEUCapacity()) { for (int i = mMetaTileEntity.dechargerSlotStartIndex(), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java index e8ef0a454b..0d307f6e0f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Turbine.java @@ -30,7 +30,6 @@ import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; @@ -172,7 +171,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { } } - private final int getDamageToComponent(ItemStack aStack) { + private int getDamageToComponent(ItemStack aStack) { return 1; } @@ -334,7 +333,7 @@ public class GT_MetaTileEntity_Hatch_Turbine extends GT_MetaTileEntity_Hatch { PlayerUtils.messagePlayer(aPlayer, "Using: " + aMat.mLocalizedName + " " + aSize); } } else { - this.mUsingAnimation = Utils.invertBoolean(mUsingAnimation); + this.mUsingAnimation = !mUsingAnimation; if (this.mUsingAnimation) { PlayerUtils.messagePlayer(aPlayer, "Using Animated Turbine Texture."); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java index 226086a1ff..e6cb5f8132 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_TurbineProvider.java @@ -20,7 +20,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.sys.KeyboardUtils; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines.GregtechMetaTileEntity_LargerTurbineBase; @@ -64,20 +63,18 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H } } - private final void tryFindParentTurbine() { + private void tryFindParentTurbine() { Logger.INFO("This turbine housing has no parent, searching world."); IGregTechTileEntity T = this.getBaseMetaTileEntity(); World W = T.getWorld(); Chunk C = W.getChunkFromBlockCoords(T.getXCoord(), T.getZCoord()); for (Object o : C.chunkTileEntityMap.values()) { - if (o instanceof IGregTechTileEntity) { - IGregTechTileEntity G = (IGregTechTileEntity) o; + if (o instanceof IGregTechTileEntity G) { final IMetaTileEntity aMetaTileEntity = G.getMetaTileEntity(); if (aMetaTileEntity == null) { continue; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine) { - GT_MetaTileEntity_LargeTurbine aTurb = (GT_MetaTileEntity_LargeTurbine) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_LargeTurbine aTurb) { for (GT_MetaTileEntity_Hatch_InputBus ee : aTurb.mInputBusses) { if (ee.equals(this)) { mParent = aTurb; @@ -90,7 +87,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H } } - private final void tryRefillTurbine() { + private void tryRefillTurbine() { if (mParent == null) { tryFindParentTurbine(); } @@ -166,7 +163,7 @@ public class GT_MetaTileEntity_Hatch_TurbineProvider extends GT_MetaTileEntity_H public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (aPlayer != null) { if (KeyboardUtils.isCtrlKeyDown()) { - mDescending = Utils.invertBoolean(mDescending); + mDescending = !mDescending; PlayerUtils.messagePlayer(aPlayer, "Direction: " + (mDescending ? "DOWN" : "UP")); } else { int aAmount = 0; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java index a9dd8d3a97..3701f5dd0f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMetaTransformerHiAmp.java @@ -12,7 +12,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer { @@ -108,11 +107,10 @@ public class GregtechMetaTransformerHiAmp extends GT_MetaTileEntity_Transformer @Override public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - this.mHalfMode = Utils.invertBoolean(mHalfMode); + this.mHalfMode = !mHalfMode; if (this.mHalfMode) { PlayerUtils.messagePlayer(aPlayer, "Transformer is now running at 2A:8A in/out Ratio."); } else { - PlayerUtils.messagePlayer(aPlayer, "Transformer is now running at 4A:16A in/out Ratio."); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java index fe394238a6..01e0f731f6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java @@ -561,35 +561,29 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public boolean causeMaintenanceIssue() { boolean b = false; switch (this.getBaseMetaTileEntity().getRandomNumber(6)) { - case 0: { + case 0 -> { this.mWrench = false; b = true; - break; } - case 1: { + case 1 -> { this.mScrewdriver = false; b = true; - break; } - case 2: { + case 2 -> { this.mSoftHammer = false; b = true; - break; } - case 3: { + case 3 -> { this.mHardHammer = false; b = true; - break; } - case 4: { + case 4 -> { this.mSolderingTool = false; b = true; - break; } - case 5: { + case 5 -> { this.mCrowbar = false; b = true; - break; } } return b; @@ -1018,8 +1012,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) { return mAllDynamoHatches.add(aHatch); } return false; @@ -1072,8 +1065,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { - GT_MetaTileEntity_Hatch aHatch = (GT_MetaTileEntity_Hatch) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch aHatch) { return mAllEnergyHatches.add(aHatch); } return false; @@ -1209,7 +1201,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex tryTickWaitTimerDown(); } - private final void tryTickWaitTimerDown() { + private void tryTickWaitTimerDown() { /* * if (mStartUpCheck > 10) { mStartUpCheck = 10; } */ @@ -1251,7 +1243,7 @@ public abstract class GregtechMeta_MultiBlockBase<T extends GT_MetaTileEntity_Ex public static <T> IStructureElement<T> addTieredBlock(Block aBlock, BiPredicate<T, Integer> aSetTheMeta, Function<T, Integer> aGetTheMeta, int minMeta, int maxMeta) { - return new IStructureElement<T>() { + return new IStructureElement<>() { @Override public boolean check(T t, World world, int x, int y, int z) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java index cd23f036da..d4db6b1350 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_SteamMultiBase.java @@ -32,9 +32,9 @@ import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEn public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMultiBase<T>> extends GregtechMeta_MultiBlockBase<T> { - public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput>(); - public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput>(); - public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase>(); + public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusInput> mSteamInputs = new ArrayList<>(); + public ArrayList<GT_MetaTileEntity_Hatch_Steam_BusOutput> mSteamOutputs = new ArrayList<>(); + public ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mSteamInputFluids = new ArrayList<>(); protected static final String TT_steaminputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamInputBus"); protected static final String TT_steamoutputbus = StatCollector.translateToLocal("GTPP.MBTT.SteamOutputBus"); @@ -80,7 +80,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu } public ArrayList<FluidStack> getAllSteamStacks() { - ArrayList<FluidStack> aFluids = new ArrayList<FluidStack>(); + ArrayList<FluidStack> aFluids = new ArrayList<>(); FluidStack aSteam = FluidUtils.getSteam(1); for (FluidStack aFluid : this.getStoredFluids()) { if (aFluid.isFluidEqual(aSteam)) { @@ -231,7 +231,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<FluidStack> getStoredFluids() { - ArrayList<FluidStack> rList = new ArrayList<FluidStack>(); + ArrayList<FluidStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_CustomFluidBase tHatch : mSteamInputFluids) { if (isValidMetaTileEntity(tHatch) && tHatch.getFillableStack() != null) { rList.add(tHatch.getFillableStack()); @@ -242,7 +242,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<ItemStack> getStoredInputs() { - ArrayList<ItemStack> rList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_Steam_BusInput tHatch : mSteamInputs) { tHatch.mRecipeMap = getRecipeMap(); if (isValidMetaTileEntity(tHatch)) { @@ -282,7 +282,7 @@ public abstract class GregtechMeta_SteamMultiBase<T extends GregtechMeta_SteamMu @Override public ArrayList<ItemStack> getStoredOutputs() { - ArrayList<ItemStack> rList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> rList = new ArrayList<>(); for (GT_MetaTileEntity_Hatch_Steam_BusOutput tHatch : mSteamOutputs) { if (isValidMetaTileEntity(tHatch)) { for (int i = tHatch.getBaseMetaTileEntity().getSizeInventory() - 1; i >= 0; i--) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java index 0200113e95..cab45a9a7b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/generators/GregtechRocketFuelGeneratorBase.java @@ -319,10 +319,6 @@ public abstract class GregtechRocketFuelGeneratorBase extends GT_MetaTileEntity_ // Logger.INFO("Found some fuel?"); int aperOp = this.consumedFluidPerOperation(tLiquid); int aConsume = (int) (((long) tFuel.mSpecialValue * this.getEfficiency() * aperOp) / 100); - // Logger.INFO("Fuel Value: "+tFuel.mSpecialValue); - // Logger.INFO("Efficiency: "+getEfficiency()); - // Logger.INFO("Consumed per op: "+aperOp); - // Logger.INFO("Consuming "+aConsume); return aConsume; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java index 9bf0ad3f53..b53e540044 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_Catalysts.java @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_Hatch_Catalysts extends GT_MetaTileEntity_Hatch_N @Override public AutoMap<ItemStack> getItemsValidForUsageSlots() { - return new AutoMap<ItemStack>(); + return new AutoMap<>(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java index 240ed3624f..e3134f5812 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_MillingBalls.java @@ -56,7 +56,7 @@ public class GT_MetaTileEntity_Hatch_MillingBalls extends GT_MetaTileEntity_Hatc @Override public AutoMap<ItemStack> getItemsValidForUsageSlots() { - return new AutoMap<ItemStack>(); + return new AutoMap<>(); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java index 5555d1ff09..53c988676f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/nbthandlers/GT_MetaTileEntity_Hatch_NbtConsumable.java @@ -169,7 +169,7 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE } public final AutoMap<ItemStack> getContentUsageSlots() { - AutoMap<ItemStack> aItems = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aItems = new AutoMap<>(); for (int i = mInputslotCount; i < mTotalSlotCount; i++) { if (mInventory[i] != null) { aItems.add(mInventory[i]); @@ -279,24 +279,19 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE @Override public void addGregTechLogo(ModularWindow.Builder builder) { switch (mTotalSlotCount) { - case 8: - case 18: - builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(152, 63)); - break; - case 32: - builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) - .setPos(79, 35)); - break; + case 8, 18 -> builder.widget( + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) + .setPos(152, 63)); + case 32 -> builder.widget( + new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17) + .setPos(79, 35)); } } @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { switch (mTotalSlotCount) { - case 8: + case 8 -> { builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 2).startFromSlot(0).endAtSlot(3).build() .setPos(25, 25)); @@ -305,8 +300,8 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE .build().setPos(115, 25)); builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 16)) .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(115, 16)); - break; - case 18: + } + case 18 -> { builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(0).endAtSlot(8).build() .setPos(25, 19)); @@ -315,15 +310,15 @@ public abstract class GT_MetaTileEntity_Hatch_NbtConsumable extends GT_MetaTileE .build().setPos(97, 19)); builder.widget(new TextWidget("Stock").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(25, 14)) .widget(new TextWidget("Active").setDefaultColor(COLOR_TEXT_GRAY.get()).setPos(15, 14)); - break; - case 32: + } + case 32 -> { builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(0).endAtSlot(15).build() .setPos(7, 7)); builder.widget( SlotGroup.ofItemHandler(inventoryHandler, 4).startFromSlot(16).endAtSlot(31).canInsert(false) .build().setPos(96, 7)); - break; + } } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index b9dc5d4b70..77ad6cd4ac 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -2,8 +2,6 @@ package gtPlusPlus.xmod.gregtech.api.objects; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; import java.util.List; import net.minecraft.item.ItemStack; @@ -47,9 +45,9 @@ public class GregtechItemData { final GregtechMaterialStack[] tByProducts = aByProducts.length < 1 ? EMPTY_GT_MaterialStack_ARRAY : new GregtechMaterialStack[aByProducts.length]; int j = 0; - for (int i = 0; i < aByProducts.length; i++) { - if ((aByProducts[i] != null) && (aByProducts[i].mMaterial != null)) { - tByProducts[j++] = aByProducts[i].clone(); + for (GregtechMaterialStack aByProduct : aByProducts) { + if ((aByProduct != null) && (aByProduct.mMaterial != null)) { + tByProducts[j++] = aByProduct.clone(); } } this.mByProducts = j > 0 ? new GregtechMaterialStack[j] : EMPTY_GT_MaterialStack_ARRAY; @@ -102,13 +100,7 @@ public class GregtechItemData { } } - Collections.sort(rList, new Comparator<GregtechMaterialStack>() { - - @Override - public int compare(final GregtechMaterialStack a, final GregtechMaterialStack b) { - return a.mAmount == b.mAmount ? 0 : a.mAmount > b.mAmount ? -1 : +1; - } - }); + rList.sort((a, b) -> Long.compare(b.mAmount, a.mAmount)); if (rList.isEmpty()) { this.mMaterial = null; @@ -117,7 +109,7 @@ public class GregtechItemData { rList.remove(0); } - this.mByProducts = rList.toArray(new GregtechMaterialStack[rList.size()]); + this.mByProducts = rList.toArray(new GregtechMaterialStack[0]); } public boolean hasValidPrefixMaterialData() { @@ -133,7 +125,7 @@ public class GregtechItemData { } public ArrayList<GregtechMaterialStack> getAllGT_MaterialStacks() { - final ArrayList<GregtechMaterialStack> rList = new ArrayList<GregtechMaterialStack>(); + final ArrayList<GregtechMaterialStack> rList = new ArrayList<>(); if (this.hasValidMaterialData()) { rList.add(this.mMaterial); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java index 51987d84fd..df95b7de2b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/util/SpecialBehaviourTooltipHandler.java @@ -11,7 +11,7 @@ import gregtech.api.util.GT_Utility; public class SpecialBehaviourTooltipHandler { - private static final HashMap<ItemStack, String> mTooltipCache = new HashMap<ItemStack, String>(); + private static final HashMap<ItemStack, String> mTooltipCache = new HashMap<>(); public static void addTooltipForItem(ItemStack aStack, String aTooltip) { mTooltipCache.put(aStack, aTooltip); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index c38b7d4282..5a16d0a20d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -65,7 +65,7 @@ public class GregtechMetaCasingBlocks3 extends GregtechMetaCasingBlocksAbstract GT_LanguageManager .addStringLocalization(this.getUnlocalizedName() + ".7.name", "Vanadium Redox Power Cell (UV)"); GT_LanguageManager - .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (MAX)"); + .addStringLocalization(this.getUnlocalizedName() + ".8.name", "Vanadium Redox Power Cell (UHV)"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Advanced Cryogenic Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Volcanus Casing"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java index 99228b6ed3..26c747e50e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks5.java @@ -81,53 +81,69 @@ public class GregtechMetaCasingBlocks5 extends GregtechMetaCasingBlocksAbstract public static IIcon getStaticIcon(final int ordinalSide, final int aMeta) { if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: + case 0 -> { return TexturesGtBlock.TEXTURE_PIPE_GRINDING_MILL.getIcon(); - case 1: + } + case 1 -> { return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); - case 2: + } + case 2 -> { return TexturesGtBlock.TEXTURE_GEARBOX_GRINDING_MILL.getIcon(); - case 3: + } + case 3 -> { return TexturesGtBlock.TEXTURE_TECH_PANEL_D.getIcon(); - case 4: + } + case 4 -> { return TexturesGtBlock.Casing_Machine_Metal_Sheet_H.getIcon(); - case 5: + } + case 5 -> { return TexturesGtBlock.Casing_Machine_Metal_Sheet_I.getIcon(); - case 6: + } + case 6 -> { return TexturesGtBlock.TEXTURE_TECH_PANEL_H.getIcon(); - case 7: + } + case 7 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.NeutronPulseManipulator.getIcon(); - case 8: + } + case 8 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.CosmicFabricManipulator.getIcon(); - case 9: + } + case 9 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.InfinityInfusedManipulator.getIcon(); - case 10: + } + case 10 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Manipulator_Top.getIcon(); } return TexturesGtBlock.SpaceTimeContinuumRipper.getIcon(); - case 11: + } + case 11 -> { return TexturesGtBlock.NeutronShieldingCore.getIcon(); - case 12: + } + case 12 -> { return TexturesGtBlock.CosmicFabricShieldingCore.getIcon(); - case 13: + } + case 13 -> { return TexturesGtBlock.InfinityInfusedShieldingCore.getIcon(); - case 14: + } + case 14 -> { return TexturesGtBlock.SpaceTimeBendingCore.getIcon(); - case 15: + } + case 15 -> { if (ordinalSide == 0 || ordinalSide == 1) { return TexturesGtBlock.Blank.getIcon(); } return TexturesGtBlock.ForceFieldGlass.getIcon(); + } } } return Textures.BlockIcons.RENDERING_ERROR.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java index f6c53e875e..17b5507416 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocksPipeGearbox.java @@ -15,7 +15,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlocksAbstract { - private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<Integer, Integer>(); + private static HashMap<Integer, Integer> sMaterialMapping = new HashMap<>(); public GregtechMetaCasingBlocksPipeGearbox() { super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.pipesgears", GT_Material_Casings.INSTANCE); @@ -60,24 +60,12 @@ public class GregtechMetaCasingBlocksPipeGearbox extends GregtechMetaCasingBlock public IIcon getIcon(final int ordinalSide, final int meta) { if ((meta >= 0) && (meta < 16)) { switch (meta) { - case 0: - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: + case 0, 1, 2, 3, 4, 5, 6, 7 -> { return TexturesGtBlock.TEXTURE_GEARBOX_GENERIC.getIcon(); - case 8: - case 9: - case 10: - case 11: - case 12: - case 13: - case 14: - case 15: + } + case 8, 9, 10, 11, 12, 13, 14, 15 -> { return TexturesGtBlock.TEXTURE_PIPE_GENERIC.getIcon(); + } } } return Textures.BlockIcons.RENDERING_ERROR.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java index b16868aeb2..a8ea05ddbc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMachineCasings.java @@ -65,16 +65,12 @@ public class GregtechMetaSpecialMachineCasings extends GregtechMetaCasingBlocksA @Override public IIcon getIcon(int ordinalSide, int aMeta) { - switch (aMeta) { - case 0: - return Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon(); - case 2: - return TexturesGtBlock.Casing_Material_Laurenium.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 0 -> Textures.BlockIcons.MACHINE_BRONZEPLATEDBRICKS.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_FROST_PROOF.getIcon(); + case 2 -> TexturesGtBlock.Casing_Material_Laurenium.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_HEATPROOFCASING.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java index 61e74fc56a..411fef65d3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings.java @@ -97,40 +97,24 @@ public class GregtechMetaSpecialMultiCasings extends GregtechMetaCasingBlocksAbs } public static IIcon getStaticIcon(final int ordinalSide, final byte aMeta) { - switch (aMeta) { - case 0: - return TexturesGtBlock.Casing_Redox_1.getIcon(); - case 1: - return Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); - case 2: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); - case 3: - return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); - case 4: - return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); - case 5: - return TexturesGtBlock.Casing_Material_RedSteel.getIcon(); - case 6: - return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); - case 7: - return TexturesGtBlock.Casing_Material_Stellite.getIcon(); - case 8: - return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); - case 9: - return TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon(); - case 10: - return TexturesGtBlock.Casing_Material_Talonite.getIcon(); - case 11: - return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); - case 12: - return TexturesGtBlock.Casing_Redox_5.getIcon(); - case 13: - return TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon(); - case 14: - return TexturesGtBlock.Casing_Material_Talonite.getIcon(); - case 15: - return TexturesGtBlock.Turbine_SC_Material_Casing.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 0 -> TexturesGtBlock.Casing_Redox_1.getIcon(); + case 1 -> Textures.BlockIcons.MACHINE_CASING_TURBINE.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon(); + case 5 -> TexturesGtBlock.Casing_Material_RedSteel.getIcon(); + case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); + case 7 -> TexturesGtBlock.Casing_Material_Stellite.getIcon(); + case 8 -> TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); + case 9 -> TexturesGtBlock.TEXTURE_CASING_FLOTATION.getIcon(); + case 10 -> TexturesGtBlock.Casing_Material_Talonite.getIcon(); + case 11 -> Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); + case 12 -> TexturesGtBlock.Casing_Redox_5.getIcon(); + case 13 -> TexturesGtBlock.TEXTURE_MAGIC_PANEL_B.getIcon(); + case 14 -> TexturesGtBlock.Casing_Material_Talonite.getIcon(); + case 15 -> TexturesGtBlock.Turbine_SC_Material_Casing.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java index 1cc2403973..d9ae7fc1c6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaSpecialMultiCasings2.java @@ -84,24 +84,16 @@ public class GregtechMetaSpecialMultiCasings2 extends GregtechMetaCasingBlocksAb } public static IIcon getStaticIcon(final byte aSide, final byte aMeta) { - switch (aMeta) { - case 0: - return TexturesGtBlock.Casing_Resonance_1.getIcon(); - case 1: - return TexturesGtBlock.Casing_Resonance_2.getIcon(); - case 2: - return TexturesGtBlock.Casing_Resonance_3.getIcon(); - case 3: - return TexturesGtBlock.Casing_Resonance_4.getIcon(); - case 4: - return TexturesGtBlock.Casing_Modulator_1.getIcon(); - case 5: - return TexturesGtBlock.Casing_Modulator_2.getIcon(); - case 6: - return TexturesGtBlock.Casing_Modulator_3.getIcon(); - case 7: - return TexturesGtBlock.Casing_Modulator_4.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 0 -> TexturesGtBlock.Casing_Resonance_1.getIcon(); + case 1 -> TexturesGtBlock.Casing_Resonance_2.getIcon(); + case 2 -> TexturesGtBlock.Casing_Resonance_3.getIcon(); + case 3 -> TexturesGtBlock.Casing_Resonance_4.getIcon(); + case 4 -> TexturesGtBlock.Casing_Modulator_1.getIcon(); + case 5 -> TexturesGtBlock.Casing_Modulator_2.getIcon(); + case 6 -> TexturesGtBlock.Casing_Modulator_3.getIcon(); + case 7 -> TexturesGtBlock.Casing_Modulator_4.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java index c9f748e171..7ddab1c471 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaTieredCasingBlocks1.java @@ -63,7 +63,7 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs GregtechItemList.GTPP_Casing_LuV.set(new ItemStack(this, 1, 6)); GregtechItemList.GTPP_Casing_ZPM.set(new ItemStack(this, 1, 7)); GregtechItemList.GTPP_Casing_UV.set(new ItemStack(this, 1, 8)); - GregtechItemList.GTPP_Casing_MAX.set(new ItemStack(this, 1, 9)); + GregtechItemList.GTPP_Casing_UHV.set(new ItemStack(this, 1, 9)); } @Override @@ -71,20 +71,14 @@ public class GregtechMetaTieredCasingBlocks1 extends GregtechMetaCasingBlocksAbs if (aMeta < 10) { return TexturesGtBlock.TIERED_MACHINE_HULLS[aMeta].getIcon(); } - switch (aMeta) { - case 10: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 11: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 12: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 13: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 14: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 15: - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - } - return Textures.BlockIcons.RENDERING_ERROR.getIcon(); + return switch (aMeta) { + case 10 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 11 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 12 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 13 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 14 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + case 15 -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + default -> Textures.BlockIcons.RENDERING_ERROR.getIcon(); + }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java index ec1ee2a226..3409277f91 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java @@ -13,57 +13,39 @@ public class CasingTextureHandler { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { - switch (aMeta) { + return switch (aMeta) { // Centrifuge - case 0: - return TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); + case 0 -> TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); // Coke Oven Frame - case 1: - return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); + case 1 -> TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); // Coke Oven Casing Tier 1 - case 2: - return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon(); + case 2 -> Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon(); // Coke Oven Casing Tier 2 - case 3: - return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon(); + case 3 -> Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon(); // Material Press Casings - case 4: - return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); + case 4 -> Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); // Electrolyzer Casings - case 5: - return TexturesGtBlock.Casing_Material_Potin.getIcon(); + case 5 -> TexturesGtBlock.Casing_Material_Potin.getIcon(); // Broken Blue Fusion Casings - case 6: - return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); + case 6 -> TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); // Maceration Stack Casings - case 7: - return TexturesGtBlock.Casing_Material_Tumbaga.getIcon(); + case 7 -> TexturesGtBlock.Casing_Material_Tumbaga.getIcon(); // Broken Pink Fusion Casings - case 8: - return TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon(); + case 8 -> TexturesGtBlock.TEXTURE_ORGANIC_PANEL_A_GLOWING.getIcon(); // Matter Fabricator Casings - case 9: - return TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon(); + case 9 -> TexturesGtBlock.TEXTURE_METAL_PANEL_F.getIcon(); // Iron Blast Fuance Textures - case 10: - return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); + case 10 -> TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); // Multitank Exterior Casing - case 11: - return TexturesGtBlock.Casing_Material_Grisium.getIcon(); + case 11 -> TexturesGtBlock.Casing_Material_Grisium.getIcon(); // Reactor Casing I - case 12: - return TexturesGtBlock.Casing_Material_Stellite.getIcon(); + case 12 -> TexturesGtBlock.Casing_Material_Stellite.getIcon(); // Reactor Casing II - case 13: - return TexturesGtBlock.Casing_Material_Zeron100.getIcon(); - case 14: - return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon(); - case 15: - return TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon(); - - default: - return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); - } + case 13 -> TexturesGtBlock.Casing_Material_Zeron100.getIcon(); + case 14 -> TexturesGtBlock.Casing_Staballoy_Firebox.getIcon(); + case 15 -> TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon(); + default -> Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon(); + }; } return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index e02a9ffbd3..1da572fb35 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -9,44 +9,61 @@ public class CasingTextureHandler2 { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { switch (aMeta) { - case 0: + case 0 -> { return TexturesGtBlock.Casing_Material_RedSteel.getIcon(); - case 1: + } + case 1 -> { return TexturesGtBlock.Casing_Material_HastelloyX.getIcon(); - case 2: + } + case 2 -> { return TexturesGtBlock.Casing_Material_HastelloyN.getIcon(); - case 3: + } + case 3 -> { return TexturesGtBlock.Casing_Material_Fluid_IncoloyDS.getIcon(); - case 4: + } + case 4 -> { return TexturesGtBlock.Casing_Material_Grisium.getIcon(); - case 5: + } + case 5 -> { return TexturesGtBlock.Casing_Machine_Metal_Panel_A.getIcon(); - case 6: + } + case 6 -> { return TexturesGtBlock.Casing_Machine_Metal_Grate_A.getIcon(); - case 7: + } + case 7 -> { return TexturesGtBlock.Casing_Redox_1.getIcon(); - case 8: + } + case 8 -> { return TexturesGtBlock.Casing_Machine_Metal_Sheet_A.getIcon(); - case 9: + } + case 9 -> { return TexturesGtBlock.Overlay_Machine_Cyber_A.getIcon(); - case 10: + } + case 10 -> { return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon(); - case 11: + } + case 11 -> { return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); - case 12: + } + case 12 -> { return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon(); - case 13: + } + case 13 -> { if (ordinalSide < 2) { return TexturesGtBlock.TEXTURE_TECH_A.getIcon(); } else { return TexturesGtBlock.TEXTURE_TECH_B.getIcon(); } - case 14: + } + case 14 -> { return Textures.BlockIcons.RENDERING_ERROR.getIcon(); - case 15: + } + case 15 -> { return TexturesGtBlock.Casing_Machine_Acacia_Log.getIcon(); - default: + } + default -> { return TexturesGtBlock.Overlay_UU_Matter.getIcon(); + } } } return TexturesGtBlock._PlaceHolder.getIcon(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index 9ffbbd6a85..6b2627ec39 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -8,55 +8,49 @@ public class CasingTextureHandler3 { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { - switch (aMeta) { - case 0: + return switch (aMeta) { + case 0 -> // Aquatic Casing - return TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon(); - case 1: + TexturesGtBlock.TEXTURE_METAL_PANEL_B.getIcon(); + case 1 -> // Inconel Reinforced Casing - return TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon(); - case 2: + TexturesGtBlock.TEXTURE_METAL_PANEL_D.getIcon(); + case 2 -> // Multi-Use Casing - return TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon(); - case 3: + TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon(); + case 3 -> // Trinium Plated Mining Platform Casing - return TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon(); - case 4: + TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon(); + case 4 -> // Vanadium Redox IV - return TexturesGtBlock.Casing_Redox_2.getIcon(); - case 5: + TexturesGtBlock.Casing_Redox_2.getIcon(); + case 5 -> // Vanadium Redox LuV - return TexturesGtBlock.Casing_Redox_3.getIcon(); - case 6: + TexturesGtBlock.Casing_Redox_3.getIcon(); + case 6 -> // Vanadium Redox ZPM - return TexturesGtBlock.Casing_Redox_4.getIcon(); - case 7: + TexturesGtBlock.Casing_Redox_4.getIcon(); + case 7 -> // Vanadium Redox UV - return TexturesGtBlock.Casing_Redox_5.getIcon(); - case 8: + TexturesGtBlock.Casing_Redox_5.getIcon(); + case 8 -> // Vanadium Redox MAX - return TexturesGtBlock.Casing_Redox_6.getIcon(); - case 9: + TexturesGtBlock.Casing_Redox_6.getIcon(); + case 9 -> // Amazon Warehouse Casing - return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); - case 10: + TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); + case 10 -> // Adv. Vac. Freezer - return TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon(); - case 11: + TexturesGtBlock.TEXTURE_CASING_ADVANCED_CRYOGENIC.getIcon(); + case 11 -> // Adv. EBF - return TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon(); - case 12: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon(); - case 13: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon(); - case 14: - return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon(); - case 15: - return TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon(); - - default: - return TexturesGtBlock._PlaceHolder.getIcon(); - } + TexturesGtBlock.TEXTURE_CASING_ADVANCED_VOLCNUS.getIcon(); + case 12 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II.getIcon(); + case 13 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_II_INNER.getIcon(); + case 14 -> TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_ULTRA.getIcon(); + case 15 -> TexturesGtBlock.TEXTURE_MAGIC_PANEL_A.getIcon(); + default -> TexturesGtBlock._PlaceHolder.getIcon(); + }; } return TexturesGtBlock._PlaceHolder.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java index e33099b09a..b8d5a024df 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler6.java @@ -8,17 +8,12 @@ public class CasingTextureHandler6 { public static IIcon getIcon(final int ordinalSide, final int aMeta) { // Texture ID's. case 0 == ID[57] if ((aMeta >= 0) && (aMeta < 16)) { - switch (aMeta) { - case 0: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III.getIcon(); - case 1: - return TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III_INNER.getIcon(); - case 2: - return TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER.getIcon(); - default: - return TexturesGtBlock._PlaceHolder.getIcon(); - - } + return switch (aMeta) { + case 0 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III.getIcon(); + case 1 -> TexturesGtBlock.TEXTURE_CASING_FUSION_COIL_III_INNER.getIcon(); + case 2 -> TexturesGtBlock.TEXTURE_CASING_FUSION_CASING_HYPER.getIcon(); + default -> TexturesGtBlock._PlaceHolder.getIcon(); + }; } return TexturesGtBlock._PlaceHolder.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java index 8ad5bd914d..f4d0ec0608 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesCentrifugeMultiblock.java @@ -66,8 +66,7 @@ public class TexturesCentrifugeMultiblock { private static int isCentrifugeControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IndustrialCentrifuge && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; @@ -84,7 +83,7 @@ public class TexturesCentrifugeMultiblock { int tInvertLeftRightMod = ordinalSide % 2 * 2 - 1; switch (ordinalSide / 2) { - case 0: + case 0 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -95,8 +94,8 @@ public class TexturesCentrifugeMultiblock { } } } - break; - case 1: + } + case 1 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -107,8 +106,8 @@ public class TexturesCentrifugeMultiblock { } } } - break; - case 2: + } + case 2 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -119,7 +118,7 @@ public class TexturesCentrifugeMultiblock { } } } - break; + } } return TexturesGtBlock.Casing_Material_Centrifuge.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java index f042b88370..fab36fbcea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGrinderMultiblock.java @@ -60,8 +60,7 @@ public class TexturesGrinderMultiblock { private static int isIsaControllerWithSide(IBlockAccess aWorld, int aX, int aY, int aZ, ForgeDirection side) { TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (!(tTileEntity instanceof IGregTechTileEntity)) return 0; - IGregTechTileEntity tTile = (IGregTechTileEntity) tTileEntity; + if (!(tTileEntity instanceof IGregTechTileEntity tTile)) return 0; if (tTile.getMetaTileEntity() instanceof GregtechMetaTileEntity_IsaMill && tTile.getFrontFacing() == side) return tTile.isActive() ? 1 : 2; return 0; @@ -76,7 +75,7 @@ public class TexturesGrinderMultiblock { } int tInvertLeftRightMod = ordinalSide % 2 * 2 - 1; switch (ordinalSide / 2) { - case 0: + case 0 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -87,8 +86,8 @@ public class TexturesGrinderMultiblock { } } } - break; - case 1: + } + case 1 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -99,8 +98,8 @@ public class TexturesGrinderMultiblock { } } } - break; - case 2: + } + case 2 -> { for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { if (i == 0 && j == 0) continue; @@ -111,7 +110,7 @@ public class TexturesGrinderMultiblock { } } } - break; + } } return TexturesGtBlock.TEXTURE_CASING_GRINDING_MILL.getIcon(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java index cac8aa742f..3d71f00514 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java @@ -19,7 +19,7 @@ public class TexturesGtBlock { private static boolean mAnimated = CORE.ConfigSwitches.enableAnimatedTextures; - private static AutoMap<Runnable> mCustomiconMap = new AutoMap<Runnable>(); + private static AutoMap<Runnable> mCustomiconMap = new AutoMap<>(); static {} @@ -276,8 +276,6 @@ public class TexturesGtBlock { public static final CustomIcon Casing_Redox_4 = new CustomIcon("redox/redox4"); public static final CustomIcon Casing_Redox_5 = new CustomIcon("redox/redox5"); public static final CustomIcon Casing_Redox_6 = new CustomIcon("redox/redox6"); - // public static final CustomIcon Casing_Redox_7 = new CustomIcon("redox/redox7"); - // public static final CustomIcon Casing_Redox_8 = new CustomIcon("redox/redox8"); // Special Block 2 public static final CustomIcon Casing_Resonance_1 = new CustomIcon("special/block_1"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java index dfb519a445..7400bb987c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtTools.java @@ -19,8 +19,8 @@ public final class TexturesGtTools { public static final class CustomIcon implements IIconContainer, Runnable { - protected IIcon mIcon, mOverlay; - protected final String mIconName; + private IIcon mIcon, mOverlay; + private final String mIconName; public CustomIcon(final String aIconName) { this.mIconName = aIconName; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java index af80b7c684..d3b8dc3498 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_Overflow.java @@ -46,8 +46,6 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { directionFrom = ForgeDirection.UNKNOWN; tTank1 = (IFluidHandler) aTileEntity; if (tTank1 != null) { - // Logger.INFO("Found Self. "+aSide); - // FluidStack aTankStack = tTank1.drain(ForgeDirection.UNKNOWN, 1, false); FluidStack aTankStack = tTank1.getTankInfo(directionFrom)[0].fluid; if (aTankStack != null) { // Logger.INFO("Found Fluid inside self - "+aTankStack.getLocalizedName()+", overflow point set at @@ -217,8 +215,8 @@ public class GTPP_Cover_Overflow extends GT_CoverBehavior { (warn.get() ? GT_Utility.trans("325", "Max") : GT_Utility.trans("324", "Now")) + ": " + convert(getCoverData()) - + "/" - + mMaxTransferRate + + " / " + + GT_Utility.formatNumbers(mMaxTransferRate) + " " + GT_Utility.trans("323", "L")).color( warn.get() ? COLOR_TEXT_WARN.get() diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java index 44ddf9f6cf..cea96cefea 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/GTPP_Cover_ToggleVisual.java @@ -21,8 +21,8 @@ import gtPlusPlus.core.util.minecraft.PlayerUtils; public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { - private static final Map<String, Integer> sConnectionStateForEntityMap = new ConcurrentHashMap<String, Integer>(); - private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<String, String>(); + private static final Map<String, Integer> sConnectionStateForEntityMap = new ConcurrentHashMap<>(); + private static final Map<String, String> sPrefixMap = new ConcurrentHashMap<>(); private static final int VALUE_OFF = 0; private static final int VALUE_ON = 1; @@ -153,7 +153,7 @@ public class GTPP_Cover_ToggleVisual extends GT_CoverBehavior { return aCoverVar == VALUE_ON; } - private static final void trySetState(ForgeDirection side, int aState, ICoverable aTile) { + private static void trySetState(ForgeDirection side, int aState, ICoverable aTile) { // Try set cover state directly if (aTile instanceof IGregTechTileEntity gTileEntity) { gTileEntity.setCoverDataAtSide(side, new ISerializableObject.LegacyCoverData(aState)); 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(); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java index 1a0a92b2ef..7126cb2480 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaCustomCoverItem.java @@ -65,7 +65,7 @@ public class MetaCustomCoverItem extends Item { return true; } - private final void registerCover() { + private void registerCover() { // CommonProxy.registerItemRendererGlobal(this, new CustomItemBlockRenderer()); for (int i = 0; i < icons.length; i++) { ItemStack thisStack = ItemUtils.simpleMetaStack(this, i, 1); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java index d7eccc0d6b..e8690b155b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java @@ -1,30 +1,18 @@ package gtPlusPlus.xmod.gregtech.common.items; -import static gregtech.api.enums.Textures.BlockIcons.*; -import static gregtech.client.GT_TooltipHandler.Tier.*; +import static gregtech.client.GT_TooltipHandler.Tier.EV; import static gregtech.client.GT_TooltipHandler.registerTieredTooltip; import static gtPlusPlus.core.util.Utils.getTcAspectStack; import gregtech.api.GregTech_API; import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; import gregtech.api.enums.TC_Aspects; import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_MultiTexture; import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_ModHandler; -import gregtech.common.covers.GT_Cover_Arm; -import gregtech.common.covers.GT_Cover_Conveyor; -import gregtech.common.covers.GT_Cover_Pump; -import gregtech.common.items.behaviors.Behaviour_DataOrb; -import gregtech.common.items.behaviors.Behaviour_DataStick; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.data.StringUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -52,12 +40,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { registerCustomCircuits(); - // Simplify life. - registerComponents_ULV(); - // Extruder Shape GregtechItemList.Shape_Extruder_WindmillShaft - .set(this.addItem(tLastID = 40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); + .set(this.addItem(40, "Extruder Shape (Shaft)", "Extruder Shape for making Windmill Shafts")); // Batteries GregtechItemList.Battery_RE_EV_Sodium.set( @@ -65,9 +50,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 50, "Quad Cell Sodium Battery", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L))); this.setElectricStats(32000 + tLastID, 3200000L, GT_Values.V[4], 4L, -3L, true); registerTieredTooltip(GregtechItemList.Battery_RE_EV_Sodium.get(1), EV); @@ -76,9 +61,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 52, "Quad Cell Cadmium Battery", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.METALLUM, 1L), - getTcAspectStack(TC_Aspects.POTENTIA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.METALLUM, 1L), + getTcAspectStack(TC_Aspects.POTENTIA, 1L))); this.setElectricStats(32000 + tLastID, 4800000L, GT_Values.V[4], 4L, -3L, true); registerTieredTooltip(GregtechItemList.Battery_RE_EV_Cadmium.get(1), EV); @@ -87,9 +72,9 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 54, "Quad Cell Lithium Battery", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 3L), - getTcAspectStack(TC_Aspects.METALLUM, 3L), - getTcAspectStack(TC_Aspects.POTENTIA, 3L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 3L), + getTcAspectStack(TC_Aspects.METALLUM, 3L), + getTcAspectStack(TC_Aspects.POTENTIA, 3L))); this.setElectricStats(32000 + tLastID, 6400000L, GT_Values.V[4], 4L, -3L, true); registerTieredTooltip(GregtechItemList.Battery_RE_EV_Lithium.get(1), EV); @@ -101,41 +86,28 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 66, "Proton Cell", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 24L), - getTcAspectStack(TC_Aspects.POTENTIA, 16L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.METALLUM, 24L), + getTcAspectStack(TC_Aspects.POTENTIA, 16L))); this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 20 * 300 / 4, GT_Values.V[6], 6L, -3L, false); GregtechItemList.Battery_Gem_2.set( this.addItem( tLastID = 68, "Electron Cell", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 16L), - getTcAspectStack(TC_Aspects.METALLUM, 32L), - getTcAspectStack(TC_Aspects.POTENTIA, 32L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 16L), + getTcAspectStack(TC_Aspects.METALLUM, 32L), + getTcAspectStack(TC_Aspects.POTENTIA, 32L))); this.setElectricStats(32000 + tLastID, GT_Values.V[7] * 20 * 300 / 4, GT_Values.V[7], 7L, -3L, false); GregtechItemList.Battery_Gem_3.set( this.addItem( tLastID = 70, "Quark Entanglement", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 32L), - getTcAspectStack(TC_Aspects.METALLUM, 48L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 32L), + getTcAspectStack(TC_Aspects.METALLUM, 48L), + getTcAspectStack(TC_Aspects.POTENTIA, 64L))); this.setElectricStats(32000 + tLastID, GT_Values.V[8] * 20 * 300 / 4, GT_Values.V[8], 8L, -3L, false); - // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_1.get(1), "batteryFutureBasic"); - // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_2.get(1), "batteryFutureGood"); - // ItemUtils.addItemToOreDictionary(GregtechItemList.Battery_Gem_3.get(1), "batteryFutureAdvanced"); - - /* - * GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Acid Battery", "Reusable", new - * Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, 1L), - * getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, GT_Values.V[2], 4L, - * -3L, true); GregtechItemList.Battery_RE_EV_Sodium.set(addItem(tLastID = 50, "Quad Cell Mercury Battery", - * "Reusable", new Object[]{getTcAspectStack(TC_Aspects.ELECTRUM, 1L), getTcAspectStack(TC_Aspects.METALLUM, - * 1L), getTcAspectStack(TC_Aspects.POTENTIA, 1L)})); setElectricStats(32000 + tLastID, 5000000L, - * GT_Values.V[2], 4L, -3L, true); - */ // RTG Pellet GregtechItemList.Pellet_RTG_PU238.set( @@ -143,38 +115,38 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { 41, StringUtils.superscript("238") + "Pu Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_SR90.set( this.addItem( 42, StringUtils.superscript("90") + "Sr Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_PO210.set( this.addItem( 43, StringUtils.superscript("210") + "Po Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); GregtechItemList.Pellet_RTG_AM241.set( this.addItem( 44, StringUtils.superscript("241") + "Am Pellet", "", - new Object[] { getTcAspectStack(TC_Aspects.RADIO, 4L), - getTcAspectStack(TC_Aspects.POTENTIA, 2L), - getTcAspectStack(TC_Aspects.METALLUM, 2L) })); + getTcAspectStack(TC_Aspects.RADIO, 4L), + getTcAspectStack(TC_Aspects.POTENTIA, 2L), + getTcAspectStack(TC_Aspects.METALLUM, 2L))); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PU238.get(1), MathUtils.roundToClosestInt(87.7f), 64); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_SR90.get(1), MathUtils.roundToClosestInt(28.8f), 32); CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_PO210.get(1), 1, 512); - CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), MathUtils.roundToClosestInt(432 / 2), 16); + CORE.RA.addFuelForRTG(GregtechItemList.Pellet_RTG_AM241.get(1), 216, 16); CORE.RA.addFuelForRTG(GT_ModHandler.getIC2Item("RTGPellets", 1), MathUtils.roundToClosestInt(2.6f), 8); // Computer Cube @@ -183,95 +155,86 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 55, "Gregtech Computer Cube", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 8L), - getTcAspectStack(TC_Aspects.METALLUM, 8L), - getTcAspectStack(TC_Aspects.POTENTIA, 8L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 8L), + getTcAspectStack(TC_Aspects.METALLUM, 8L), + getTcAspectStack(TC_Aspects.POTENTIA, 8L))); this.setElectricStats(32000 + tLastID, GT_Values.V[6] * 10 * 60 * 20, GT_Values.V[5], 5L, -3L, true); - GregtechItemList.Cover_Overflow_ULV.set( - this.addItem( - 71, - "Overflow Valve (ULV)", - "Maximum void amount: 8,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); GregtechItemList.Cover_Overflow_LV.set( this.addItem( 72, "Overflow Valve (LV)", "Maximum void amount: 64,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_MV.set( this.addItem( 73, "Overflow Valve (MV)", "Maximum void amount: 512,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_HV.set( this.addItem( 74, "Overflow Valve (HV)", "Maximum void amount: 4,096,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_EV.set( this.addItem( 75, "Overflow Valve (EV)", "Maximum void amount: 32,768,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregtechItemList.Cover_Overflow_IV.set( this.addItem( 76, "Overflow Valve (IV)", "Maximum void amount: 262,144,000", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 1L), + getTcAspectStack(TC_Aspects.MACHINA, 1L), + getTcAspectStack(TC_Aspects.ITER, 1L), + getTcAspectStack(TC_Aspects.AQUA, 1L))); GregTech_API.registerCover( - GregtechItemList.Cover_Overflow_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), - new GTPP_Cover_Overflow(8)); - GregTech_API.registerCover( GregtechItemList.Cover_Overflow_LV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[4][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[4][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(64)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_MV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(512)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_HV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[5][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(4096)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_EV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(32768)); GregTech_API.registerCover( GregtechItemList.Cover_Overflow_IV.get(1L), new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[8][0], - new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve) }), + Textures.BlockIcons.MACHINE_CASINGS[8][0], + new GT_RenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)), new GTPP_Cover_Overflow(262144)); // Fusion Reactor MK4 Singularity @@ -294,22 +257,12 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { tLastID = 110, "Graviton Anomaly", "Reusable", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 64L), - getTcAspectStack(TC_Aspects.METALLUM, 64L), - getTcAspectStack(TC_Aspects.POTENTIA, 64L) })); + getTcAspectStack(TC_Aspects.ELECTRUM, 64L), + getTcAspectStack(TC_Aspects.METALLUM, 64L), + getTcAspectStack(TC_Aspects.POTENTIA, 64L))); this.setElectricStats(32000 + tLastID, (64000000000L * 16), GT_Values.V[9], 9L, -3L, false); /* - * Bombs - */ - GregtechItemList.Bomb_Cast.set(this.addItem(111, "Bomb Cast", "Used in the production of Bombs")); - GregtechItemList.Bomb_Cast_Molten.set(this.addItem(112, "Bomb Cast (Hot)", "Consider cooling this off")); - GregtechItemList.Bomb_Cast_Set - .set(this.addItem(113, "Bomb Cast (Set)", "Break it open for the goodies inside!")); - GregtechItemList.Bomb_Cast_Broken.set(this.addItem(114, "Bomb Cast (Broken)", "This is probably just junk")); - GregtechItemList.Bomb_Cast_Mold.set(this.addItem(115, "Mold (Bomb Cast)", "Used in the production of Bombs")); - - /* * High Tier 'Saws' for the tree Farm */ @@ -320,21 +273,20 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { "Allows UV & IF to pass through, blocks visible light spectrums")); int aStartID = 141; - GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_ULV, - GregtechItemList.TransmissionComponent_LV, GregtechItemList.TransmissionComponent_MV, - GregtechItemList.TransmissionComponent_HV, GregtechItemList.TransmissionComponent_EV, - GregtechItemList.TransmissionComponent_IV, GregtechItemList.TransmissionComponent_LuV, - GregtechItemList.TransmissionComponent_ZPM, GregtechItemList.TransmissionComponent_UV, - GregtechItemList.TransmissionComponent_MAX, }; - for (int aIndex = 0; aIndex < 10; aIndex++) { + GregtechItemList[] aTransParts = new GregtechItemList[] { GregtechItemList.TransmissionComponent_LV, + GregtechItemList.TransmissionComponent_MV, GregtechItemList.TransmissionComponent_HV, + GregtechItemList.TransmissionComponent_EV, GregtechItemList.TransmissionComponent_IV, + GregtechItemList.TransmissionComponent_LuV, GregtechItemList.TransmissionComponent_ZPM, + GregtechItemList.TransmissionComponent_UV, GregtechItemList.TransmissionComponent_UHV, }; + for (int aIndex = 0; aIndex < aTransParts.length; aIndex++) { aTransParts[aIndex].set( this.addItem( aStartID++, "Transmission Component (" + GT_Values.VN[aIndex] + ")", "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, aIndex), - getTcAspectStack(TC_Aspects.MACHINA, aIndex), - getTcAspectStack(TC_Aspects.MAGNETO, aIndex) })); + getTcAspectStack(TC_Aspects.ELECTRUM, aIndex), + getTcAspectStack(TC_Aspects.MACHINA, aIndex), + getTcAspectStack(TC_Aspects.MAGNETO, aIndex))); } // Distillus Chip @@ -344,203 +296,26 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { .set(this.addItem(152, "Maceration Upgrade Chip", "Used to upgrade Maceration Stack to Tier 2")); } - private boolean registerComponents_ULV() { - GregtechItemList.Electric_Pump_ULV.set( - this.addItem( - 32, - "Electric Pump (ULV)", - "160 L/sec (as Cover)", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L), - getTcAspectStack(TC_Aspects.AQUA, 1L) })); - GregtechItemList.Electric_Motor_ULV.set( - this.addItem( - 33, - "Electric Motor (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.MOTUS, 1L) })); - GregtechItemList.Conveyor_Module_ULV.set( - this.addItem( - 34, - "Conveyor Module (ULV)", - "1 Stack every 80 secs (as Cover)", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.ITER, 1L) })); - GregtechItemList.Electric_Piston_ULV.set( - this.addItem( - 35, - "Electric Piston (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L) })); - GregtechItemList.Robot_Arm_ULV.set( - this.addItem( - 36, - "Robot Arm (ULV)", - "Inserts into specific Slots (as Cover)", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 2L), getTcAspectStack(TC_Aspects.MOTUS, 1L), - Utils.getTcAspectStack("COGNITIO", 1L) })); - GregtechItemList.Field_Generator_ULV.set( - this.addItem( - 37, - "Field Generator (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 2L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.TUTAMEN, 1L) })); - GregtechItemList.Emitter_ULV.set( - this.addItem( - 38, - "Emitter (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.LUX, 1L) })); - GregtechItemList.Sensor_ULV.set( - this.addItem( - 39, - "Sensor (ULV)", - "", - new Object[] { getTcAspectStack(TC_Aspects.ELECTRUM, 1L), - getTcAspectStack(TC_Aspects.MACHINA, 1L), getTcAspectStack(TC_Aspects.SENSUS, 1L) })); - - GregTech_API.registerCover( - GregtechItemList.Electric_Pump_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[5][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PUMP) }), - new GT_Cover_Pump(8, TextureFactory.of(OVERLAY_PUMP))); - GregTech_API.registerCover( - GregtechItemList.Conveyor_Module_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_CONVEYOR) }), - new GT_Cover_Conveyor(1600, 1, TextureFactory.of(OVERLAY_CONVEYOR))); - GregTech_API.registerCover( - GregtechItemList.Robot_Arm_ULV.get(1L), - new GT_MultiTexture( - new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[1][0], - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_ARM) }), - new GT_Cover_Arm(1600, TextureFactory.of(OVERLAY_ARM))); - - return true; - } - - public boolean registerOldCircuits() { - // Enable Old Circuits - Logger.INFO("[Old Feature - Circuits] Enabling Pre-5.09.28 Circuits and Data Storage."); - - GregtechItemList.Old_Circuit_Primitive.set( - this.addItem( - 200, - "NAND Chip", - "A very simple Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Primitive) })); - GregtechItemList.Old_Circuit_Basic.set( - this.addItem( - 201, - "Basic Electronic Circuit", - "A basic Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Basic) })); - GregtechItemList.Old_Circuit_Good.set( - this.addItem( - 202, - "Good Electronic Circuit", - "A good Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Good) })); - GregtechItemList.Old_Circuit_Advanced.set( - this.addItem( - 203, - "Advanced Circuit", - "An advanced Circuit", - new Object[] { OrePrefixes.circuit.get(Materials.Advanced) })); - GregtechItemList.Old_Circuit_Data.set( - this.addItem( - 204, - "Data Storage Circuit", - "A Data Storage Chip", - new Object[] { OrePrefixes.circuit.get(Materials.Data) })); - GregtechItemList.Old_Circuit_Elite.set( - this.addItem( - 205, - "Data Control Circuit", - "A Processor", - new Object[] { OrePrefixes.circuit.get(Materials.Elite) })); - GregtechItemList.Old_Circuit_Master.set( - this.addItem( - 206, - "Energy Flow Circuit", - "A High Voltage Processor", - new Object[] { OrePrefixes.circuit.get(Materials.Master) })); - - GregtechItemList.Old_Tool_DataOrb.set( - this.addItem( - 207, - "Data Orb [GT++]", - "A High Capacity Data Storage", - new Object[] { OrePrefixes.circuit.get(Materials.Ultimate), SubTag.NO_UNIFICATION, - new Behaviour_DataOrb() })); - GregtechItemList.Old_Circuit_Ultimate.set(GregtechItemList.Old_Tool_DataOrb.get(1L)); - GT_ModHandler.addShapelessCraftingRecipe( - GregtechItemList.Old_Tool_DataOrb.get(1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { GregtechItemList.Old_Tool_DataOrb.get(1L) }); - - GregtechItemList.Old_Tool_DataStick.set( - this.addItem( - 208, - "Data Stick [GT++]", - "A Low Capacity Data Storage", - new Object[] { OrePrefixes.circuit.get(Materials.Data), SubTag.NO_UNIFICATION, - new Behaviour_DataStick() })); - GT_ModHandler.addShapelessCraftingRecipe( - GregtechItemList.Old_Tool_DataStick.get(1L), - GT_ModHandler.RecipeBits.NOT_REMOVABLE, - new Object[] { GregtechItemList.Old_Tool_DataStick.get(1L) }); - - GregtechItemList.Old_Circuit_Board_Basic.set(this.addItem(210, "Basic Circuit Board", "A basic Board")); - GregtechItemList.Old_Circuit_Board_Advanced - .set(this.addItem(211, "Advanced Circuit Board", "An advanced Board")); - GregtechItemList.Old_Circuit_Board_Elite.set(this.addItem(212, "Processor Board", "A Processor Board")); - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite - .set(this.addItem(213, "Engraved Crystal Chip", "Needed for Circuits")); - GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master - .set(this.addItem(214, "Engraved Lapotron Chip", "Needed for Circuits")); - GregtechItemList.Old_Circuit_Parts_Advanced - .set(this.addItem(215, "Advanced Circuit Parts", "Advanced Circuit Parts")); - GregtechItemList.Old_Circuit_Parts_Wiring_Basic - .set(this.addItem(216, "Etched Medium Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Circuit_Parts_Wiring_Advanced - .set(this.addItem(217, "Etched High Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Circuit_Parts_Wiring_Elite - .set(this.addItem(218, "Etched Extreme Voltage Wiring", "Part of Circuit Boards")); - GregtechItemList.Old_Empty_Board_Basic.set(this.addItem(219, "Empty Circuit Board", "A Board Part")); - GregtechItemList.Old_Empty_Board_Elite - .set(this.addItem(220, "Empty Processor Board", "A Processor Board Part")); - - return true; - } - - public boolean registerCustomCircuits() { + public void registerCustomCircuits() { if (CORE.ConfigSwitches.enableCustomCircuits) { GregtechItemList.Circuit_IV.set( this.addItem( 704, "Symbiotic Circuit (IV)", "A Symbiotic Data Processor", - new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic) })); + GregtechOrePrefixes.circuit.get(GT_Materials.Symbiotic))); GregtechItemList.Circuit_LuV.set( this.addItem( 705, "Neutronic Circuit (LuV)", "A Neutron Particle Processor", - new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic) })); + GregtechOrePrefixes.circuit.get(GT_Materials.Neutronic))); GregtechItemList.Circuit_ZPM.set( this.addItem( 706, "Quantum Circuit (ZPM)", "A Singlularity Processor", - new Object[] { GregtechOrePrefixes.circuit.get(GT_Materials.Quantum) })); + GregtechOrePrefixes.circuit.get(GT_Materials.Quantum))); GregtechItemList.Circuit_Board_IV .set(this.addItem(710, "IV Circuit Board", "An IV Voltage Rated Circuit Board")); GregtechItemList.Circuit_Board_LuV @@ -565,8 +340,6 @@ public class MetaGeneratedGregtechItems extends Gregtech_MetaItem_X32 { .set(this.addItem(721, "Etched ZPM Voltage Wiring", "Part of Circuit Boards")); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_IV.get(1), "circuitSuperconductor"); ItemUtils.addItemToOreDictionary(GregtechItemList.Circuit_LuV.get(1), "circuitInfinite"); - return true; } - return false; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java index a07ed2131a..5f39209178 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechTools.java @@ -6,14 +6,10 @@ import gregtech.api.enums.ToolDictNames; import gregtech.api.items.GT_MetaGenerated_Tool; import gtPlusPlus.xmod.gregtech.api.enums.GregtechToolDictNames; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_AngleGrinder; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricButcherKnife; -import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricLighter; import gtPlusPlus.xmod.gregtech.common.tools.TOOL_Gregtech_ElectricSnips; public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { - public static final short ELECTRIC_LIGHTER = 7534; - public static final short ELECTRIC_BUTCHER_KNIFE = 7634; public static final short ANGLE_GRINDER = 7834; public static final short ELECTRIC_SNIPS = 7934; public static GT_MetaGenerated_Tool INSTANCE; @@ -35,10 +31,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Angle Grinder", "Hand-held electric filing device", new TOOL_Gregtech_AngleGrinder(), - new Object[] { GregtechToolDictNames.craftingToolAngleGrinder, ToolDictNames.craftingToolFile, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); + GregtechToolDictNames.craftingToolAngleGrinder, + ToolDictNames.craftingToolFile, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L)); // Electric Wire Cutter GregTech_API.registerWireCutter( @@ -47,32 +44,11 @@ public class MetaGeneratedGregtechTools extends GT_MetaGenerated_Tool { "Automatic Snips", "Hand-held electric wire cutter", new TOOL_Gregtech_ElectricSnips(), - new Object[] { GregtechToolDictNames.craftingToolElectricSnips, - ToolDictNames.craftingToolWireCutter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L) })); + GregtechToolDictNames.craftingToolElectricSnips, + ToolDictNames.craftingToolWireCutter, + new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 4L), + new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 4L))); - // Electric Lighter - this.addTool( - ELECTRIC_LIGHTER, - "Pyromatic 9k", - "Electric Fire!", - new TOOL_Gregtech_ElectricLighter(), - new Object[] { GregtechToolDictNames.craftingToolElectricLighter, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); - - // Electric Butcher Knife - this.addTool( - ELECTRIC_BUTCHER_KNIFE, - "Meat-o-matic", - "Electric butcher knife", - new TOOL_Gregtech_ElectricButcherKnife(), - new Object[] { GregtechToolDictNames.craftingToolElectricButcherKnife, ToolDictNames.craftingToolKnife, - new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 1L), - new TC_Aspects.TC_AspectStack(TC_Aspects.FABRICO, 2L), - new TC_Aspects.TC_AspectStack(TC_Aspects.ORDO, 2L) }); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java index a7c23c69fc..6a5bfb7838 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Choocher.java @@ -11,7 +11,6 @@ import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_LanguageManager; import gregtech.common.items.behaviors.Behaviour_None; import gregtech.common.items.behaviors.Behaviour_Wrench; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; @@ -48,7 +47,7 @@ public class Behaviour_Choocher extends Behaviour_None { } if (aPlayer.isSneaking()) { - boolean aModeNew = Utils.invertBoolean(inWrenchMode); + boolean aModeNew = !inWrenchMode; aStack.getTagCompound().setBoolean("aMode", aModeNew); PlayerUtils.messagePlayer(aPlayer, "Mode: " + (aModeNew ? "Wrench" : "Hammer")); return true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java index db3638a4e0..6a4bd010fb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/behaviours/Behaviour_Electric_Lighter.java @@ -20,7 +20,6 @@ import gregtech.common.items.behaviors.Behaviour_None; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.entity.projectile.EntityLightningAttack; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.NBTUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.common.helpers.ChargingHelper; @@ -70,7 +69,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.INFO("Changing Mode"); boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode"); Logger.INFO("Is currently in Fireball mode? " + aCurrentMode); - boolean aNewMode = Utils.invertBoolean(aCurrentMode); + boolean aNewMode = !aCurrentMode; Logger.INFO("Is now set to Fireball mode? " + aNewMode); aStack.getTagCompound().setBoolean("aFireballMod", aNewMode); // NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode); @@ -123,7 +122,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.INFO("Changing Mode"); boolean aCurrentMode = NBTUtils.getBoolean(aStack, "aFireballMode"); Logger.INFO("Is currently in Fireball mode? " + aCurrentMode); - boolean aNewMode = Utils.invertBoolean(aCurrentMode); + boolean aNewMode = !aCurrentMode; Logger.INFO("Is now set to Fireball mode? " + aNewMode); aStack.getTagCompound().setBoolean("aFireballMode", aNewMode); // NBTUtils.setBoolean(aStack, "aFireballMode", aNewMode); @@ -176,9 +175,8 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { Logger.WARNING("Preparing Lighter 2"); if (ChargingHelper.isItemValid(aStack)) { Logger.WARNING("Preparing Lighter 3"); - if (aStack.getItem() instanceof IElectricItemManager) { + if (aStack.getItem() instanceof IElectricItemManager aItemElec) { Logger.WARNING("Preparing Lighter 4"); - IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem(); double aCharge = aItemElec.getCharge(aStack); long aEuCost = 4096 * 2; if (aCharge >= aEuCost) { @@ -203,8 +201,7 @@ public class Behaviour_Electric_Lighter extends Behaviour_None { if (aStack != null) { if (aStack.getItem() instanceof MetaGeneratedGregtechTools) { if (ChargingHelper.isItemValid(aStack)) { - if (aStack.getItem() instanceof IElectricItemManager) { - IElectricItemManager aItemElec = (IElectricItemManager) aStack.getItem(); + if (aStack.getItem() instanceof IElectricItemManager aItemElec) { double aCharge = aItemElec.getCharge(aStack); long aEuCost = 4096 * 2; aUses = (int) (aCharge / aEuCost); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java index ae3a40cff9..6344632a6b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_CapeRenderer.java @@ -45,7 +45,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { mInit = init(); } - private final boolean init() { + private boolean init() { if (mInit) { return false; } @@ -165,7 +165,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } } - private final boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) { + private boolean renderCapeOnPlayer(RenderPlayerEvent.Specials.Pre aEvent, AbstractClientPlayer aPlayer) { float aPartialTicks = aEvent.partialRenderTick; try { if (tResource == null && CORE.DEVENV) { @@ -174,7 +174,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { // If player is invisible, don't render. if (GT_Utility.getFullInvisibility(aPlayer) || aPlayer.isInvisible() - || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id).intValue())) { + || GT_Utility.getPotion(aPlayer, Integer.valueOf(Potion.invisibility.id))) { aEvent.setCanceled(true); return false; } @@ -235,13 +235,13 @@ public class GTPP_CapeRenderer extends RenderPlayer { private static AES sAES; // UUID - Username - private static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<Pair<String, String>>(); - private static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<Pair<String, String>>(); + private static final AutoMap<Pair<String, String>> mOrangeCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mMiscCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mBetaTestCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mPatreonCapes = new AutoMap<>(); + private static final AutoMap<Pair<String, String>> mDevCapes = new AutoMap<>(); - private static final boolean init() { + private static boolean init() { CapeUtils.handleOldCapeCache(); if (CORE.DEVENV) { return true; @@ -267,7 +267,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - private static final boolean isCapeCacheWeekOld() { + private static boolean isCapeCacheWeekOld() { if (!doesCapeCacheExistLocally()) { return true; } else { @@ -281,7 +281,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - private static final void downloadCapeList() { + private static void downloadCapeList() { try { File dat = getCapeCache(); File temp = allocateTempFile(); @@ -297,7 +297,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } } - private static final boolean isDownloadedCapeListBigger(File aFile) { + private static boolean isDownloadedCapeListBigger(File aFile) { double aExistingFileSize = (doesCapeCacheExistLocally() ? getCapeCache().length() : 0); double aNewFileSize = aFile.length(); if (aNewFileSize > aExistingFileSize) { @@ -313,7 +313,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { } } - private static final boolean doesCapeCacheExistLocally() { + private static boolean doesCapeCacheExistLocally() { File aCacheFile = FileUtils.getFile("CapeCache", "dat"); if (FileUtils.doesFileExist(aCacheFile)) { return true; @@ -321,7 +321,7 @@ public class GTPP_CapeRenderer extends RenderPlayer { return false; } - private static final File getCapeCache() { + private static File getCapeCache() { File aCacheFile = FileUtils.getFile("CapeCache", "dat"); if (FileUtils.doesFileExist(aCacheFile)) { FileUtils.createFile(aCacheFile); @@ -335,10 +335,10 @@ public class GTPP_CapeRenderer extends RenderPlayer { if (aCache != null && !aCache.isEmpty()) { return aCache; } - return new AutoMap<String>(); + return new AutoMap<>(); } - private static final File allocateTempFile() { + private static File allocateTempFile() { File tempFile = null; try { tempFile = File.createTempFile("gtpp-", null); @@ -359,16 +359,16 @@ public class GTPP_CapeRenderer extends RenderPlayer { if (sAES == null) { sAES = new AES(); } - AutoMap<String> aDecodedData = new AutoMap<String>(); + AutoMap<String> aDecodedData = new AutoMap<>(); for (String aToDecode : aCacheData) { aDecodedData.put(sAES.decode(aToDecode)); } if (!aDecodedData.isEmpty()) { - AutoMap<Pair<String, String>> aCapeType1 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType2 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType3 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType4 = new AutoMap<Pair<String, String>>(); - AutoMap<Pair<String, String>> aCapeType5 = new AutoMap<Pair<String, String>>(); + AutoMap<Pair<String, String>> aCapeType1 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType2 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType3 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType4 = new AutoMap<>(); + AutoMap<Pair<String, String>> aCapeType5 = new AutoMap<>(); boolean didProcessStringData = false; Logger.INFO("Decoded String Count: " + aDecodedData.size()); for (String aToSplit : aDecodedData) { @@ -378,55 +378,54 @@ public class GTPP_CapeRenderer extends RenderPlayer { Integer aCapeTypeID2 = Integer.parseInt(aSplitData[0]); if (aCapeTypeID2 != null) { int aCapeTypeID = aCapeTypeID2; - Pair<String, String> aFinalString = new Pair<String, String>( + Pair<String, String> aFinalString = new Pair<>( "UUID: " + aSplitData[1], "Username: " + (aSplitData[2] != null && aSplitData[0].length() > 0 ? aSplitData[2] : "Not Specified")); Logger.INFO("Cape Type: " + aCapeTypeID); switch (aCapeTypeID) { - case 0: + case 0 -> { aCapeType1.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType1.size() + " users."); - break; - case 1: + } + case 1 -> { aCapeType2.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType2.size() + " users."); - break; - case 2: + } + case 2 -> { aCapeType3.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType3.size() + " users."); - break; - case 3: + } + case 3 -> { aCapeType4.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType4.size() + " users."); - break; - case 4: + } + case 4 -> { aCapeType5.add(aFinalString); Logger.INFO( "Added user to map " + aCapeTypeID + ", map now holds " + aCapeType5.size() + " users."); - break; - default: - break; + } + default -> {} } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java index b3fe3dd935..9b4962fea7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/render/GTPP_Render_MachineBlock.java @@ -1079,9 +1079,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderYNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1101,9 +1101,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderYPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderYPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1124,9 +1124,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { aRenderer.flipTexture = !aFullBlock; if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderZNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1146,9 +1146,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderZPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderZPos(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1168,9 +1168,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { } if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderXNeg(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXNeg(aRenderer, aBlock, aX, aY, aZ); } } } @@ -1191,9 +1191,9 @@ public class GTPP_Render_MachineBlock extends GT_Renderer_Block { aRenderer.flipTexture = !aFullBlock; if (aIcon != null) { - for (int i = 0; i < aIcon.length; ++i) { - if (aIcon[i] != null) { - aIcon[i].renderXPos(aRenderer, aBlock, aX, aY, aZ); + for (ITexture iTexture : aIcon) { + if (iTexture != null) { + iTexture.renderXPos(aRenderer, aBlock, aX, aY, aZ); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java index 8c7ca4c9e1..886500457b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricAutoWorkbench.java @@ -260,7 +260,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mCurrentSlot = (mCurrentSlot + 1) % 18; } switch (mMode) { - case 0: + case 0 -> { if (mInventory[mCurrentSlot] != null && !isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2 && mCurrentSlot < 8) { @@ -277,8 +277,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tRecipe[i].stackSize = 1; } } - break; - case 1: + } + case 1 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -308,10 +308,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 2: + } + case 2 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -329,10 +328,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 3: + } + case 3 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -353,10 +351,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 4: + } + case 4 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -382,10 +379,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 5: + } + case 5 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -397,11 +393,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; tRecipe[0] = tTempStack; - tOutput = GT_OreDictUnificator.get(true, tTempStack); - if (tOutput != null && GT_Utility.areStacksEqual(tOutput, tTempStack)) tOutput = null; - if (tOutput == null) { tRecipe[0] = null; if (mInventory[18] == null) { @@ -410,15 +403,14 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mTicksUntilNextUpdate = 1; } } - break; - case 6: + } + case 6 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } else if (OrePrefixes.dustSmall.contains(mInventory[mCurrentSlot])) { tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); tTempStack.stackSize = 1; @@ -433,7 +425,6 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } } else if (OrePrefixes.dustTiny.contains(mInventory[mCurrentSlot])) { tTempStack = GT_Utility.copy(mInventory[mCurrentSlot]); @@ -454,7 +445,6 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } } else { if (mInventory[18] == null && mThroughPut < 2) { @@ -462,10 +452,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 7: + } + case 7 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot]) || !OrePrefixes.nugget.contains(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { @@ -492,10 +481,9 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B mInventory[mCurrentSlot] = null; mTicksUntilNextUpdate = 1; } - break; } - break; - case 8: + } + case 8 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot]) || mInventory[mCurrentSlot].getItemDamage() <= 0 || !mInventory[mCurrentSlot].getItem().isRepairable()) { @@ -525,8 +513,8 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B break; } } - break; - case 9: + } + case 9 -> { if (isItemTypeOrItsEmptyLiquidContainerInCraftingGrid(mInventory[mCurrentSlot])) { if (mInventory[18] == null && mThroughPut < 2) { mInventory[18] = mInventory[mCurrentSlot]; @@ -547,7 +535,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } } if (tRecipe[1] == null) tRecipe[0] = null; - break; + } } } @@ -677,13 +665,13 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } private ArrayList<ItemStack> recipeContent(ItemStack[] tRecipe) { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tList = new ArrayList<>(); for (byte i = 0; i < 9; i++) { if (tRecipe[i] != null) { boolean temp = false; - for (byte j = 0; j < tList.size(); j++) { - if (GT_Utility.areStacksEqual(tRecipe[i], tList.get(j))) { - tList.get(j).stackSize++; + for (ItemStack itemStack : tList) { + if (GT_Utility.areStacksEqual(tRecipe[i], itemStack)) { + itemStack.stackSize++; temp = true; break; } @@ -695,7 +683,7 @@ public class GT_MetaTileEntity_ElectricAutoWorkbench extends GT_MetaTileEntity_B } private ArrayList<ItemStack> benchContent() { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> tList = new ArrayList<>(); for (byte i = 0; i < 18; i++) { if (mInventory[i] != null) { boolean temp = false; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java deleted file mode 100644 index 2c9a50dfa5..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_ElectricInventoryManager.java +++ /dev/null @@ -1,686 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.automation; - -import static net.minecraftforge.common.util.ForgeDirection.DOWN; -import static net.minecraftforge.common.util.ForgeDirection.EAST; -import static net.minecraftforge.common.util.ForgeDirection.NORTH; -import static net.minecraftforge.common.util.ForgeDirection.SOUTH; -import static net.minecraftforge.common.util.ForgeDirection.UP; -import static net.minecraftforge.common.util.ForgeDirection.WEST; - -import java.util.ArrayList; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.oredict.OreDictionary; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.ModularUITextures; -import com.gtnewhorizons.modularui.api.drawable.IDrawable; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.ButtonWidget; -import com.gtnewhorizons.modularui.common.widget.DrawableWidget; -import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.modularui.IAddUIWidgets; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_ItemStack; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GT_MetaTileEntity_ElectricInventoryManager extends GT_MetaTileEntity_TieredMachineBlock - implements IAddGregtechLogo, IAddUIWidgets { - - public int[] mSlotRange = new int[4]; - public boolean mWorkedLastTick = false; - protected String mLocalName; - - public GT_MetaTileEntity_ElectricInventoryManager(final int aID, final int aTier, final String aDescription) { - super( - aID, - "basicmachine.automation.inventorymanager.0" + aTier, - "Electric Inventory Manager (" + GT_Values.VN[aTier] + ")", - aTier, - 16, - aDescription); - mLocalName = "Auto Workbench (" + GT_Values.VN[aTier] + ")"; - } - - public GT_MetaTileEntity_ElectricInventoryManager(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, 16, aDescription, aTextures); - } - - @Override - public boolean isTransformerUpgradable() { - return true; - } - - @Override - public boolean isOverclockerUpgradable() { - return false; - } - - @Override - public boolean isSimpleMachine() { - return false; - } - - @Override - public boolean isFacingValid(ForgeDirection facing) { - return true; - } - - @Override - public boolean isEnetInput() { - return true; - } - - @Override - public boolean isEnetOutput() { - return true; - } - - @Override - public long maxEUInput() { - return GT_Values.V[mTier]; - } - - @Override - public long maxEUOutput() { - return GT_Values.V[mTier]; - } - - @Override - public long getMinimumStoredEU() { - return GT_Values.V[this.mTier]; - } - - @Override - public long maxEUStore() { - return GT_Values.V[this.mTier] * (this.mTier * GT_Values.V[this.mTier]); - } - - @Override - public long maxAmperesIn() { - return 4; - } - - @Override - public long maxAmperesOut() { - return 4; - } - - @Override - public boolean isValidSlot(int aIndex) { - return aIndex < 3; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return !isOutputFacing(side); - } - - @Override - public boolean isOutputFacing(ForgeDirection side) { - for (int i = 0; i < mSlotRange.length; i++) { - if (side == getRangeDirection(i) && getRangeEnergy(i)) { - return true; - } - } - return false; - } - - @Override - public int getSizeInventory() { - return 16; - } - - @Override - public boolean isAccessAllowed(EntityPlayer aPlayer) { - return true; - } - - @Override - public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - return true; - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ElectricInventoryManager( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - aNBT.setInteger("mSlotRange0", mSlotRange[0]); - aNBT.setInteger("mSlotRange1", mSlotRange[1]); - aNBT.setInteger("mSlotRange2", mSlotRange[2]); - aNBT.setInteger("mSlotRange3", mSlotRange[3]); - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - mSlotRange[0] = aNBT.getInteger("mSlotRange0"); - mSlotRange[1] = aNBT.getInteger("mSlotRange1"); - mSlotRange[2] = aNBT.getInteger("mSlotRange2"); - mSlotRange[3] = aNBT.getInteger("mSlotRange3"); - } - - public void iterateRangeDirection(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~7) | (((mSlotRange[aIndex] & 7) + 1) % 6); - } - - public void switchRangeEnergy(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~8) | ((mSlotRange[aIndex] & 8) > 0 ? 0 : 8); - } - - public void iterateSlot1Direction(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~112) | (((((mSlotRange[aIndex] & 112) >> 4) + 1) % 6) << 4); - } - - public void iterateSlot2Direction(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~896) | (((((mSlotRange[aIndex] & 896) >> 7) + 1) % 6) << 7); - } - - public void iterateSlot3Direction(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~7168) | (((((mSlotRange[aIndex] & 7168) >> 10) + 1) % 6) << 10); - } - - public void switchSlot1InOut(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~8192) | ((mSlotRange[aIndex] & 8192) > 0 ? 0 : 8192); - } - - public void switchSlot2InOut(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~16384) | ((mSlotRange[aIndex] & 16384) > 0 ? 0 : 16384); - } - - public void switchSlot3InOut(int aIndex) { - mSlotRange[aIndex] = (mSlotRange[aIndex] & ~32768) | ((mSlotRange[aIndex] & 32768) > 0 ? 0 : 32768); - } - - public ForgeDirection getRangeDirection(int aIndex) { - return ForgeDirection.getOrientation(mSlotRange[aIndex] & 7); - } - - public ForgeDirection getSlot1Direction(int aIndex) { - return ForgeDirection.getOrientation((mSlotRange[aIndex] & 112) >> 4); - } - - public ForgeDirection getSlot2Direction(int aIndex) { - return ForgeDirection.getOrientation((mSlotRange[aIndex] & 896) >> 7); - } - - public ForgeDirection getSlot3Direction(int aIndex) { - return ForgeDirection.getOrientation((mSlotRange[aIndex] & 7168) >> 10); - } - - public boolean getRangeEnergy(int aIndex) { - return (mSlotRange[aIndex] & 8) > 0; - } - - public boolean getSlot1InOut(int aIndex) { - return (mSlotRange[aIndex] & 8192) > 0; - } - - public boolean getSlot2InOut(int aIndex) { - return (mSlotRange[aIndex] & 16384) > 0; - } - - public boolean getSlot3InOut(int aIndex) { - return (mSlotRange[aIndex] & 32768) > 0; - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - if (getBaseMetaTileEntity().isAllowedToWork() && getBaseMetaTileEntity().isServerSide() - && getBaseMetaTileEntity().getUniversalEnergyStored() >= 5000 - && (getBaseMetaTileEntity().hasWorkJustBeenEnabled() || getBaseMetaTileEntity().getTimer() % 100 == 0 - || mWorkedLastTick - || getBaseMetaTileEntity().hasInventoryBeenModified())) { - mWorkedLastTick = false; - - IInventory[] tTileEntities = new IInventory[] { getBaseMetaTileEntity().getIInventoryAtSide(DOWN), - getBaseMetaTileEntity().getIInventoryAtSide(UP), getBaseMetaTileEntity().getIInventoryAtSide(NORTH), - getBaseMetaTileEntity().getIInventoryAtSide(SOUTH), - getBaseMetaTileEntity().getIInventoryAtSide(WEST), - getBaseMetaTileEntity().getIInventoryAtSide(EAST), null, null }; - - int tCost = 0; - - for (int i = 0; i < 4; i++) { - final int ordinalRangeDirection = getRangeDirection(i).ordinal(); - if (tTileEntities[ordinalRangeDirection] != null) { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); - ItemStack tStack; - tList.add(null); - - tStack = mInventory[3 + i * 3 + 0]; - if (tStack == null) { - if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot1Direction(i), - getSlot1Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot1Direction(i), - getSlot1Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else { - tList.set(0, tStack); - if (getSlot1InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot1Direction(i), - getSlot1Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot1Direction(i), - getSlot1Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - } - - tStack = mInventory[3 + i * 3 + 1]; - if (tStack == null) { - if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot2Direction(i), - getSlot2Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot2Direction(i), - getSlot2Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else { - tList.set(0, tStack); - if (getSlot2InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot2Direction(i), - getSlot2Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot2Direction(i), - getSlot2Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - } - - tStack = mInventory[3 + i * 3 + 2]; - if (tStack == null) { - if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot3Direction(i), - getSlot3Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot3Direction(i), - getSlot3Direction(i), - null, - false, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } else { - tList.set(0, tStack); - if (getSlot3InOut(i)) tCost += 5 * GT_Utility.moveOneItemStack( - getBaseMetaTileEntity(), - tTileEntities[ordinalRangeDirection], - getSlot3Direction(i), - getSlot3Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - else tCost += 5 * GT_Utility.moveOneItemStack( - tTileEntities[ordinalRangeDirection], - getBaseMetaTileEntity(), - getSlot3Direction(i), - getSlot3Direction(i), - tList, - false, - (byte) tStack.stackSize, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - } - - if (tCost > 0) { - mWorkedLastTick = true; - getBaseMetaTileEntity().decreaseStoredEnergyUnits(tCost, true); - } - } - } - - @Override - public String[] getDescription() { - return ArrayUtils - .addAll(this.mDescriptionArray, "It's simpler than you think. I promise.", CORE.GT_Tooltip.get()); - } - - @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { - return false; - } - - @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return true; - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return true; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[16][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getBottom(i); - rTextures[1][i + 1] = this.getTop(i); - rTextures[2][i + 1] = this.getNegativeZ(i); - rTextures[3][i + 1] = this.getPositiveZ(i); - rTextures[4][i + 1] = this.getNegativeX(i); - rTextures[5][i + 1] = this.getPositiveX(i); - rTextures[6][i + 1] = this.getBottomRedstone(i); - rTextures[7][i + 1] = this.getTopRedstone(i); - rTextures[8][i + 1] = this.getNegativeZRedstone(i); - rTextures[9][i + 1] = this.getPositiveZRedstone(i); - rTextures[10][i + 1] = this.getNegativeXRedstone(i); - rTextures[11][i + 1] = this.getPositiveXRedstone(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[!aRedstone ? side.ordinal() : side.ordinal() + 6][aColorIndex < 0 ? 0 : aColorIndex]; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red) }; - } - - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green) }; - } - - public ITexture[] getNegativeZ(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue) }; - } - - public ITexture[] getPositiveZ(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan) }; - } - - public ITexture[] getNegativeX(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple) }; - } - - public ITexture[] getPositiveX(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow) }; - } - - public ITexture[] getBottomRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Red_Redstone) }; - } - - public ITexture[] getTopRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Green_Redstone) }; - } - - public ITexture[] getNegativeZRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Blue_Redstone) }; - } - - public ITexture[] getPositiveZRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Cyan_Redstone) }; - } - - public ITexture[] getNegativeXRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Purple_Redstone) }; - } - - public ITexture[] getPositiveXRedstone(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_InventoryManagaer_Yellow_Redstone) }; - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addGregTechLogo(ModularWindow.Builder builder) { - builder.widget( - new DrawableWidget().setDrawable(getGUITextureSet().getGregTechLogo()).setSize(17, 17).setPos(154, 59)); - } - - // Internal copy of values stored in this tile. Client will use these to render stuff. - private final int[] mTargetDirections = new int[12]; - private final int[] mRangeDirections = new int[4]; - private final boolean[] mTargetInOut = new boolean[12]; - private final boolean[] mTargetEnergy = new boolean[4]; - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - for (int i = 0; i < 3; i++) { - builder.widget( - new SlotWidget(inventoryHandler, i) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_CHEST) - .setPos(154, 4 + i * 18)); - } - - int[] slotXPositions = new int[] { 4, 60, 79, 135 }; - for (int i = 0; i < 12; i++) { - final int index = i; - builder.widget(new SlotWidget(new BaseSlot(inventoryHandler, i + 3, true)) { - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - super.phantomClick(clickData, cursorStack); - if (clickData.mouseButton != 0 && cursorStack != null && getMcSlot().getHasStack()) { - getMcSlot().getStack().setItemDamage(OreDictionary.WILDCARD_VALUE); - } - } - }.setControlsAmount(true).disableShiftInsert().setBackground(() -> { - if (index % 3 == 0) { - return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]], - GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_COLOR[mRangeDirections[index / 3]] }; - } else if (index % 3 == 1) { - return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]], - GTPP_UITextures.OVERLAY_SLOT_INVENTORY_MANAGER_ARROW[mRangeDirections[index / 3]] }; - } else { - return new IDrawable[] { GTPP_UITextures.SLOT_INVENTORY_MANAGER[mRangeDirections[index / 3]] }; - } - }).setPos(slotXPositions[i / 3], 4 + (i % 3) * 18)); - } - for (int i = 0; i < 4; i++) { - final int index = i; - builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> switchRangeEnergy(index)).setBackground( - () -> new IDrawable[] { - mTargetEnergy[index] ? ModularUITextures.ITEM_SLOT : GT_UITextures.BUTTON_STANDARD, - GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY }) - .setPos(slotXPositions[i], 59).setSize(18, 18)); - } - - int[] buttonXPositions = new int[] { 23, 41, 98, 116 }; - for (int i = 0; i < 12; i++) { - final int index = i; - builder.widget(new ButtonWidget().setOnClick((clickData, widget) -> { - if (index % 3 == 0) { - if (clickData.mouseButton != 0) { - switchSlot1InOut(index / 3); - } else { - iterateSlot1Direction(index / 3); - } - } else if (index % 3 == 1) { - if (clickData.mouseButton != 0) { - switchSlot2InOut(index / 3); - } else { - iterateSlot2Direction(index / 3); - } - } else { - if (clickData.mouseButton != 0) { - switchSlot3InOut(index / 3); - } else { - iterateSlot3Direction(index / 3); - } - } - }).setBackground( - () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD, - GTPP_UITextures.OVERLAY_BUTTON_DIRECTION[mTargetDirections[index]], - mTargetInOut[index] ? GTPP_UITextures.OVERLAY_BUTTON_TIP_RED - : GTPP_UITextures.OVERLAY_BUTTON_TIP_GREEN }) - .setPos(buttonXPositions[i / 3], 4 + (i % 3) * 18).setSize(18, 18)); - } - for (int i = 0; i < 4; i++) { - final int index = i; - builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> iterateRangeDirection(index)) - .setBackground( - () -> new IDrawable[] { GT_UITextures.BUTTON_STANDARD, - GTPP_UITextures.OVERLAY_BUTTON_DIRECTION_GRAY[mRangeDirections[index]] }) - .setPos(buttonXPositions[i], 59).setSize(18, 18)); - } - - for (int i = 0; i < mTargetDirections.length; i++) { - final int index = i; - builder.widget(new FakeSyncWidget.IntegerSyncer(() -> { - if (index % 3 == 0) { - return getSlot1Direction(index / 3).ordinal(); - } else if (index % 3 == 1) { - return getSlot2Direction(index / 3).ordinal(); - } else { - return getSlot3Direction(index / 3).ordinal(); - } - }, val -> mTargetDirections[index] = val)); - } - for (int i = 0; i < mRangeDirections.length; i++) { - final int index = i; - builder.widget( - new FakeSyncWidget.IntegerSyncer( - () -> getRangeDirection(index).ordinal(), - val -> mRangeDirections[index] = val)); - } - for (int i = 0; i < mTargetInOut.length; i++) { - final int index = i; - builder.widget(new FakeSyncWidget.BooleanSyncer(() -> { - if (index % 3 == 0) { - return getSlot1InOut(index / 3); - } else if (index % 3 == 1) { - return getSlot2InOut(index / 3); - } else { - return getSlot3InOut(index / 3); - } - }, val -> mTargetInOut[index] = val)); - } - for (int i = 0; i < mTargetEnergy.length; i++) { - final int index = i; - builder.widget( - new FakeSyncWidget.BooleanSyncer(() -> getRangeEnergy(index), val -> mTargetEnergy[index] = val)); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java index 2427cb12ae..25609343d3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractGenerator.java @@ -245,29 +245,30 @@ public class GT_MetaTileEntity_TesseractGenerator extends GT_MetaTileEntity_Basi if (side == this.getBaseMetaTileEntity().getFrontFacing()) { final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { - case 0: + case 0 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 64; - break; - case 1: + } + case 1 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 64; - break; - case 2: + } + case 2 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 512; - break; - case 3: + } + case 3 -> { try { CORE.sTesseractGeneratorOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 512; + } } if (getGeneratorEntity(this.mFrequency) != null && getGeneratorEntity(this.mFrequency) != this) { GT_Utility.sendChatToPlayer( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java index 18314c059f..5b305950ff 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/automation/GT_MetaTileEntity_TesseractTerminal.java @@ -198,29 +198,30 @@ public class GT_MetaTileEntity_TesseractTerminal extends GT_MetaTileEntity_Basic if (side == this.getBaseMetaTileEntity().getFrontFacing()) { final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { - case 0: + case 0 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 64; - break; - case 1: + } + case 1 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 64; - break; - case 2: + } + case 2 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency -= 512; - break; - case 3: + } + case 3 -> { try { CORE.sTesseractTerminalOwnershipMap.get(mOwner).remove(this.mFrequency); } catch (Throwable t) {} this.mFrequency += 512; + } } GT_Utility.sendChatToPlayer( aPlayer, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java index ee85b16f5f..95c5a7eeaf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java @@ -88,8 +88,6 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler { } else { return new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE); } - // return new - // GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java index 3b54fb46a7..cca69bc5d5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GregtechMetaTileEntity_RTG.java @@ -128,7 +128,9 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator if (this.mInventory[getStackDisplaySlot()] == null) this.mInventory[getStackDisplaySlot()] = new ItemStack(Blocks.fire, 1); this.mInventory[getStackDisplaySlot()].setStackDisplayName( - "Generating: " + (aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + "Generating: " + + GT_Utility.formatNumbers( + aBaseMetaTileEntity.getUniversalEnergyStored() - getMinimumStoredEU()) + " EU"); } } else { @@ -177,8 +179,8 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mDescriptionArray, "Fuel is measured in minecraft days (Check with Scanner)", "RTG changes output voltage depending on fuel", - "Generates power at " + this.getEfficiency() + "% Efficiency per tick", - "Output Voltage: " + this.getOutputTier() + " EU/t", + "Generates power at " + GT_Utility.formatNumbers(this.getEfficiency()) + "% Efficiency per tick", + "Output Voltage: " + GT_Utility.formatNumbers(this.getOutputTier()) + " EU/t", CORE.GT_Tooltip.get()); } @@ -310,7 +312,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mCurrentRecipe = tFuel; int voltage = tFuel.mEUt; this.mVoltage = voltage; - int sfsf = this.mTier; // this.mDaysRemaining = tFuel.mSpecialValue*365; // Do some voodoo. @@ -326,8 +327,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator } else if (ItemStack.areItemStacksEqual(tFuel.mInputs[0], GregtechItemList.Pellet_RTG_SR90.get(1))) { mTier2 = 1; } else { - // Utils.LOG_INFO("test:"+tFuel.mInputs[0].getDisplayName() + " | " + - // (ItemStack.areItemStacksEqual(tFuel.mInputs[0], GregtechItemList.Pellet_RTG_PU238.get(1)))); mTier2 = 0; } ReflectionUtils.setByte(this, "mTier", mTier2); @@ -345,8 +344,6 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator this.mDaysRemaining = MathUtils.roundToClosestInt(mTicksToBurnFor / 20 / 60 / 3); Logger.WARNING("step | " + (int) (mTicksToBurnFor * getEfficiency() / 100L)); return (int) (mTicksToBurnFor * getEfficiency() / 100L); - // return (int) (tFuel.mSpecialValue * 365L * getEfficiency() / 100L); - // return tFuel.mEUt; } Logger.WARNING("Not sure"); return 0; @@ -373,12 +370,11 @@ public class GregtechMetaTileEntity_RTG extends GT_MetaTileEntity_BasicGenerator @Override public String[] getInfoData() { return new String[] { "RTG - Running at tier " + this.mTier, - "Active: " + this.getBaseMetaTileEntity().isActive(), "Current Output: " + this.mVoltage + " EU/t", - "Days of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 20), - "Hours of Fuel remaining: " + (mTicksToBurnFor / 20 / 60 / 60), - "Ticks of " + this.mVoltage + "v remaining: " + (mTicksToBurnFor), - "Current Recipe input: " + this.mCurrentRecipe != null - ? this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1" - : "NUll" }; + "Active: " + this.getBaseMetaTileEntity().isActive(), + "Current Output: " + GT_Utility.formatNumbers(mVoltage) + " EU/t", + "Days of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 20), + "Hours of Fuel remaining: " + GT_Utility.formatNumbers(mTicksToBurnFor / 20 / 60 / 60), + "Ticks of " + this.mVoltage + "v remaining: " + mTicksToBurnFor, + this.mCurrentRecipe.mInputs[0].getDisplayName() + " x1" }; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java deleted file mode 100644 index e0d13325e9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/ULV/GT_MetaTileEntity_ULV_GasTurbine.java +++ /dev/null @@ -1,65 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV; - -import static gregtech.api.enums.GT_Values.V; - -import org.apache.commons.lang3.ArrayUtils; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.ConfigCategories; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.common.tileentities.generators.GT_MetaTileEntity_GasTurbine; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GT_MetaTileEntity_ULV_GasTurbine extends GT_MetaTileEntity_GasTurbine { - - private static final int EFFICIENCY_DEFAULT = 95; - - public GT_MetaTileEntity_ULV_GasTurbine(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, EFFICIENCY_DEFAULT); - } - - public GT_MetaTileEntity_ULV_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures, EFFICIENCY_DEFAULT); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - "Produces " + (this.getPollution() * 20) + " pollution/sec", - "Fuel Efficiency: " + this.getEfficiency() + "%", - CORE.GT_Tooltip.get()); - } - - @Override - public long maxEUStore() { - return Math.max(getEUVar(), V[1] * 80L + getMinimumStoredEU()); - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_ULV_GasTurbine(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public int getCapacity() { - return 16000; - } - - @Override - public void onConfigLoad() { - this.mEfficiency = GregTech_API.sMachineFile - .get(ConfigCategories.machineconfig, "GasTurbine.efficiency.tier." + this.mTier, EFFICIENCY_DEFAULT); - } - - @Override - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { super.getSidesActive(aColor)[0], - new GT_RenderedTexture((IIconContainer) TexturesGtBlock.Overlay_Machine_Turbine_Active) }; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java index 1d8d3a42d3..972fc086f9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_CropHarvestor.java @@ -151,32 +151,22 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank return 21; } - private static final int getRange(int aTier) { - switch (aTier) { - case 1: - return 1; - case 2: - return 5; - case 3: - return 9; - case 4: - return 13; - case 5: - return 17; - case 6: - return 21; - case 7: - return 25; - case 8: - return 29; - case 9: - return 33; - default: - return 0; - } - } - - private HashSet<ICropTile> mCropCache = new HashSet<ICropTile>(); + private static int getRange(int aTier) { + return switch (aTier) { + case 1 -> 1; + case 2 -> 5; + case 3 -> 9; + case 4 -> 13; + case 5 -> 17; + case 6 -> 21; + case 7 -> 25; + case 8 -> 29; + case 9 -> 33; + default -> 0; + }; + } + + private HashSet<ICropTile> mCropCache = new HashSet<>(); private boolean mInvalidCache = false; public boolean doesInventoryHaveSpace() { @@ -222,8 +212,7 @@ public class GT_MetaTileEntity_CropHarvestor extends GT_MetaTileEntity_BasicTank for (int x = (-aSide); x <= aSide; x++) { for (int z = (-aSide); z <= aSide; z++) { TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z); - if (tTileEntity != null && tTileEntity instanceof ICropTile) { - ICropTile tCrop = (ICropTile) tTileEntity; + if (tTileEntity != null && tTileEntity instanceof ICropTile tCrop) { this.mCropCache.add(tCrop); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java index 469f5f4d6b..03b0fe9b13 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaAtmosphericReconditioner.java @@ -3,7 +3,6 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; import static gregtech.api.enums.GT_Values.V; import java.util.Collections; -import java.util.HashMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -39,9 +38,7 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.item.general.ItemAirFilter; import gtPlusPlus.core.item.general.ItemBasicScrubberTurbine; import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -58,14 +55,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi protected boolean mSaveRotor = false; - private static final HashMap<Byte, ItemStack> mConveyorMap = new HashMap<>(); - - static { - for (byte i = 0; i < 9; i++) { - mConveyorMap.put(i, CI.getConveyor(i, 1)); - } - } - public GregtechMetaAtmosphericReconditioner(int aID, String aName, String aNameRegional, int aTier) { super( aID, @@ -93,12 +82,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi mPollutionEnabled = PollutionUtils.isPollutionEnabled(); } - /* - * public GregtechMetaAtmosphericReconditioner(String aName, int aTier, String[] aDescription, ITexture[][][] - * aTextures, String aGUIName, String aNEIName) { super(aName, aTier, 2, aDescription, aTextures, 2, 0, aGUIName, - * aNEIName); } - */ - @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { return new GregtechMetaAtmosphericReconditioner(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); @@ -374,7 +357,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (this.mTier < 7) { mCurrentChunkPollution = PollutionUtils.getPollution(getBaseMetaTileEntity()); } else { - AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>(); + AutoMap<Chunk> aSurrounding = new AutoMap<>(); World aWorld = this.getBaseMetaTileEntity().getWorld(); int xPos = this.getBaseMetaTileEntity().getXCoord(); int zPos = this.getBaseMetaTileEntity().getZCoord(); @@ -599,7 +582,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } else { int chunksWithRemoval = 0; int totalRemoved = 0; - AutoMap<Chunk> aSurrounding = new AutoMap<Chunk>(); + AutoMap<Chunk> aSurrounding = new AutoMap<>(); Chunk aThisChunk = this.getBaseMetaTileEntity().getWorld().getChunkFromBlockCoords( this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getZCoord()); @@ -683,10 +666,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi if (filter == null) { return false; } - if (filter.getItem() instanceof ItemAirFilter) { - return true; - } - return false; + return filter.getItem() instanceof ItemAirFilter; } public boolean damageAirFilter() { @@ -760,17 +740,6 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); } - public boolean onSolderingToolRightclick(ForgeDirection side, byte aWrenchingSide, EntityPlayer aPlayer, float aX, - float aY, float aZ) { - this.mSaveRotor = Utils.invertBoolean(mSaveRotor); - if (mSaveRotor) { - PlayerUtils.messagePlayer(aPlayer, "Running in low efficiency mode, rotors will not break."); - } else { - PlayerUtils.messagePlayer(aPlayer, "Running in high efficiency mode, rotors will break."); - } - return true; - } - @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { if (aIndex == -120) { @@ -782,14 +751,8 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi } @Override - public boolean canHaveInsufficientEnergy() { - // TODO Auto-generated method stub - return super.canHaveInsufficientEnergy(); - } - - @Override public String[] getInfoData() { - AutoMap<String> aTooltipSuper = new AutoMap<String>(); + AutoMap<String> aTooltipSuper = new AutoMap<>(); for (String s : super.getInfoData()) { aTooltipSuper.put(s); } @@ -910,7 +873,7 @@ public class GregtechMetaAtmosphericReconditioner extends GT_MetaTileEntity_Basi .setPos(106, 24)) .widget( new SlotWidget(inventoryHandler, 7) - .setFilter(stack -> GT_Utility.areStacksEqual(stack, mConveyorMap.get(mTier), true)) + .setFilter(stack -> GT_Utility.areStacksEqual(stack, CI.getConveyor(mTier, 1), true)) .setPos(124, 62)); builder.widget( new DrawableWidget().setDrawable(GT_UITextures.PICTURE_INFORMATION) diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java deleted file mode 100644 index 910c3120b3..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaCondensor.java +++ /dev/null @@ -1,230 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.IFluidHandler; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.widget.DrawableWidget; -import com.gtnewhorizons.modularui.common.widget.ProgressBar; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.Dyes; -import gregtech.api.enums.Textures; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.generators.GregtechMetaBoilerBase; - -public class GregtechMetaCondensor extends GregtechMetaBoilerBase implements IAddGregtechLogo { - - public GregtechMetaCondensor(final int aID, final String aName, final String aNameRegional) { - super(aID, aName, aNameRegional, "A Steam condenser - [IC2->Steam]", new ITexture[0]); - } - - public GregtechMetaCondensor(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - "IC2 Steam + Water = Normal Steam.", - "Requires no power to run, although it's not very fast.", - CORE.GT_Tooltip.get()); - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[5][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][(i + 1)] = new ITexture[] { new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)) }; - rTextures[1][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; - rTextures[2][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) }; - rTextures[3][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER) }; - rTextures[4][(i + 1)] = new ITexture[] { - new GT_RenderedTexture( - Textures.BlockIcons.MACHINE_CASING_VENT, - Dyes.getModulation(i, Dyes.MACHINE_METAL.mRGBa)), - new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_POTIONBREWER_ACTIVE) }; - } - return rTextures; - } - - @Override - public int maxProgresstime() { - return 1000; - } - - @Override - public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaCondensor(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - this.RI = MathUtils.randLong(5L, 30L); - if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) { - if (this.mTemperature <= 5) { - this.mTemperature = 5; - this.mLossTimer = 0; - } - if (++this.mLossTimer > 10) { - this.mTemperature -= 1; - this.mLossTimer = 0; - } - for (final ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { - if (this.mSteam == null) break; - if (side != aBaseMetaTileEntity.getFrontFacing()) { - final IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(side); - if (tTileEntity != null) { - final FluidStack tDrained = aBaseMetaTileEntity - .drain(side, Math.max(1, this.mSteam.amount / 2), false); - if (tDrained != null) { - final int tFilledAmount = tTileEntity.fill(side.getOpposite(), tDrained, false); - if (tFilledAmount > 0) { - tTileEntity.fill( - side.getOpposite(), - aBaseMetaTileEntity.drain(side, tFilledAmount, true), - true); - } - } - } - } - } - if ((aTick % 10L) == 0L) { - if (this.mTemperature > 5) { - if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) { - this.mHadNoWater = true; - } else { - if (this.mHadNoWater) { - aBaseMetaTileEntity.doExplosion(2048L); - return; - } - this.mFluid.amount -= 1; - if (this.mSteam == null) { - this.mSteam = GT_ModHandler.getSteam(30L); - } else if (GT_ModHandler.isSteam(this.mSteam)) { - this.mSteam.amount += 30; - } else { - this.mSteam = GT_ModHandler.getSteam(30L); - } - } - } else { - this.mHadNoWater = false; - } - } - if ((this.mSteam != null) && (this.mSteam.amount > getSteamCapacity())) { - this.sendSound((byte) 1); - this.mSteam.amount = getSteamCapacity() * 3 / 4; - } - /* - * if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && - * (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], - * OrePrefixes.bucket.get(IC2.getItemFromBlock(p_150898_0_))))) { this.mProcessingEnergy += 1000; - * aBaseMetaTileEntity.decrStackSize(2, 1); aBaseMetaTileEntity.addStackToSlot(3, - * GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L)); } - */ - if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && ((aTick % this.RI) == 0L)) { - this.mProcessingEnergy -= 40; - this.mTemperature += 2; - } - aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0); - } - } - - @Override - public final int fill(final FluidStack aFluid, final boolean doFill) { - if ((Utils.isIC2Steam(aFluid)) && (this.mProcessingEnergy < 50)) { - final int tFilledAmount = Math.min(50, aFluid.amount); - if (doFill) { - this.mProcessingEnergy += tFilledAmount; - } - return tFilledAmount; - } - return super.fill(aFluid, doFill); - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addGregTechLogo(ModularWindow.Builder builder) {} - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget( - new SlotWidget(inventoryHandler, 0).setPos(43, 25) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)) - .widget( - new SlotWidget(inventoryHandler, 1).setPos(43, 61) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)) - .widget( - new SlotWidget(inventoryHandler, 2).setPos(115, 61) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_COAL)) - .widget( - new SlotWidget(inventoryHandler, 3).setPos(115, 25) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_DUST)) - .widget( - new ProgressBar().setProgress(() -> mSteam == null ? 0 : (float) mSteam.amount / getCapacity()) - .setTexture( - GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, - GT_UITextures.PROGRESSBAR_BOILER_STEAM, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(70, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> mFluid == null ? 0 : (float) mFluid.amount / getCapacity()) - .setTexture( - GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, - GT_UITextures.PROGRESSBAR_BOILER_WATER, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(83, 25).setSize(10, 54)) - .widget( - new ProgressBar().setProgress(() -> (float) mTemperature / maxProgresstime()) - .setTexture( - GTPP_UITextures.PROGRESSBAR_BOILER_EMPTY, - GT_UITextures.PROGRESSBAR_BOILER_HEAT, - 10) - .setDirection(ProgressBar.Direction.UP).setPos(96, 25).setSize(10, 54)) - .widget( - new ProgressBar() - // cap minimum so that one can easily see there's fuel remaining - .setProgress( - () -> mProcessingEnergy > 0 ? Math.max((float) mProcessingEnergy / 1000, 1f / 5) - : 0) - .setTexture(GTPP_UITextures.PROGRESSBAR_FUEL, 14).setDirection(ProgressBar.Direction.UP) - .setPos(116, 45).setSize(14, 14)) - .widget( - new DrawableWidget().setDrawable(GTPP_UITextures.OVERLAY_SLOT_CANISTER_DARK).setPos(43, 43) - .setSize(18, 18)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java index 0c0e9664b5..2e59750e08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionCreator.java @@ -393,10 +393,6 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { return false; } - // int mCurrentPollution; - // int mAveragePollution; - // int mAveragePollutionArray[] = new int[10]; - @Override public void saveNBTData(final NBTTagCompound aNBT) { aNBT.setInteger("mCurrentPollution", this.mCurrentPollution); @@ -438,9 +434,9 @@ public class GregtechMetaPollutionCreator extends GregtechMetaTileEntity { int counter = 0; int total = 0; - for (int i = 0; i < this.mAveragePollutionArray.length; i++) { - if (this.mAveragePollutionArray[i] != 0) { - total += this.mAveragePollutionArray[i]; + for (int j : this.mAveragePollutionArray) { + if (j != 0) { + total += j; counter++; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java index 0c75d91a1b..c4b93a83b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaPollutionDetector.java @@ -385,10 +385,6 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { return false; } - // int mCurrentPollution; - // int mAveragePollution; - // int mAveragePollutionArray[] = new int[10]; - @Override public void saveNBTData(final NBTTagCompound aNBT) { aNBT.setInteger("mCurrentPollution", this.mCurrentPollution); @@ -456,17 +452,10 @@ public class GregtechMetaPollutionDetector extends GregtechMetaTileEntity { if (side == this.getBaseMetaTileEntity().getFrontFacing()) { final float[] tCoords = GT_Utility.getClickedFacingCoords(side, aX, aY, aZ); switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + (2 * (byte) (int) (tCoords[1] * 2.0F)))) { - case 0: - this.mRedstoneLevel -= 5000; - break; - case 1: - this.mRedstoneLevel += 5000; - break; - case 2: - this.mRedstoneLevel -= 50000; - break; - case 3: - this.mRedstoneLevel += 50000; + case 0 -> this.mRedstoneLevel -= 5000; + case 1 -> this.mRedstoneLevel += 5000; + case 2 -> this.mRedstoneLevel -= 50000; + case 3 -> this.mRedstoneLevel += 50000; } this.markDirty(); GT_Utility.sendChatToPlayer(aPlayer, "Emit Redstone at Pollution Level: " + this.mRedstoneLevel); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java deleted file mode 100644 index 5cbc92a148..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaTileEntityChunkLoader.java +++ /dev/null @@ -1,440 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic; - -import static gregtech.api.enums.GT_Values.V; -import static gregtech.api.enums.Mods.GTPlusPlus; -import static net.minecraftforge.common.ForgeChunkManager.getMaxChunkDepthFor; - -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.UUID; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.ChunkCoordIntPair; -import net.minecraftforge.common.ForgeChunkManager; -import net.minecraftforge.common.ForgeChunkManager.Ticket; -import net.minecraftforge.common.util.ForgeDirection; - -import com.google.common.collect.MapMaker; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.metatileentity.IMetaTileEntity; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine; -import gregtech.api.objects.GT_RenderedTexture; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.chunkloading.GTPP_ChunkManager; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GregtechMetaTileEntityChunkLoader extends GT_MetaTileEntity_BasicMachine { - - public GregtechMetaTileEntityChunkLoader(int aID, String aName, String aNameRegional, int aTier) { - super( - aID, - aName, - aNameRegional, - aTier, - 4, - "Loads " + getMaxChunksToLoadForTier(aTier) + " chunks when powered", - 0, - 0); - } - - public GregtechMetaTileEntityChunkLoader(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { - super(aName, aTier, 4, aDescription, aTextures, 0, 0); - } - - public static int getMaxChunksToLoadForTier(int aTier) { - if (aTier < 4) { - return Math.min(3 * 3, getMaxChunkDepthFor(GTPlusPlus.ID)); - } - if (aTier < 6) { - return Math.min(7 * 7, getMaxChunkDepthFor(GTPlusPlus.ID)); - } - if (aTier < 8) { - return Math.min(15 * 15, getMaxChunkDepthFor(GTPlusPlus.ID)); - } else { - return 0; - } - } - - public static int getChunkRadiusForTier(int aTier) { - if (aTier < 4) { - return Math.min(1, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); - } - if (aTier < 6) { - return Math.min(3, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); - } - if (aTier < 8) { - return Math.min(7, (int) Math.floor(Math.sqrt(getMaxChunkDepthFor(GTPlusPlus.ID)))); - } else { - return 0; - } - } - - @Override - public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - return false; - } - - @Override - public String[] getDescription() { - return new String[] { "Loads " + getMaxChunksToLoadForTier(this.mTier) + " chunks when powered", "Consumes 2A", - "Behaves Identically to a Railcraft World Anchor", CORE.GT_Tooltip.get() }; - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[10][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getFront(i); - rTextures[1][i + 1] = this.getBack(i); - rTextures[2][i + 1] = this.getBottom(i); - rTextures[3][i + 1] = this.getTop(i); - rTextures[4][i + 1] = this.getSides(i); - rTextures[5][i + 1] = this.getFrontActive(i); - rTextures[6][i + 1] = this.getBackActive(i); - rTextures[7][i + 1] = this.getBottomActive(i); - rTextures[8][i + 1] = this.getTopActive(i); - rTextures[9][i + 1] = this.getSidesActive(i); - } - return rTextures; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) - + (side == facing ? 0 - : side == facing.getOpposite() ? 1 - : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex - + 1]; - } - - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getTop(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier]) }; - } - - public ITexture[] getFrontActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getBackActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getBottomActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getTopActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - public ITexture[] getSidesActive(final byte aColor) { - return new ITexture[] { Textures.BlockIcons.MACHINE_CASINGS[this.mTier][aColor + 1], - new GT_RenderedTexture(TexturesGtBlock.Casing_Material_MaragingSteel), - new GT_RenderedTexture(TexturesGtBlock.TIERED_MACHINE_HULLS[mTier + 1]) }; - } - - @Override - public void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - super.onScrewdriverRightClick(side, aPlayer, aX, aY, aZ); - } - - @Override - public IMetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) { - return new GregtechMetaTileEntityChunkLoader(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); - } - - @Override - public boolean allowPullStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public boolean allowPutStack(final IGregTechTileEntity aBaseMetaTileEntity, final int aIndex, - final ForgeDirection side, final ItemStack aStack) { - return false; - } - - @Override - public String[] getInfoData() { - return super.getInfoData(); - } - - @Override - public boolean isGivingInformation() { - return true; - } - - @Override - public boolean canInsertItem(final int p_102007_1_, final ItemStack p_102007_2_, final int p_102007_3_) { - return false; - } - - @Override - public boolean canExtractItem(final int p_102008_1_, final ItemStack p_102008_2_, final int p_102008_3_) { - return false; - } - - @Override - public int getSizeInventory() { - return 0; - } - - @Override - public boolean isUseableByPlayer(final EntityPlayer p_70300_1_) { - return true; - } - - @Override - public void onPostTick(final IGregTechTileEntity aBaseMetaTileEntity, final long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - - if (aBaseMetaTileEntity.isServerSide()) { - if (aBaseMetaTileEntity.getXCoord() != prevX || aBaseMetaTileEntity.getYCoord() != prevY - || aBaseMetaTileEntity.getZCoord() != prevZ) { - releaseTicket(); - prevX = aBaseMetaTileEntity.getXCoord(); - prevY = aBaseMetaTileEntity.getYCoord(); - prevZ = aBaseMetaTileEntity.getZCoord(); - } - - if (hasActiveTicket() && (getTicket().world != aBaseMetaTileEntity.getWorld() || refreshTicket - || !aBaseMetaTileEntity.isAllowedToWork())) { - releaseTicket(); - } - - if (++updateCycle % updateCycleLength == 0) { - updateCycle = 0; - if (canChunkload()) { - setEUVar(getEUVar() - getEnergyConsumption()); - } - } - - if (!hasActiveTicket()) { - requestTicket(); - } - } - } - - @Override - public long maxAmperesIn() { - return 4; - } - - @Override - public long getMinimumStoredEU() { - return V[mTier] * 2; - } - - @Override - public long maxEUStore() { - return V[mTier] * 256; - } - - @Override - public long maxEUInput() { - return V[mTier]; - } - - @Override - public void onRemoval() { - super.onRemoval(); - releaseTicket(); - } - - public long getEnergyConsumption() { - return GT_Values.VP[mTier] * 2 * updateCycleLength; - } - - @Override - public void loadNBTData(NBTTagCompound aNBT) { - super.loadNBTData(aNBT); - - prevX = aNBT.getInteger("prevX"); - prevY = aNBT.getInteger("prevY"); - prevZ = aNBT.getInteger("prevZ"); - - NBTTagCompound uuidNBT = aNBT.getCompoundTag("uuid"); - uuid = new UUID(uuidNBT.getLong("most"), uuidNBT.getLong("least")); - } - - @Override - public void saveNBTData(NBTTagCompound aNBT) { - super.saveNBTData(aNBT); - - aNBT.setInteger("prevX", prevX); - aNBT.setInteger("prevY", prevY); - aNBT.setInteger("prevZ", prevZ); - - if (uuid != null) { - NBTTagCompound uuidNBT = new NBTTagCompound(); - uuidNBT.setLong("most", uuid.getMostSignificantBits()); - uuidNBT.setLong("least", uuid.getLeastSignificantBits()); - aNBT.setTag("uuid", uuidNBT); - } - } - - public boolean canChunkload() { - return getBaseMetaTileEntity().isAllowedToWork() && getEUVar() >= getEnergyConsumption(); - } - - /* - * Chunkloading Vars - */ - - private Set<ChunkCoordIntPair> mLoadedChunks = new HashSet<>(); - private static final Map<UUID, Ticket> tickets = new MapMaker().makeMap(); - private boolean refreshTicket; - private int updateCycle = 0; - private static final int updateCycleLength = 20; - private UUID uuid; - private int prevX, prevY, prevZ; - private boolean hasTicket; - - public boolean addChunkToLoadedList(ChunkCoordIntPair aActiveChunk) { - return mLoadedChunks.add(aActiveChunk); - } - - public boolean removeChunkFromLoadedList(ChunkCoordIntPair aActiveChunk) { - return mLoadedChunks.remove(aActiveChunk); - } - - public Set<ChunkCoordIntPair> getManagedChunks() { - return mLoadedChunks; - } - - public int getChunkloaderTier() { - return mTier; - } - - public void forceChunkLoading(Ticket ticket) { - setTicket(ticket); - setupChunks(); - - if (mLoadedChunks != null) { - for (ChunkCoordIntPair chunk : mLoadedChunks) { - ForgeChunkManager.forceChunk(ticket, chunk); - } - } - } - - public void setupChunks() { - if (!hasTicket) { - mLoadedChunks = null; - } else { - mLoadedChunks = GTPP_ChunkManager.getChunksAround( - getBaseMetaTileEntity().getXCoord() >> 4, - getBaseMetaTileEntity().getZCoord() >> 4, - getChunkRadiusForTier(mTier)); - } - } - - protected Ticket getTicketFromForge() { - return ForgeChunkManager - .requestTicket(GTplusplus.instance, getBaseMetaTileEntity().getWorld(), ForgeChunkManager.Type.NORMAL); - } - - public boolean hasActiveTicket() { - return getTicket() != null; - } - - protected void releaseTicket() { - refreshTicket = false; - setTicket(null); - } - - protected void requestTicket() { - if (canChunkload()) { - Ticket chunkTicket = getTicketFromForge(); - if (chunkTicket != null) { - setTicketData(chunkTicket); - forceChunkLoading(chunkTicket); - } - } - } - - protected void setTicketData(Ticket chunkTicket) { - if (chunkTicket != null) { - chunkTicket.getModData().setInteger("xCoord", getBaseMetaTileEntity().getXCoord()); - chunkTicket.getModData().setInteger("yCoord", getBaseMetaTileEntity().getYCoord()); - chunkTicket.getModData().setInteger("zCoord", getBaseMetaTileEntity().getZCoord()); - chunkTicket.setChunkListDepth(getMaxChunksToLoadForTier(mTier)); - } - } - - public void setTicket(Ticket t) { - Ticket ticket = getTicket(); - if (ticket != t) { - if (ticket != null) { - if (ticket.world == getBaseMetaTileEntity().getWorld()) { - for (ChunkCoordIntPair chunk : ticket.getChunkList()) { - if (ForgeChunkManager.getPersistentChunksFor(getBaseMetaTileEntity().getWorld()).keys() - .contains(chunk)) { - ForgeChunkManager.unforceChunk(ticket, chunk); - } - } - ForgeChunkManager.releaseTicket(ticket); - } - tickets.remove(getUUID()); - } - } - hasTicket = t != null; - if (hasTicket) { - tickets.put(getUUID(), t); - } - } - - public Ticket getTicket() { - return tickets.get(getUUID()); - } - - public UUID getUUID() { - if (uuid == null) { - uuid = UUID.randomUUID(); - } - return uuid; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java index 968f44630e..d1d937fc82 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/basic/GregtechMetaWirelessCharger.java @@ -447,8 +447,8 @@ public class GregtechMetaWirelessCharger extends GregtechMetaTileEntity { super.onFirstTick(aBaseMetaTileEntity); } - private Map<String, UUID> mWirelessChargingMap = new HashMap<String, UUID>(); - private Map<String, UUID> mLocalChargingMap = new HashMap<String, UUID>(); + private Map<String, UUID> mWirelessChargingMap = new HashMap<>(); + private Map<String, UUID> mLocalChargingMap = new HashMap<>(); private boolean isValidPlayer(EntityPlayer aPlayer) { BaseMetaTileEntity aTile = (BaseMetaTileEntity) this.getBaseMetaTileEntity(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java index 1b3822ca3f..ed4da64a85 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialArcFurnace.java @@ -34,7 +34,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -229,7 +228,7 @@ public class GregtechMetaTileEntity_IndustrialArcFurnace extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (this.mSize > 5) { - this.mPlasmaMode = Utils.invertBoolean(mPlasmaMode); + this.mPlasmaMode = !mPlasmaMode; if (mPlasmaMode) { PlayerUtils.messagePlayer( aPlayer, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java index dfa6eb0130..fb954055b3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java @@ -32,7 +32,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -175,7 +174,7 @@ public class GregtechMetaTileEntity_IndustrialCuttingMachine extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mCuttingMode = Utils.invertBoolean(mCuttingMode); + mCuttingMode = !mCuttingMode; String aMode = mCuttingMode ? "Cutting" : "Slicing"; PlayerUtils.messagePlayer(aPlayer, "Mode: " + aMode); mLastRecipe = null; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 805468d4d4..e60a5cd8c4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -39,7 +39,6 @@ import gregtech.api.util.GT_OverclockCalculator; import gregtech.api.util.GT_Recipe; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -197,7 +196,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mDehydratorMode = Utils.invertBoolean(mDehydratorMode); + mDehydratorMode = !mDehydratorMode; String aMode = mDehydratorMode ? "Dehydrator" : "Vacuum Furnace"; PlayerUtils.messagePlayer(aPlayer, "Mode: " + aMode); mLastRecipe = null; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java index fd388ba69c..3d9eab79fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java @@ -264,12 +264,10 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends @Override protected int getCasingTextureId() { - switch (controllerTier) { - case 2: - return TAE.GTPP_INDEX(7); - default: - return GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2); - } + return switch (controllerTier) { + case 2 -> TAE.GTPP_INDEX(7); + default -> GT_Utility.getCasingTextureIndex(GregTech_API.sBlockCasings4, 2); + }; } @Override @@ -431,7 +429,10 @@ public class GregtechMetaTileEntity_IndustrialMacerator extends super.getWailaBody(itemStack, currentTip, accessor, config); final NBTTagCompound tag = accessor.getNBTData(); if (tag.hasKey("tier")) { - currentTip.add("Tier: " + EnumChatFormatting.YELLOW + tag.getInteger("tier") + EnumChatFormatting.RESET); + currentTip.add( + "Tier: " + EnumChatFormatting.YELLOW + + GT_Utility.formatNumbers(tag.getInteger("tier")) + + EnumChatFormatting.RESET); } } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java index 075adc065f..0e6757b29a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java @@ -224,7 +224,7 @@ public class GregtechMetaTileEntity_IndustrialMultiMachine extends return null; } - private final int getCircuitID(ItemStack circuit) { + private int getCircuitID(ItemStack circuit) { int H = circuit.getItemDamage(); int T = (H == 20 ? 0 : (H == 21 ? 1 : (H == 22 ? 2 : -1))); return MODE_MAP[this.mInternalMode][T]; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java index 89bd7fb1a8..7fc9ff0d59 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java @@ -30,7 +30,6 @@ import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; @@ -177,7 +176,7 @@ public class GregtechMetaTileEntity_IndustrialPlatePress extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mFormingMode = Utils.invertBoolean(mFormingMode); + mFormingMode = !mFormingMode; if (mFormingMode) { PlayerUtils.messagePlayer(aPlayer, "Now running in Forming Press Mode."); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java index aef24e2f69..23889df16e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IsaMill.java @@ -70,7 +70,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< private static final IIconContainer frontFaceActive = new CustomIcon("iconsets/Grinder/GRINDER_ACTIVE5"); private static final IIconContainer frontFace = new CustomIcon("iconsets/Grinder/GRINDER5"); - private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<GT_MetaTileEntity_Hatch_MillingBalls>(); + private final ArrayList<GT_MetaTileEntity_Hatch_MillingBalls> mMillingBallBuses = new ArrayList<>(); private static final DamageSource mIsaMillDamageSource = new DamageSource("gtpp.grinder").setDamageBypassesArmor(); public GregtechMetaTileEntity_IsaMill(int aID, String aName, String aNameRegional) { @@ -216,7 +216,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< super.onPostTick(aBaseMetaTileEntity, aTick); } - private final AutoMap<BlockPos> mFrontBlockPosCache = new AutoMap<BlockPos>(); + private final AutoMap<BlockPos> mFrontBlockPosCache = new AutoMap<>(); public void checkForEntities(IGregTechTileEntity aBaseMetaTileEntity, long aTime) { @@ -246,8 +246,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< AutoMap<EntityLivingBase> aEntities = getEntities(mFrontBlockPosCache, aBaseMetaTileEntity.getWorld()); if (!aEntities.isEmpty()) { for (EntityLivingBase aFoundEntity : aEntities) { - if (aFoundEntity instanceof EntityPlayer) { - EntityPlayer aPlayer = (EntityPlayer) aFoundEntity; + if (aFoundEntity instanceof EntityPlayer aPlayer) { if (PlayerUtils.isCreative(aPlayer) || !PlayerUtils.canTakeDamage(aPlayer)) { continue; } else { @@ -278,9 +277,9 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< return Math.max(reducedDamage, 0); } - private static final AutoMap<EntityLivingBase> getEntities(AutoMap<BlockPos> aPositionsToCheck, World aWorld) { - AutoMap<EntityLivingBase> aEntities = new AutoMap<EntityLivingBase>(); - HashSet<Chunk> aChunksToCheck = new HashSet<Chunk>(); + private static AutoMap<EntityLivingBase> getEntities(AutoMap<BlockPos> aPositionsToCheck, World aWorld) { + AutoMap<EntityLivingBase> aEntities = new AutoMap<>(); + HashSet<Chunk> aChunksToCheck = new HashSet<>(); if (!aPositionsToCheck.isEmpty()) { Chunk aLocalChunk; for (BlockPos aPos : aPositionsToCheck) { @@ -289,14 +288,13 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< } } if (!aChunksToCheck.isEmpty()) { - AutoMap<EntityLivingBase> aEntitiesFound = new AutoMap<EntityLivingBase>(); + AutoMap<EntityLivingBase> aEntitiesFound = new AutoMap<>(); for (Chunk aChunk : aChunksToCheck) { if (aChunk.isChunkLoaded) { List[] aEntityLists = aChunk.entityLists; for (List aEntitySubList : aEntityLists) { for (Object aEntity : aEntitySubList) { - if (aEntity instanceof EntityLivingBase) { - EntityLivingBase aPlayer = (EntityLivingBase) aEntity; + if (aEntity instanceof EntityLivingBase aPlayer) { aEntitiesFound.add(aPlayer); } } @@ -320,7 +318,7 @@ public class GregtechMetaTileEntity_IsaMill extends GregtechMeta_MultiBlockBase< private static void generateParticles(EntityLivingBase aEntity) { BlockPos aPlayerPosBottom = EntityUtils.findBlockPosOfEntity(aEntity); BlockPos aPlayerPosTop = aPlayerPosBottom.getUp(); - AutoMap<BlockPos> aEntityPositions = new AutoMap<BlockPos>(); + AutoMap<BlockPos> aEntityPositions = new AutoMap<>(); aEntityPositions.add(aPlayerPosBottom); aEntityPositions.add(aPlayerPosTop); for (int i = 0; i < 64; i++) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java index 8a67e0190a..6db432a24a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_NuclearSaltProcessingPlant.java @@ -1,6 +1,8 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.processing; -import static com.gtnewhorizon.structurelib.structure.StructureUtility.*; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.onElementPass; +import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; import static gregtech.api.enums.GT_HatchElement.Energy; import static gregtech.api.enums.GT_HatchElement.InputBus; import static gregtech.api.enums.GT_HatchElement.InputHatch; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java index 438cb650a8..85f24af541 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_SpargeTower.java @@ -266,7 +266,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB private static ArrayList<FluidStack> getByproductsOfSparge(final FluidStack aSpargeGas, final FluidStack aSpentFuel) { GasSpargingRecipe aSpargeRecipe = GasSpargingRecipeMap.findRecipe(aSpargeGas, aSpentFuel); - ArrayList<FluidStack> aOutputGases = new ArrayList<FluidStack>(); + ArrayList<FluidStack> aOutputGases = new ArrayList<>(); if (aSpargeRecipe == null) { Logger.INFO("Did not find sparge recipe!"); return aOutputGases; @@ -274,7 +274,7 @@ public class GregtechMetaTileEntity_SpargeTower extends GregtechMeta_MultiBlockB int aSpargeGasAmount = aSpargeRecipe.mInputGas.amount; aOutputGases.add(aSpargeRecipe.mOutputSpargedFuel.copy()); - ArrayList<FluidStack> aTempMap = new ArrayList<FluidStack>(); + ArrayList<FluidStack> aTempMap = new ArrayList<>(); for (int i = 2; i < aSpargeRecipe.mFluidOutputs.length; i++) { int aGasAmount = MathUtils.randInt(0, (aSpargeRecipe.mMaxOutputQuantity[i - 2] / 100)); FluidStack aOutput = aSpargeRecipe.mFluidOutputs[i].copy(); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java index 53ce867b6c..3ca083ebf6 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_DistillationTower.java @@ -155,10 +155,9 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends protected boolean addLayerOutputHatch(IGregTechTileEntity aTileEntity, int aBaseCasingIndex) { if (aTileEntity == null || aTileEntity.isDead() - || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output)) + || !(aTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Output tHatch)) return false; while (mOutputHatchesByLayer.size() < mHeight) mOutputHatchesByLayer.add(new ArrayList<>()); - GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) aTileEntity.getMetaTileEntity(); tHatch.updateTexture(aBaseCasingIndex); return mOutputHatchesByLayer.get(mHeight - 1).add(tHatch) && mOutputHatches.add(tHatch); } @@ -377,14 +376,11 @@ public class GregtechMetaTileEntity_Adv_DistillationTower extends @Override public int getMaxParallelRecipes() { - switch (mMode) { - case DistillationTower: - return getTierOfTower() == 1 ? 4 : getTierOfTower() == 2 ? 12 : 0; - case Distillery: - return getTierOfTower() * (4 * GT_Utility.getTier(this.getMaxInputVoltage())); - default: - return 0; - } + return switch (mMode) { + case DistillationTower -> getTierOfTower() == 1 ? 4 : getTierOfTower() == 2 ? 12 : 0; + case Distillery -> getTierOfTower() * (4 * GT_Utility.getTier(this.getMaxInputVoltage())); + default -> 0; + }; } private int getTierOfTower() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java index d22f74c942..2f0bcc2c4f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_ElementalDuplicator.java @@ -57,7 +57,7 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase<GregtechMTE_ElementalDuplicator> implements ISurvivalConstructable { - private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder>(); + private final ArrayList<GT_MetaTileEntity_Hatch_ElementalDataOrbHolder> mReplicatorDataOrbHatches = new ArrayList<>(); private static final int CASING_TEXTURE_ID = TAE.getIndexFromPage(0, 3); private int mCasing = 0; @@ -501,8 +501,7 @@ public class GregtechMTE_ElementalDuplicator extends GregtechMeta_MultiBlockBase public static ItemStack getSpecialSlotStack(GT_Recipe aRecipe) { ItemStack aStack = null; if (aRecipe.mSpecialItems != null) { - if (aRecipe.mSpecialItems instanceof ItemStack[]) { - ItemStack[] aTempStackArray = (ItemStack[]) aRecipe.mSpecialItems; + if (aRecipe.mSpecialItems instanceof ItemStack[]aTempStackArray) { aStack = aTempStackArray[0]; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java index fbc6b638d3..20f72a0e62 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java @@ -164,16 +164,12 @@ public class GregtechMetaTileEntityTreeFarm extends GregtechMeta_MultiBlockBase< * @return an int corresponding to the boost */ public int getSawBoost(SAWTOOL sawType) { - switch (sawType) { - case SAW: - return 1; - case BUZZSAW: - return 2; - case CHAINSAW: - return 4; - default: - return 1; - } + return switch (sawType) { + case SAW -> 1; + case BUZZSAW -> 2; + case CHAINSAW -> 4; + default -> 1; + }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java index c992e90947..7997497d42 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java @@ -342,10 +342,10 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends || (cofhWater != null && cofhWater.isAssignableFrom(block.getClass()) && meta != 0); } - private static AutoMap<AutoMap<WeightedRandomFishable>> categories = new AutoMap<AutoMap<WeightedRandomFishable>>(); - private static AutoMap<WeightedRandomFishable> categoryFish = new AutoMap<WeightedRandomFishable>(); - private static AutoMap<WeightedRandomFishable> categoryJunk = new AutoMap<WeightedRandomFishable>(); - private static AutoMap<WeightedRandomFishable> categoryLoot = new AutoMap<WeightedRandomFishable>(); + private static AutoMap<AutoMap<WeightedRandomFishable>> categories = new AutoMap<>(); + private static AutoMap<WeightedRandomFishable> categoryFish = new AutoMap<>(); + private static AutoMap<WeightedRandomFishable> categoryJunk = new AutoMap<>(); + private static AutoMap<WeightedRandomFishable> categoryLoot = new AutoMap<>(); private static boolean hasGenerateRecipes = false; private int mMode = 14; private int mMax = 8; @@ -408,7 +408,7 @@ public class GregtechMetaTileEntity_IndustrialFishingPond extends } // reflection map - private static Map<WeightedRandomFishable, ItemStack> reflectiveFishMap = new HashMap<WeightedRandomFishable, ItemStack>(); + private static Map<WeightedRandomFishable, ItemStack> reflectiveFishMap = new HashMap<>(); private ItemStack reflectiveFish(WeightedRandomFishable y) { if (reflectiveFishMap.containsKey(y)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java index cdc5ccf4fb..74a51a0260 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_LargeRocketEngine.java @@ -449,9 +449,7 @@ public class GregtechMetaTileEntity_LargeRocketEngine extends public boolean onRunningTick(ItemStack aStack) { if (this.mRuntime % 20 == 0) { if (this.mMufflerHatches.size() == 1 - && this.mMufflerHatches.get(0) instanceof GT_MetaTileEntity_Hatch_Muffler_Adv) { - GT_MetaTileEntity_Hatch_Muffler_Adv tMuffler = (GT_MetaTileEntity_Hatch_Muffler_Adv) this.mMufflerHatches - .get(0); + && this.mMufflerHatches.get(0) instanceof GT_MetaTileEntity_Hatch_Muffler_Adv tMuffler) { if (!tMuffler.hasValidFilter()) { ArrayList<ItemStack> tInputs = getStoredInputs(); for (ItemStack tItem : tInputs) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java index c33dbbf0b9..4bde2de336 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_SolarTower.java @@ -58,7 +58,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa private int mCasing3; private int mCasing4; - public ArrayList<TileEntitySolarHeater> mSolarHeaters = new ArrayList<TileEntitySolarHeater>(); + public ArrayList<TileEntitySolarHeater> mSolarHeaters = new ArrayList<>(); public GregtechMetaTileEntity_SolarTower(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); @@ -119,7 +119,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa private static final String SOLAR_HEATER_RING_4 = STRUCTURE_PIECE_SOLAR_HEATER_RING[3]; private static final String SOLAR_HEATER_RING_5 = STRUCTURE_PIECE_SOLAR_HEATER_RING[4]; - private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>>() { + private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_SolarTower>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override protected IStructureDefinition<GregtechMetaTileEntity_SolarTower> computeValue(Class<?> type) { @@ -445,20 +445,14 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa } private int getHeaterCountForTier(int aTier) { - switch (aTier) { - case 1: - return 36; - case 2: - return 88; - case 4: - return 156; - case 8: - return 240; - case 16: - return 340; - default: - return 0; - } + return switch (aTier) { + case 1 -> 36; + case 2 -> 88; + case 4 -> 156; + case 8 -> 240; + case 16 -> 340; + default -> 0; + }; } public boolean getConnectedSolarReflectors() { @@ -509,8 +503,7 @@ public class GregtechMetaTileEntity_SolarTower extends GregtechMeta_MultiBlockBa return false; } else { IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof TileEntitySolarHeater) { - TileEntitySolarHeater mTile = (TileEntitySolarHeater) aMetaTileEntity; + if (aMetaTileEntity instanceof TileEntitySolarHeater mTile) { if (!mTile.hasSolarTower() && mTile.canSeeSky()) { // Logger.INFO("Found Solar Reflector, Injecting Data."); mTile.setSolarTower(this); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java index c454a1769e..d06566213a 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/chemplant/GregtechMTE_ChemicalPlant.java @@ -86,7 +86,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt private int mCasing; private static IStructureDefinition<GregtechMTE_ChemicalPlant> STRUCTURE_DEFINITION = null; - private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<GT_MetaTileEntity_Hatch_Catalysts>(); + private final ArrayList<GT_MetaTileEntity_Hatch_Catalysts> mCatalystBuses = new ArrayList<>(); private static final HashMap<Integer, Triplet<Block, Integer, Integer>> mTieredBlockRegistry = new HashMap<>(); @@ -99,10 +99,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt } public static boolean registerMachineCasingForTier(int aTier, Block aBlock, int aMeta, int aCasingTextureID) { - Triplet<Block, Integer, Integer> aCasingData = new Triplet<Block, Integer, Integer>( - aBlock, - aMeta, - aCasingTextureID); + Triplet<Block, Integer, Integer> aCasingData = new Triplet<>(aBlock, aMeta, aCasingTextureID); if (mTieredBlockRegistry.containsKey(aTier)) { CORE.crash( "Tried to register a Machine casing for tier " + aTier @@ -447,8 +444,7 @@ public class GregtechMTE_ChemicalPlant extends GregtechMeta_MultiBlockBase<Gregt public boolean addToMachineList(IGregTechTileEntity aTileEntity) { int aMaxTier = getMachineCasingTier(); final IMetaTileEntity aMetaTileEntity = aTileEntity.getMetaTileEntity(); - if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock) { - GT_MetaTileEntity_TieredMachineBlock aMachineBlock = (GT_MetaTileEntity_TieredMachineBlock) aMetaTileEntity; + if (aMetaTileEntity instanceof GT_MetaTileEntity_TieredMachineBlock aMachineBlock) { int aTileTier = aMachineBlock.mTier; if (aTileTier > aMaxTier) { log("Hatch tier too high."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java index ac79c96605..6b411443c4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Gas.java @@ -132,11 +132,6 @@ public class GT_MTE_LargeTurbine_Gas extends GregtechMetaTileEntity_LargerTurbin if (totalFlow <= 0) return 0; tEU = GT_Utility.safeInt((long) totalFlow * fuelValue); - // log("Total Flow: "+totalFlow); - // log("Real Optimal Flow: "+actualOptimalFlow); - // log("Flow: "+flow); - // log("Remaining Flow: "+remainingFlow); - if (totalFlow == actualOptimalFlow) { tEU = GT_Utility.safeInt((long) tEU * (long) aBaseEff / 10000L); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java index d92d8f870b..f022e16057 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GT_MTE_LargeTurbine_Plasma.java @@ -87,7 +87,7 @@ public class GT_MTE_LargeTurbine_Plasma extends GregtechMetaTileEntity_LargerTur continue; } if (aHatch.insertTurbine(aTurbineItem.copy())) { - boolean aDidDeplete = depleteTurbineFromStock(aTurbineItem); + depleteTurbineFromStock(aTurbineItem); continue hatch; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java index 046d95735b..fce6ec4408 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/GregtechMetaTileEntity_LargerTurbineBase.java @@ -49,7 +49,6 @@ import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.PlayerUtils; import gtPlusPlus.core.util.minecraft.gregtech.PollutionUtils; @@ -72,7 +71,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends public ITexture frontFace; public ITexture frontFaceActive; - public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>(); + public ArrayList<GT_MetaTileEntity_Hatch_Turbine> mTurbineRotorHatches = new ArrayList<>(); public GregtechMetaTileEntity_LargerTurbineBase(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -110,7 +109,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } if (getTurbineType().equals("Plasma")) { tt.addInfo("Plasma fuel efficiency is lower for high tier turbines when using low-grade plasmas") - .addInfo("Efficiency = ((FuelValue / 200000)^2) / (EU per Turbine)"); + .addInfo("Efficiency = ((FuelValue / 200,000)^2) / (EU per Turbine)"); } tt.addPollutionAmount(getPollutionPerSecond(null)).addInfo("Pollution is 3x higher in Fast Mode").addSeparator() .beginStructureBlock(7, 9, 7, false).addController("Top Middle") @@ -129,9 +128,10 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } private static final String STRUCTURE_PIECE_MAIN = "main"; - private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>>() { + private static final ClassValue<IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase>> STRUCTURE_DEFINITION = new ClassValue<>() { @Override + @SuppressWarnings("SpellCheckingInspection") protected IStructureDefinition<GregtechMetaTileEntity_LargerTurbineBase> computeValue(Class<?> type) { return StructureDefinition.<GregtechMetaTileEntity_LargerTurbineBase>builder() // c = turbine casing @@ -267,10 +267,9 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends if (aMetaTileEntity == null) { return false; } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine) { + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Turbine aTurbineHatch) { log("Found GT_MetaTileEntity_Hatch_Turbine"); updateTexture(aTileEntity, aBaseCasingIndex); - GT_MetaTileEntity_Hatch_Turbine aTurbineHatch = (GT_MetaTileEntity_Hatch_Turbine) aMetaTileEntity; IGregTechTileEntity g = this.getBaseMetaTileEntity(); if (aTurbineHatch.setController(new BlockPos(g.getXCoord(), g.getYCoord(), g.getZCoord(), g.getWorld()))) { boolean aDidAdd = this.mTurbineRotorHatches.add(aTurbineHatch); @@ -375,26 +374,20 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } public static String getTurbineSizeString(int aSize) { - switch (aSize) { - case 1: - return "Small Turbine"; - case 2: - return "Turbine"; - case 3: - return "Large Turbine"; - case 4: - return "Huge Turbine"; - default: - return ""; - } + return switch (aSize) { + case 1 -> "Small Turbine"; + case 2 -> "Turbine"; + case 3 -> "Large Turbine"; + case 4 -> "Huge Turbine"; + default -> ""; + }; } protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getEmptyTurbineAssemblies() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>(); + ArrayList<GT_MetaTileEntity_Hatch_Turbine> aEmptyTurbineRotorHatches = new ArrayList<>(); // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for empties."); for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) { if (!aTurbineHatch.hasTurbine()) { - // log("Found Assembly without Turbine."); aEmptyTurbineRotorHatches.add(aTurbineHatch); } } @@ -402,7 +395,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends } protected ArrayList<GT_MetaTileEntity_Hatch_Turbine> getFullTurbineAssemblies() { - ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<GT_MetaTileEntity_Hatch_Turbine>(); + ArrayList<GT_MetaTileEntity_Hatch_Turbine> aTurbineRotorHatches = new ArrayList<>(); // log("Checking "+mTurbineRotorHatches.size()+" Assemblies for Turbines."); for (GT_MetaTileEntity_Hatch_Turbine aTurbineHatch : this.mTurbineRotorHatches) { if (aTurbineHatch.hasTurbine()) { @@ -413,9 +406,9 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends return aTurbineRotorHatches; } - protected boolean depleteTurbineFromStock(ItemStack aTurbine) { + protected void depleteTurbineFromStock(ItemStack aTurbine) { if (aTurbine == null) { - return false; + return; } startRecipeProcessing(); for (GT_MetaTileEntity_Hatch_InputBus aInputBus : this.mInputBusses) { @@ -425,12 +418,11 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends aStack.stackSize -= aTurbine.stackSize; updateSlots(); endRecipeProcessing(); - return true; + return; } } } endRecipeProcessing(); - return false; } @Override @@ -445,7 +437,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends continue; } if (aHatch.insertTurbine(aTurbineItem.copy())) { - boolean aDidDeplete = depleteTurbineFromStock(aTurbineItem); + depleteTurbineFromStock(aTurbineItem); continue hatch; } } @@ -504,7 +496,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the // difference in power level (per tick) // This is how much the turbine can actually change during this tick - int maxChangeAllowed = Math.max(10, GT_Utility.safeInt((long) Math.abs(difference) / 100)); + int maxChangeAllowed = Math.max(10, GT_Utility.safeInt(Math.abs(difference) / 100)); if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed // change @@ -542,24 +534,12 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends if (getBaseMetaTileEntity().getRandomNumber(6000) < getMaintenanceThreshold()) { switch (getBaseMetaTileEntity().getRandomNumber(6)) { - case 0: - mWrench = false; - break; - case 1: - mScrewdriver = false; - break; - case 2: - mSoftHammer = false; - break; - case 3: - mHardHammer = false; - break; - case 4: - mSolderingTool = false; - break; - case 5: - mCrowbar = false; - break; + case 0 -> mWrench = false; + case 1 -> mScrewdriver = false; + case 2 -> mSoftHammer = false; + case 3 -> mHardHammer = false; + case 4 -> mSolderingTool = false; + case 5 -> mCrowbar = false; } } for (GT_MetaTileEntity_Hatch_Turbine aHatch : getFullTurbineAssemblies()) { @@ -611,12 +591,12 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.running.false") + EnumChatFormatting.RESET; - String tMaintainance = getIdealStatus() == getRepairStatus() + String tMaintenance = getIdealStatus() == getRepairStatus() ? EnumChatFormatting.GREEN + StatCollector.translateToLocal("GT5U.turbine.maintenance.false") + EnumChatFormatting.RESET : EnumChatFormatting.RED + StatCollector.translateToLocal("GT5U.turbine.maintenance.true") + EnumChatFormatting.RESET; - int tDura = 0; + int tDura; StringBuilder aTurbineDamage = new StringBuilder(); for (GT_MetaTileEntity_Hatch_Turbine aHatch : this.getFullTurbineAssemblies()) { @@ -624,7 +604,8 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends tDura = MathUtils.safeInt( (long) (100.0f / GT_MetaGenerated_Tool.getToolMaxDamage(aTurbine) * (GT_MetaGenerated_Tool.getToolDamage(aTurbine)) + 1)); - aTurbineDamage.append(EnumChatFormatting.RED).append(tDura).append(EnumChatFormatting.RESET).append("% | "); + aTurbineDamage.append(EnumChatFormatting.RED).append(GT_Utility.formatNumbers(tDura)) + .append(EnumChatFormatting.RESET).append("% | "); } long storedEnergy = 0; @@ -642,27 +623,27 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends // 8 Lines available for information panels tRunning + ": " + EnumChatFormatting.RED - + ((lEUt * mEfficiency) / 10000) + + GT_Utility.formatNumbers(((lEUt * mEfficiency) / 10000)) + EnumChatFormatting.RESET + " EU/t", - tMaintainance, + tMaintenance, StatCollector.translateToLocal("GT5U.turbine.efficiency") + ": " + EnumChatFormatting.YELLOW - + (mEfficiency / 100F) + + GT_Utility.formatNumbers((mEfficiency / 100F)) + EnumChatFormatting.RESET + "%", StatCollector.translateToLocal("GT5U.multiblock.energy") + ": " + EnumChatFormatting.GREEN - + storedEnergy + + GT_Utility.formatNumbers(storedEnergy) + EnumChatFormatting.RESET + " EU / " + EnumChatFormatting.YELLOW - + maxEnergy + + GT_Utility.formatNumbers(maxEnergy) + EnumChatFormatting.RESET + " EU", StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + MathUtils.safeInt((long) realOptFlow) + + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/s" + EnumChatFormatting.YELLOW @@ -672,18 +653,18 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends + ")", StatCollector.translateToLocal("GT5U.turbine.fuel") + ": " + EnumChatFormatting.GOLD - + storedFluid + + GT_Utility.formatNumbers(storedFluid) + EnumChatFormatting.RESET + "L", StatCollector.translateToLocal("GT5U.turbine.dmg") + ": " + aTurbineDamage, StatCollector.translateToLocal("GT5U.multiblock.pollution") + ": " + EnumChatFormatting.GREEN - + mPollutionReduction + + GT_Utility.formatNumbers(mPollutionReduction) + EnumChatFormatting.RESET + " %" }; if (!aIsSteam) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": " + EnumChatFormatting.YELLOW - + MathUtils.safeInt((long) realOptFlow) + + GT_Utility.formatNumbers(MathUtils.safeInt((long) realOptFlow)) + EnumChatFormatting.RESET + " L/t"; return ret; @@ -738,7 +719,7 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mFastMode = Utils.invertBoolean(mFastMode); + mFastMode = !mFastMode; if (mFastMode) { PlayerUtils.messagePlayer(aPlayer, "Running in Fast (48x) Mode."); } else { @@ -805,22 +786,19 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends private Long mLastHatchUpdate; - public int updateTurbineHatches(boolean aState) { - int aUpdated = 0; + public void updateTurbineHatches(boolean aState) { if (mLastHatchUpdate == null) { mLastHatchUpdate = System.currentTimeMillis() / 1000; } if (this.mTurbineRotorHatches.isEmpty() || ((System.currentTimeMillis() / 1000) - mLastHatchUpdate) <= 2) { - return 0; + return; } for (GT_MetaTileEntity_Hatch_Turbine h : this.mTurbineRotorHatches) { if (!isValidMetaTileEntity(h)) continue; h.setActive(aState); - aUpdated++; } mLastHatchUpdate = System.currentTimeMillis() / 1000; - return aUpdated; } @Override @@ -854,25 +832,17 @@ public abstract class GregtechMetaTileEntity_LargerTurbineBase extends @Override public boolean addEnergyOutputMultipleDynamos(long aEU, boolean aAllowMixedVoltageDynamos) { int injected = 0; - long totalOutput = 0; long aFirstVoltageFound = -1; - boolean aFoundMixedDynamos = false; for (GT_MetaTileEntity_Hatch aDynamo : mAllDynamoHatches) { if (aDynamo == null) { return false; } if (isValidMetaTileEntity(aDynamo)) { long aVoltage = aDynamo.maxEUOutput(); - long aTotal = aDynamo.maxAmperesOut() * aVoltage; // Check against voltage to check when hatch mixing if (aFirstVoltageFound == -1) { aFirstVoltageFound = aVoltage; - } else { - if (aFirstVoltageFound != aVoltage) { - aFoundMixedDynamos = true; - } } - totalOutput += aTotal; } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java index c25bddabfd..8e7f2b97ed 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/storage/GregtechMetaTileEntity_PowerSubStationController.java @@ -202,30 +202,25 @@ public class GregtechMetaTileEntity_PowerSubStationController } public static Block getBlockFromTier(int tier) { - switch (tier) { - case 4: - return ModBlocks.blockCasings2Misc; - case 5: - case 6: - case 7: - case 8: - case 9: - return ModBlocks.blockCasings3Misc; - default: - return null; - } + return switch (tier) { + case 4 -> ModBlocks.blockCasings2Misc; + case 5, 6, 7, 8, 9 -> ModBlocks.blockCasings3Misc; + default -> null; + }; } public static int getMaxHatchTier(int aCellTier) { switch (aCellTier) { - case 9: + case 9 -> { return GT_Values.VOLTAGE_NAMES[9].equals("Ultimate High Voltage") ? 15 : 9; - default: + } + default -> { if (aCellTier < 4) { return 0; } else { return aCellTier; } + } } } @@ -537,20 +532,12 @@ public class GregtechMetaTileEntity_PowerSubStationController this.mAverageEuUsage = aNBT.getLong("mAverageEuUsage"); } switch (aNBT.func_150299_b("mAverageEuAdded")) { - case NBT.TAG_BYTE_ARRAY: - this.mAverageEuAdded.read(aNBT, "mAverageEuAdded"); - break; - case NBT.TAG_LONG: - this.mAverageEuAdded.set(aNBT.getLong("mAverageEuAdded")); - break; + case NBT.TAG_BYTE_ARRAY -> this.mAverageEuAdded.read(aNBT, "mAverageEuAdded"); + case NBT.TAG_LONG -> this.mAverageEuAdded.set(aNBT.getLong("mAverageEuAdded")); } switch (aNBT.func_150299_b("mAverageEuConsumed")) { - case NBT.TAG_BYTE_ARRAY: - this.mAverageEuConsumed.read(aNBT, "mAverageEuConsumed"); - break; - case NBT.TAG_LONG: - this.mAverageEuConsumed.set(aNBT.getLong("mAverageEuConsumed")); - break; + case NBT.TAG_BYTE_ARRAY -> this.mAverageEuConsumed.read(aNBT, "mAverageEuConsumed"); + case NBT.TAG_LONG -> this.mAverageEuConsumed.set(aNBT.getLong("mAverageEuConsumed")); } // Usage Stats @@ -829,7 +816,7 @@ public class GregtechMetaTileEntity_PowerSubStationController @Override public void onModeChangeByScrewdriver(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { - mIsOutputtingPower = Utils.invertBoolean(mIsOutputtingPower); + mIsOutputtingPower = !mIsOutputtingPower; if (mIsOutputtingPower) { PlayerUtils.messagePlayer(aPlayer, "Sub-Station is now outputting power from the controller."); } else { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java index 2b3ec158d8..963b80ae99 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneButtonPanel.java @@ -77,67 +77,34 @@ public class GT_MetaTileEntity_RedstoneButtonPanel extends GT_MetaTileEntity_Red case 0: default: switch (side) { - case DOWN: - case UP: - mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (aZ * 4)); - break; - case NORTH: - mRedstoneStrength = (byte) ((byte) (4 - aX * 4) + 4 * (byte) (4 - aY * 4)); - break; - case SOUTH: - mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (4 - aY * 4)); - break; - case WEST: - mRedstoneStrength = (byte) ((byte) (aZ * 4) + 4 * (byte) (4 - aY * 4)); - break; - case EAST: - mRedstoneStrength = (byte) ((byte) (4 - aZ * 4) + 4 * (byte) (4 - aY * 4)); - break; + case DOWN, UP -> mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (aZ * 4)); + case NORTH -> mRedstoneStrength = (byte) ((byte) (4 - aX * 4) + 4 * (byte) (4 - aY * 4)); + case SOUTH -> mRedstoneStrength = (byte) ((byte) (aX * 4) + 4 * (byte) (4 - aY * 4)); + case WEST -> mRedstoneStrength = (byte) ((byte) (aZ * 4) + 4 * (byte) (4 - aY * 4)); + case EAST -> mRedstoneStrength = (byte) ((byte) (4 - aZ * 4) + 4 * (byte) (4 - aY * 4)); } break; case 1: switch (side) { - case DOWN: - case UP: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (aX * 2) + 2 * (byte) (aZ * 2))))); - break; - case NORTH: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (2 - aX * 2) + 2 * (byte) (2 - aY * 2))))); - break; - case SOUTH: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (aX * 2) + 2 * (byte) (2 - aY * 2))))); - break; - case WEST: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (aZ * 2) + 2 * (byte) (2 - aY * 2))))); - break; - case EAST: - mRedstoneStrength = (byte) (mRedstoneStrength - ^ (1 << (((byte) (2 - aZ * 2) + 2 * (byte) (2 - aY * 2))))); - break; + case DOWN, UP -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (aX * 2) + 2 * (byte) (aZ * 2))))); + case NORTH -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (2 - aX * 2) + 2 * (byte) (2 - aY * 2))))); + case SOUTH -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (aX * 2) + 2 * (byte) (2 - aY * 2))))); + case WEST -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (aZ * 2) + 2 * (byte) (2 - aY * 2))))); + case EAST -> mRedstoneStrength = (byte) (mRedstoneStrength + ^ (1 << (((byte) (2 - aZ * 2) + 2 * (byte) (2 - aY * 2))))); } break; case 2: switch (side) { - case DOWN: - case UP: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (aZ * 4)))); - break; - case NORTH: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; - case SOUTH: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; - case WEST: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; - case EAST: - mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); - break; + case DOWN, UP -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (aZ * 4)))); + case NORTH -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); + case SOUTH -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); + case WEST -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); + case EAST -> mRedstoneStrength = (byte) (mRedstoneStrength ^ (1 << ((byte) (4 - aY * 4)))); } break; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java index 8fa38ac694..30002ac512 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java @@ -161,7 +161,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re public void switchGateForward(boolean aShift) { try { Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet(); - ArrayList<Integer> tList = new ArrayList<Integer>(); + ArrayList<Integer> tList = new ArrayList<>(); tList.addAll(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); @@ -179,7 +179,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re public void switchGateBackward(boolean aShift) { try { Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet(); - ArrayList<Integer> tList = new ArrayList<Integer>(); + ArrayList<Integer> tList = new ArrayList<>(); tList.addAll(tKeys); if (tList.size() <= 0) return; Collections.sort(tList); @@ -308,7 +308,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re } /** The Item List for Covers */ - public static final Map<Integer, ItemStack> sCoversItems = new HashMap<Integer, ItemStack>(); + public static final Map<Integer, ItemStack> sCoversItems = new HashMap<>(); private static void initCovers() { for (GT_ItemStack aKey : GregTech_API.sCovers.keySet()) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java deleted file mode 100644 index 5927f08ca9..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_AdvancedCraftingTable.java +++ /dev/null @@ -1,693 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.storage; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.network.PacketBuffer; -import net.minecraftforge.common.util.ForgeDirection; - -import org.apache.commons.lang3.ArrayUtils; - -import com.gtnewhorizons.modularui.api.drawable.IDrawable; -import com.gtnewhorizons.modularui.api.screen.ModularWindow; -import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.api.widget.Interactable; -import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils; -import com.gtnewhorizons.modularui.common.internal.wrapper.BaseSlot; -import com.gtnewhorizons.modularui.common.widget.ButtonWidget; -import com.gtnewhorizons.modularui.common.widget.SlotGroup; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.modularui.IAddGregtechLogo; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; -import gregtech.api.objects.GT_RenderedTexture; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.interfaces.IItemBlueprint; -import gtPlusPlus.core.item.general.ItemBlueprint; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; -import gtPlusPlus.xmod.gregtech.api.gui.widget.ElectricSlotWidget; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock; - -public class GT_MetaTileEntity_AdvancedCraftingTable extends GT_MetaTileEntity_BasicTank implements IAddGregtechLogo { - - public boolean mFlushMode = false; - - protected String mLocalName; - - public GT_MetaTileEntity_AdvancedCraftingTable(final int aID, final String aName, final String aNameRegional, - final int aTier, final String aDescription) { - super(aID, aName, aNameRegional, aTier, 35, aDescription); - mLocalName = aNameRegional; - } - - public GT_MetaTileEntity_AdvancedCraftingTable(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, 35, aDescription, aTextures); - } - - @Override - public boolean isTransformerUpgradable() { - return true; - } - - @Override - public boolean isSimpleMachine() { - return true; - } - - @Override - public boolean isValidSlot(int aIndex) { - return aIndex < 31 || aIndex > 32; - } - - @Override - public boolean isFacingValid(ForgeDirection facing) { - return true; - } - - @Override - public boolean isAccessAllowed(EntityPlayer aPlayer) { - return true; - } - - @Override - public boolean isEnetInput() { - return isElectric(); - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return true; - } - - @Override - public long maxEUInput() { - return isElectric() ? GT_Values.V[3] : 0; - } - - @Override - public long maxEUStore() { - return isElectric() ? GT_Values.V[3] * 1024 : 0; - } - - @Override - public boolean isElectric() { - return isAdvanced(); - } - - @Override - public boolean isPneumatic() { - return false; - } - - @Override - public boolean isSteampowered() { - return false; - } - - @Override - public long maxAmperesIn() { - return isElectric() ? 2 : 0; - } - - @Override - public long getMinimumStoredEU() { - return isElectric() ? GT_Values.V[3] * 2 : 0; - } - - @Override - public int getSizeInventory() { - return 35; - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_AdvancedCraftingTable( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); - return true; - } - - @Override - public boolean doesFillContainers() { - return false; - } - - @Override - public boolean doesEmptyContainers() { - return false; - } - - @Override - public boolean canTankBeFilled() { - return true; - } - - @Override - public boolean canTankBeEmptied() { - return true; - } - - @Override - public boolean displaysItemStack() { - return false; - } - - @Override - public boolean displaysStackSize() { - return false; - } - - public void sortIntoTheInputSlots() { - for (byte i = 21; i < 30; i++) if (mInventory[i] != null) { - if (mInventory[i].stackSize == 0) { - mInventory[i] = null; - } - if (mInventory[i] != null) for (byte j = 0; j < 16; j++) { - if (GT_Utility.areStacksEqual(mInventory[i], mInventory[j])) { - GT_Utility.moveStackFromSlotAToSlotB( - getBaseMetaTileEntity(), - getBaseMetaTileEntity(), - i, - j, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - if (mInventory[i] != null) for (byte j = 0; j < 16; j++) { - if (mInventory[j] == null) { - GT_Utility.moveStackFromSlotAToSlotB( - getBaseMetaTileEntity(), - getBaseMetaTileEntity(), - i, - j, - (byte) 64, - (byte) 1, - (byte) 64, - (byte) 1); - } - } - } - } - - private void fillLiquidContainers() { - for (byte i = 16; i < 21 && mFluid != null; i++) { - ItemStack tOutput = GT_Utility.fillFluidContainer(mFluid, mInventory[i], false, true); - if (tOutput != null) { - if (mInventory[i].stackSize == 1) { - mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize; - mInventory[i] = tOutput; - } else for (byte j = 16; j < 21; j++) { - if (mInventory[j] == null || (GT_Utility.areStacksEqual(tOutput, mInventory[j]) - && mInventory[j].stackSize + tOutput.stackSize <= tOutput.getMaxStackSize())) { - mFluid.amount -= GT_Utility.getFluidForFilledItem(tOutput, true).amount * tOutput.stackSize; - getBaseMetaTileEntity().decrStackSize(i, 1); - if (mInventory[j] == null) { - mInventory[j] = tOutput; - } else { - mInventory[j].stackSize++; - } - break; - } - } - if (mFluid != null && mFluid.amount <= 0) mFluid = null; - } - } - if (mFluid != null && mFluid.amount <= 0) mFluid = null; - } - - public void setBluePrint(ItemStack aStack) { - if (aStack == null) { - aStack = mInventory[30]; - Logger.INFO("Using Slot 30 supply."); - } - if (mInventory[31] == null || aStack == null - || aStack.getItem() == null - || aStack.getItemDamage() != 0 - || aStack.stackSize != 1 - || !(aStack.getItem() instanceof ItemBlueprint)) { - try { - Logger.INFO( - "Could not set Blueprint. Slot 31: " - + (mInventory[31] != null ? mInventory[31].getDisplayName() : "Null") - + ", aStack: " - + (aStack != null ? aStack.getDisplayName() : "Null") - + ", Damage: " - + (aStack != null ? aStack.getItemDamage() : "Null")); - } catch (Throwable t) { - t.printStackTrace(); - } - return; - } - if (!aStack.getTagCompound().hasKey("Inventory")) { - NBTTagCompound tNBT = new NBTTagCompound(); - NBTTagList tNBT_ItemList = new NBTTagList(); - for (int i = 0; i < 9; i++) { - ItemStack tStack = mInventory[i + 21]; - if (tStack != null) { - NBTTagCompound tag = new NBTTagCompound(); - tag.setByte("Slot", (byte) i); - tStack.writeToNBT(tag); - tNBT_ItemList.appendTag(tag); - } - } - tNBT.setTag("Inventory", tNBT_ItemList); - tNBT.setBoolean("mBlueprint", true); - tNBT.setInteger("mID", MathUtils.randInt(1, Short.MAX_VALUE)); - tNBT.setString("mName", mInventory[31].getDisplayName()); - aStack.setTagCompound(tNBT); - Logger.INFO("Set NBT of crafting table to Stack in slot 30."); - } else { - Logger.INFO("Blueprint already has recipe tags."); - } - } - - public ItemStack getCraftingOutput() { - if (mInventory[30] != null && mInventory[30].getItem() != null - && mInventory[30].getItemDamage() == 0 - && mInventory[30].hasTagCompound() - && mInventory[30].getItem() instanceof ItemBlueprint) { - // Logger.INFO("Getting Blueprint Data in slot 30. "+mInventory[30].getDisplayName()); - NBTTagCompound tNBT = mInventory[30].getTagCompound(); - NBTTagList tNBT_ItemList = tNBT.getTagList("Blueprint", 10); - for (int i = 0; i < tNBT_ItemList.tagCount() && i < 9; i++) { - NBTTagCompound tag = (NBTTagCompound) tNBT_ItemList.getCompoundTagAt(i); - byte slot = tag.getByte("Slot"); - if (slot >= 0 && slot < 9 && mInventory[slot + 21] == null) { - mInventory[slot + 21] = GT_Utility.loadItem(tag); - if (mInventory[slot + 21] != null) mInventory[slot + 21].stackSize = 0; - } - } - } - mInventory[31] = GT_ModHandler.getAllRecipeOutput( - getBaseMetaTileEntity().getWorld(), - new ItemStack[] { mInventory[21], mInventory[22], mInventory[23], mInventory[24], mInventory[25], - mInventory[26], mInventory[27], mInventory[28], mInventory[29] }); - return mInventory[31]; - } - - public boolean canDoCraftingOutput() { - if (mInventory[31] == null) return false; - for (ItemStack tStack : recipeContent()) { - if (tStack.stackSize > getAmountOf(tStack)) { - return false; - } - } - return true; - } - - private int getAmountOf(ItemStack aStack) { - int tAmount = 0; - for (byte i = 0; i < 30 && tAmount < 9; i++) { - if (GT_Utility.areStacksOrToolsEqual(aStack, mInventory[i])) { - tAmount += mInventory[i].stackSize; - } - } - return tAmount; - } - - private ArrayList<ItemStack> recipeContent() { - ArrayList<ItemStack> tList = new ArrayList<ItemStack>(); - for (byte i = 21; i < 30; i++) { - if (mInventory[i] != null) { - boolean temp = false; - for (byte j = 0; j < tList.size(); j++) { - if (GT_Utility.areStacksOrToolsEqual(mInventory[i], tList.get(j))) { - tList.get(j).stackSize++; - temp = true; - break; - } - } - if (!temp) tList.add(GT_Utility.copy(1, mInventory[i])); - } - } - return tList; - } - - public ItemStack consumeMaterials(EntityPlayer aPlayer, ItemStack aHoldStack) { - if (mInventory[31] == null) return aHoldStack; - if (aHoldStack != null) { - if (!GT_Utility.areStacksEqual(aHoldStack, mInventory[31])) return aHoldStack; - if (aHoldStack.stackSize + mInventory[31].stackSize > aHoldStack.getMaxStackSize()) return aHoldStack; - } - for (byte i = 21; i < 30; i++) if (mInventory[i] != null) { - for (byte j = 0; j <= i; j++) { - if (j < 21 || j == i) { - if (GT_Utility.areStacksOrToolsEqual(mInventory[i], mInventory[j]) && mInventory[j].stackSize > 0) { - ItemStack tStack = GT_Utility.getContainerItem(mInventory[j], true); - if (tStack == null || (tStack.isItemStackDamageable() - && tStack.getItemDamage() >= tStack.getMaxDamage())) { - getBaseMetaTileEntity().decrStackSize(j, 1); - } else if (mInventory[j].stackSize == 1) { - mInventory[j] = tStack; - } else { - getBaseMetaTileEntity().decrStackSize(j, 1); - for (byte k = 0; k < 21; k++) { - if (mInventory[k] == null) { - mInventory[k] = tStack; - break; - } else { - if (GT_Utility.areStacksEqual(tStack, mInventory[k])) { - if (tStack.stackSize + mInventory[k].stackSize - <= mInventory[k].getMaxStackSize()) { - mInventory[k].stackSize += tStack.stackSize; - break; - } - } - } - } - } - break; - } - } - } - } - if (aHoldStack == null) { - aHoldStack = GT_Utility.copy(mInventory[31]); - aHoldStack.onCrafting(getBaseMetaTileEntity().getWorld(), aPlayer, mInventory[31].stackSize); - } else { - aHoldStack.stackSize += mInventory[31].stackSize; - aHoldStack.onCrafting(getBaseMetaTileEntity().getWorld(), aPlayer, mInventory[31].stackSize); - } - - fillLiquidContainers(); - - return aHoldStack; - } - - @Override - public int rechargerSlotStartIndex() { - return 16; - } - - @Override - public int rechargerSlotCount() { - return 5; - } - - @Override - public long getOutputTier() { - return GT_Utility.getTier(getBaseMetaTileEntity().getInputVoltage()); - } - - @Override - public int getCapacity() { - return 64000; - } - - @Override - public int getTankPressure() { - return -100; - } - - @Override - public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - return aIndex == 33 || (mFlushMode && aIndex >= 21 && aIndex < 30); - } - - @Override - public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, - ItemStack aStack) { - if (aIndex < 16) { - for (byte i = 0; i < 16; i++) - if (GT_Utility.areStacksOrToolsEqual(aStack, mInventory[i])) return aIndex == i; - return true; - } - return false; - } - - @Override - public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPreTick(aBaseMetaTileEntity, aTick); - getCraftingOutput(); - } - - @Override - public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - super.onPostTick(aBaseMetaTileEntity, aTick); - if (getBaseMetaTileEntity().isServerSide()) { - if (getBaseMetaTileEntity().hasInventoryBeenModified()) getCraftingOutput(); - fillLiquidContainers(); - if (mFlushMode) { - mFlushMode = false; - for (byte i = 21; i < 30; i++) { - if (mInventory[i] != null) { - if (mInventory[i].stackSize == 0) { - mInventory[i] = null; - } else { - mFlushMode = true; - break; - } - } - } - } - } - /* - * if (aTick % 100 == 0) { for (int i = 0; i < this.mInventory.length; i++) { ItemStack aSlot = mInventory[i]; - * Logger.INFO("Slot "+i+" "+(aSlot != null ? "contains "+aSlot.getDisplayName() : "is empty")); } } - */ - } - - @Override - public String[] getDescription() { - return ArrayUtils.addAll( - this.mDescriptionArray, - isAdvanced() ? "For the very large Projects" : "For the smaller Projects", - "Hold Shift in GUI to see slot usage", - CORE.GT_Tooltip.get()); - } - - @Override - public ITexture[][][] getTextureSet(final ITexture[] aTextures) { - final ITexture[][][] rTextures = new ITexture[10][17][]; - for (byte i = -1; i < 16; i++) { - rTextures[0][i + 1] = this.getFront(i); - rTextures[1][i + 1] = this.getBack(i); - rTextures[2][i + 1] = this.getBottom(i); - rTextures[3][i + 1] = this.getTop(i); - rTextures[4][i + 1] = this.getSides(i); - rTextures[5][i + 1] = this.getFront(i); - rTextures[6][i + 1] = this.getBack(i); - rTextures[7][i + 1] = this.getBottom(i); - rTextures[8][i + 1] = this.getTop(i); - rTextures[9][i + 1] = this.getSides(i); - } - return rTextures; - } - - protected boolean isAdvanced() { - return true; - } - - @Override - public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final ForgeDirection side, - final ForgeDirection facing, final int aColorIndex, final boolean aActive, final boolean aRedstone) { - return this.mTextures[(aActive ? 5 : 0) - + (side == facing ? 0 - : side == facing.getOpposite() ? 1 - : side == ForgeDirection.DOWN ? 2 : side == ForgeDirection.UP ? 3 : 4)][aColorIndex - + 1]; - } - - public ITexture[] getFront(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) }; - } - - public ITexture[] getBack(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) }; - } - - public ITexture[] getBottom(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Bottom) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Bottom) }; - } - - public ITexture[] getTop(final byte aColor) { - if (isAdvanced()) { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Top), - new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Crafting_Overlay) }; - } else { - return new ITexture[] { new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Top), - new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Crafting_Overlay) }; - } - } - - public ITexture[] getSides(final byte aColor) { - return new ITexture[] { isAdvanced() ? new GT_RenderedTexture(TexturesGtBlock.Casing_Adv_Workbench_Side) - : new GT_RenderedTexture(TexturesGtBlock.Casing_Workbench_Side) }; - } - - @Override - public boolean useModularUI() { - return true; - } - - @Override - public void addGregTechLogo(ModularWindow.Builder builder) {} - - @Override - public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 4).endAtSlot(15).background(getGUITextureSet().getItemSlot()) - .build().setPos(7, 7)); - for (int i = 0; i < 5; i++) { - builder.widget(createElectricSlot(i + 16).setPos(81 + i * 18, 7)); - } - builder.widget( - SlotGroup.ofItemHandler(inventoryHandler, 3).startFromSlot(21).endAtSlot(29) - .background(getGUITextureSet().getItemSlot()).applyForWidget(SlotWidget::disableShiftInsert) - .build().setPos(81, 27)); - builder.widget( - new SlotWidget(inventoryHandler, 33).disableShiftInsert().addTooltipShift("Extraction Slot") - .addTooltipShift("Things can always be pulled from here") - .setBackground(getGUITextureSet().getItemSlot(), getArrowOverlay()).setPos(153, 27)) - .widget( - new SlotWidget(inventoryHandler, 34).disableShiftInsert().addTooltipShift("Free Parking") - .setBackground(getGUITextureSet().getItemSlot(), getParkOverlay()).setPos(153, 63)); - - builder.widget(new SlotWidget(inventoryHandler, 30) { - - @Override - public ClickResult onClick(int buttonId, boolean doubleClick) { - if (buttonId == 0 && Interactable.hasShiftDown()) { - syncToServer(99, NetworkUtils.EMPTY_PACKET); - return ClickResult.SUCCESS; - } - return super.onClick(buttonId, doubleClick); - } - - @Override - public void readOnServer(int id, PacketBuffer buf) throws IOException { - if (id == 99) { - setBluePrint(null); - } else { - super.readOnServer(id, buf); - } - } - }.setFilter(stack -> stack.getItem() instanceof IItemBlueprint).disableShiftInsert() - .addTooltipShift("Blueprint Slot").addTooltipShift("Shift+Lmb Sets to crafting output") - .setBackground(getGUITextureSet().getItemSlot(), getBlueprintOverlay()).setPos(135, 27)); - - builder.widget(new SlotWidget(BaseSlot.phantom(inventoryHandler, 31)) { - - @Override - protected void phantomClick(ClickData clickData, ItemStack cursorStack) { - EntityPlayer aPlayer = getContext().getPlayer(); - ItemStack tStack = getMcSlot().getStack(); - if (tStack == null) return; - if (tStack.stackSize <= 0 && !GT_Utility.areStacksEqual(tStack, aPlayer.inventory.getItemStack())) { - return; - } - ItemStack tStack2, tCraftedStack = getCraftingOutput(); - if (tCraftedStack != null) { - if (clickData.shift) { - for (byte i = 0; i < aPlayer.inventory.mainInventory.length; i++) { - for (byte j = 0; j < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize - && canDoCraftingOutput(); j++) { - if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack) - || tStack.stackSize != tStack2.stackSize) - return; - aPlayer.inventory.mainInventory[i] = consumeMaterials( - aPlayer, - aPlayer.inventory.mainInventory[i]); - } - } - } else { - if (clickData.mouseButton == 0) { - if (canDoCraftingOutput()) aPlayer.inventory - .setItemStack(consumeMaterials(aPlayer, aPlayer.inventory.getItemStack())); - } else { - for (int i = 0; i < tCraftedStack.getMaxStackSize() / tCraftedStack.stackSize - && canDoCraftingOutput(); i++) { - if (!GT_Utility.areStacksEqual(tStack2 = getCraftingOutput(), tCraftedStack) - || tStack.stackSize != tStack2.stackSize) - return; - aPlayer.inventory - .setItemStack(consumeMaterials(aPlayer, aPlayer.inventory.getItemStack())); - } - } - } - } - } - - @Override - public boolean handleDragAndDrop(ItemStack draggedStack, int button) { - return false; - } - - @Override - public List<String> getExtraTooltip() { - return Collections.emptyList(); - } - }.setAccess(false, false).setHandlePhantomActionClient(true).addTooltipShift("Output Slot") - .setBackground(getGUITextureSet().getItemSlot(), getCraftOutputOverlay()).setPos(135, 63)); - - builder.widget( - new ButtonWidget().setOnClick((clickData, widget) -> sortIntoTheInputSlots()).addTooltipShift("Flush") - .addTooltipShift("Empty crafting grid back to storage") - .setBackground(getButtonIcon(), getFlushOverlay()).setPos(135, 45).setSize(18, 18)) - .widget( - new ButtonWidget().setOnClick((clickData, widget) -> mFlushMode = true) - .addTooltipShift("Automation").addTooltipShift("Allows output while") - .addTooltipShift("crafting grid is full") - .setBackground(getButtonIcon(), GTPP_UITextures.OVERLAY_BUTTON_AUTOMATION) - .setPos(153, 45).setSize(18, 18)); - } - - protected SlotWidget createElectricSlot(int index) { - return (SlotWidget) new ElectricSlotWidget(inventoryHandler, index).setShiftClickPriority(-1) - .setBackground(getGUITextureSet().getItemSlot(), GTPP_UITextures.OVERLAY_SLOT_ELECTRIC_TOOL); - } - - protected IDrawable getArrowOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_ARROW; - } - - protected IDrawable getParkOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_PARK; - } - - protected IDrawable getBlueprintOverlay() { - return GT_UITextures.OVERLAY_SLOT_PAGE_PRINTED; - } - - protected IDrawable getCraftOutputOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_CRAFT_OUTPUT; - } - - protected IDrawable getButtonIcon() { - return GT_UITextures.BUTTON_STANDARD; - } - - protected IDrawable getFlushOverlay() { - return GTPP_UITextures.OVERLAY_BUTTON_FLUSH; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java deleted file mode 100644 index e4fdb869ab..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_BronzeCraftingTable.java +++ /dev/null @@ -1,117 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tileentities.storage; - -import net.minecraftforge.common.util.ForgeDirection; - -import com.gtnewhorizons.modularui.api.drawable.IDrawable; -import com.gtnewhorizons.modularui.common.widget.SlotWidget; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.SteamVariant; -import gregtech.api.gui.modularui.GUITextureSet; -import gregtech.api.interfaces.ITexture; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.objects.GT_ItemStack; -import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures; - -public class GT_MetaTileEntity_BronzeCraftingTable extends GT_MetaTileEntity_AdvancedCraftingTable { - - public GT_MetaTileEntity_BronzeCraftingTable(final int aID, final String aName, final String aNameRegional, - final int aTier, final String aDescription) { - super(aID, aName, aNameRegional, aTier, aDescription); - } - - public GT_MetaTileEntity_BronzeCraftingTable(final String aName, final int aTier, final String[] aDescription, - final ITexture[][][] aTextures) { - super(aName, aTier, aDescription, aTextures); - } - - @Override - public boolean isTransformerUpgradable() { - return false; - } - - @Override - public boolean isInputFacing(ForgeDirection side) { - return false; - } - - @Override - public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_BronzeCraftingTable( - this.mName, - this.mTier, - this.mDescriptionArray, - this.mTextures); - } - - @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { - return GregTech_API.getCoverBehaviorNew(aStack.toStack()).isSimpleCover(); - } - - @Override - public int rechargerSlotStartIndex() { - return 0; - } - - @Override - public int rechargerSlotCount() { - return 0; - } - - @Override - public int getCapacity() { - return 16000; - } - - @Override - protected boolean isAdvanced() { - return false; - } - - @Override - public SteamVariant getSteamVariant() { - return SteamVariant.BRONZE; - } - - @Override - public GUITextureSet getGUITextureSet() { - return GUITextureSet.STEAM.apply(getSteamVariant()); - } - - @Override - protected SlotWidget createElectricSlot(int index) { - return (SlotWidget) new SlotWidget(inventoryHandler, index).setBackground(getGUITextureSet().getItemSlot()); - } - - @Override - protected IDrawable getArrowOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_ARROW_BRONZE; - } - - @Override - protected IDrawable getParkOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_PARK_BRONZE; - } - - @Override - protected IDrawable getBlueprintOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_PAGE_PRINTED_BRONZE; - } - - @Override - protected IDrawable getCraftOutputOverlay() { - return GTPP_UITextures.OVERLAY_SLOT_CRAFT_OUTPUT_BRONZE; - } - - @Override - protected IDrawable getButtonIcon() { - return GTPP_UITextures.BUTTON_STANDARD_BRONZE; - } - - @Override - protected IDrawable getFlushOverlay() { - return GTPP_UITextures.OVERLAY_BUTTON_FLUSH_BRONZE; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java index 6c263b6836..e360f1d4b7 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java @@ -29,7 +29,13 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { public GT_MetaTileEntity_TieredTank(final int aID, final String aName, final String aNameRegional, final int aTier) { - super(aID, aName, aNameRegional, aTier, 3, "Stores " + ((int) (Math.pow(2, aTier) * 32000)) + "L of fluid"); + super( + aID, + aName, + aNameRegional, + aTier, + 3, + "Stores " + GT_Utility.formatNumbers(((int) (Math.pow(2, aTier) * 32000))) + "L of fluid"); } public GT_MetaTileEntity_TieredTank(final String aName, final int aTier, final String[] aDescription, @@ -133,11 +139,10 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank { if (this.mFluid == null) { return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", "No Fluid", - Integer.toString(0) + "L", Integer.toString(this.getCapacity()) + "L" }; + 0 + "L", this.getCapacity() + "L" }; } return new String[] { GT_Values.VOLTAGE_NAMES[this.mTier] + " Fluid Tank", "Stored Fluid:", - this.mFluid.getLocalizedName(), Integer.toString(this.mFluid.amount) + "L", - Integer.toString(this.getCapacity()) + "L" }; + this.mFluid.getLocalizedName(), this.mFluid.amount + "L", this.getCapacity() + "L" }; } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java deleted file mode 100644 index dbae822abd..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricButcherKnife.java +++ /dev/null @@ -1,187 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; - -import gregtech.GT_Mod; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SoundResource; -import gregtech.api.enums.Textures.ItemIcons; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.items.behaviors.Behaviour_None; -import gregtech.common.tools.GT_Tool; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; - -public class TOOL_Gregtech_ElectricButcherKnife extends GT_Tool { - - public static final List<String> mEffectiveList = Arrays - .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" }); - - @Override - public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, - final EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); - tName = tName.substring(tName.lastIndexOf(".") + 1); - return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage; - } - - @Override - public int getToolDamagePerBlockBreak() { - return 100; - } - - @Override - public int getToolDamagePerDropConversion() { - return 100; - } - - @Override - public int getToolDamagePerContainerCraft() { - return 100; - } - - @Override - public int getToolDamagePerEntityAttack() { - return 200; - } - - @Override - public int getBaseQuality() { - return 0; - } - - @Override - public float getBaseDamage() { - return 8.0F; - } - - @Override - public float getSpeedMultiplier() { - return 2F; - } - - @Override - public float getMaxDurabilityMultiplier() { - return 1.8F; - } - - @Override - public String getCraftingSound() { - return SoundResource.RANDOM_ANVIL_USE.toString(); - } - - @Override - public String getEntityHitSound() { - return SoundResource.RANDOM_ANVIL_BREAK.toString(); - } - - @Override - public String getMiningSound() { - return null; - } - - @Override - public boolean canBlock() { - return false; - } - - @Override - public boolean isWrench() { - return false; - } - - @Override - public boolean isCrowbar() { - return false; - } - - @Override - public boolean isMinableBlock(final Block aBlock, final byte aMetaData) { - final String tTool = aBlock.getHarvestTool(aMetaData); - return (tTool != null) && (tTool.equals("sword") || tTool.equals("knife")); - } - - @Override - public ItemStack getBrokenItem(final ItemStack aStack) { - return null; - } - - @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return (IIconContainer) (aIsToolHead ? TexturesGtTools.ELECTRIC_BUTCHER_KNIFE : ItemIcons.POWER_UNIT_HV); - } - - @Override - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.RedSteel.mRGBa; - } - - @Override - public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) { - super.onToolCrafted(aStack, aPlayer); - aPlayer.triggerAchievement(AchievementList.buildSword); - try { - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); - } catch (final Exception e) {} - } - - @Override - public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) { - return new ChatComponentText( - EnumChatFormatting.RED + aEntity.getCommandSenderName() - + EnumChatFormatting.WHITE - + " has been Sliced out of existence by " - + EnumChatFormatting.GREEN - + aPlayer.getCommandSenderName() - + EnumChatFormatting.WHITE); - } - - @Override - public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) { - aItem.addItemBehavior(aID, new Behaviour_None()); - } - - @Override - public boolean isGrafter() { - return false; - } - - @Override - public int getHurtResistanceTime(int aOriginalHurtResistance, Entity aEntity) { - return aOriginalHurtResistance * 2; - } - - @Override - public boolean isWeapon() { - return true; - } - - @Override - public boolean isMiningTool() { - return false; - } - - @Override - public Enchantment[] getEnchantments(ItemStack aStack) { - return LOOTING_ENCHANTMENT; - } - - @Override - public int[] getEnchantmentLevels(ItemStack aStack) { - return new int[] { (4 + GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mToolQuality) / 2 }; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java deleted file mode 100644 index 46720bb4f2..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tools/TOOL_Gregtech_ElectricLighter.java +++ /dev/null @@ -1,165 +0,0 @@ -package gtPlusPlus.xmod.gregtech.common.tools; - -import java.util.Arrays; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.monster.EntityIronGolem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.stats.AchievementList; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.IChatComponent; - -import gregtech.GT_Mod; -import gregtech.api.enums.Materials; -import gregtech.api.enums.SoundResource; -import gregtech.api.enums.Textures.ItemIcons; -import gregtech.api.interfaces.IIconContainer; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.tools.GT_Tool; -import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools; -import gtPlusPlus.xmod.gregtech.common.items.behaviours.Behaviour_Electric_Lighter; - -public class TOOL_Gregtech_ElectricLighter extends GT_Tool { - - public static final List<String> mEffectiveList = Arrays - .asList(new String[] { EntityIronGolem.class.getName(), "EntityTowerGuardian" }); - - @Override - public float getNormalDamageAgainstEntity(final float aOriginalDamage, final Entity aEntity, final ItemStack aStack, - final EntityPlayer aPlayer) { - String tName = aEntity.getClass().getName(); - tName = tName.substring(tName.lastIndexOf(".") + 1); - return (mEffectiveList.contains(tName)) || (tName.contains("Golem")) ? aOriginalDamage * 2.0F : aOriginalDamage; - } - - @Override - public int getToolDamagePerBlockBreak() { - return 50; - } - - @Override - public int getToolDamagePerDropConversion() { - return 100; - } - - @Override - public int getToolDamagePerContainerCraft() { - return 400; - } - - @Override - public int getToolDamagePerEntityAttack() { - return 100; - } - - @Override - public int getBaseQuality() { - return 0; - } - - @Override - public float getBaseDamage() { - return 8.0F; - } - - @Override - public float getSpeedMultiplier() { - return 2F; - } - - @Override - public float getMaxDurabilityMultiplier() { - return 1.8F; - } - - @Override - public String getCraftingSound() { - return SoundResource.RANDOM_ANVIL_USE.toString(); - } - - @Override - public String getEntityHitSound() { - return SoundResource.RANDOM_ANVIL_BREAK.toString(); - } - - @Override - public String getMiningSound() { - return null; - } - - @Override - public boolean canBlock() { - return false; - } - - @Override - public boolean isWrench() { - return false; - } - - @Override - public boolean isCrowbar() { - return false; - } - - @Override - public boolean isWeapon() { - return true; - } - - @Override - public boolean isMinableBlock(final Block aBlock, final byte aMetaData) { - return false; - } - - @Override - public ItemStack getBrokenItem(final ItemStack aStack) { - return null; - } - - @Override - public IIconContainer getIcon(boolean aIsToolHead, ItemStack aStack) { - return (IIconContainer) (aIsToolHead ? TexturesGtTools.ELECTRIC_LIGHTER : ItemIcons.POWER_UNIT_HV); - } - - @Override - public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { - return !aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa : Materials.Silver.mRGBa; - } - - @Override - public void onToolCrafted(final ItemStack aStack, final EntityPlayer aPlayer) { - super.onToolCrafted(aStack, aPlayer); - aPlayer.triggerAchievement(AchievementList.buildSword); - try { - GT_Mod.achievements.issueAchievement(aPlayer, "tools"); - GT_Mod.achievements.issueAchievement(aPlayer, "unitool"); - } catch (final Exception e) {} - } - - @Override - public IChatComponent getDeathMessage(final EntityLivingBase aPlayer, final EntityLivingBase aEntity) { - return new ChatComponentText( - EnumChatFormatting.RED + aEntity.getCommandSenderName() - + EnumChatFormatting.WHITE - + " has been burnt out of existence by " - + EnumChatFormatting.GREEN - + aPlayer.getCommandSenderName() - + EnumChatFormatting.WHITE); - } - - @Override - public void onStatsAddedToTool(final GT_MetaGenerated_Tool aItem, final int aID) { - aItem.addItemBehavior(aID, new Behaviour_Electric_Lighter()); - } - - @Override - public boolean isGrafter() { - return false; - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java index 247cdb890b..be4accba19 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingAngleGrinder.java @@ -49,8 +49,8 @@ public class ProcessingAngleGrinder implements Interface_OreRecipeRegistrator, R Logger.MATERIALS("Materials to attempt tool gen. with: " + size); int used = 0; Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; + for (Materials materials : i) { + aMaterial = materials; if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java deleted file mode 100644 index f1493f2e63..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricButcherKnife.java +++ /dev/null @@ -1,142 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; - -public class ProcessingElectricButcherKnife implements Interface_OreRecipeRegistrator, Runnable { - - public ProcessingElectricButcherKnife() { - GregtechOrePrefixes.toolElectricButcherKnife.add(this); - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING))) {} - } - } - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - // TODO Auto-generated method stub - - } - - public void materialsLoops() { - final Materials[] i = Materials.values(); - final int size = i.length; - Logger.MATERIALS("Materials to attempt tool gen. with: " + size); - int used = 0; - Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) - && (aMaterial != Materials.Rubber) - && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING)) - && (!aMaterial.contains(SubTag.TRANSPARENT)) - && (!aMaterial.contains(SubTag.FLAMMABLE)) - && (!aMaterial.contains(SubTag.MAGICAL)) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { - Logger.MATERIALS( - "Generating Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)); - // Input 1 - - final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); - final ItemStack screw = GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L); - - if ((null != plate) && screw != null) { - addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1)); - addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1)); - addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1)); - used++; - } else { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " - + (plate == null) - + " | Rod? " - + " |"); - } - // GT_ModHandler.addCraftingRecipe(, - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | - // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", - // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), - // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), - // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); - } else { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " - + MaterialUtils.getMaterialName(aMaterial)); - } - } else { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial)); - } - } - - Logger.INFO("Materials used for tool gen: " + used); - } - - @Override - public void run() { - Logger.INFO("Generating Electric Butcher Knives for all valid GT Materials."); - this.materialsLoops(); - } - - public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { - - ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_BUTCHER_KNIFE, - 1, - aMaterial, - Materials.Titanium, - new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.BUTCHERYKNIFE, 1, aMaterial, aMaterial, null); - - long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); - if (aDura <= 32000) { - Logger.MATERIALS( - "Unable to generate Electric Butcher Knife from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " - + aDura); - return false; - } - - return RecipeUtils.addShapedRecipe( - OrePrefixes.wireFine.get(Materials.Electrum), - aInputCutter, - OrePrefixes.wireFine.get(Materials.Electrum), - OrePrefixes.plate.get(aMaterial), - CI.getElectricMotor(aVoltageTier, 1), - OrePrefixes.plate.get(aMaterial), - OrePrefixes.screw.get(aMaterial), - aBattery, - OrePrefixes.screw.get(aMaterial), - aOutputStack); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java deleted file mode 100644 index ee1cbc2744..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricLighter.java +++ /dev/null @@ -1,139 +0,0 @@ -package gtPlusPlus.xmod.gregtech.loaders; - -import net.minecraft.item.ItemStack; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.recipe.common.CI; -import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; -import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; -import gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedGregtechTools; - -public class ProcessingElectricLighter implements Interface_OreRecipeRegistrator, Runnable { - - public ProcessingElectricLighter() { - GregtechOrePrefixes.toolElectricLighter.add(this); - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint)) { - if (aMaterial != Materials.Rubber) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING))) {} - } - } - } - - @Override - public void registerOre(final GregtechOrePrefixes aPrefix, final GT_Materials aMaterial, final String aOreDictName, - final String aModName, final ItemStack aStack) { - // TODO Auto-generated method stub - - } - - public void materialsLoops() { - final Materials[] i = Materials.values(); - final int size = i.length; - Logger.MATERIALS("Materials to attempt tool gen. with: " + size); - int used = 0; - Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; - if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) - && (aMaterial != Materials.Rubber) - && (aMaterial != Materials._NULL)) { - if ((!aMaterial.contains(SubTag.WOOD)) && (!aMaterial.contains(SubTag.BOUNCY)) - && (!aMaterial.contains(SubTag.NO_SMASHING)) - && (!aMaterial.contains(SubTag.TRANSPARENT)) - && (!aMaterial.contains(SubTag.FLAMMABLE)) - && (!aMaterial.contains(SubTag.MAGICAL)) - && (!aMaterial.contains(SubTag.NO_SMELTING))) { - Logger.MATERIALS("Generating Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)); - // Input 1 - - final ItemStack plate = GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L); - - if ((null != plate)) { - addRecipe(aMaterial, 1600000L, 3, ItemList.Battery_RE_HV_Lithium.get(1)); - addRecipe(aMaterial, 1200000L, 3, ItemList.Battery_RE_HV_Cadmium.get(1)); - addRecipe(aMaterial, 800000L, 3, ItemList.Battery_RE_HV_Sodium.get(1)); - used++; - } else { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) - + ", Plate or Long Rod may be invalid. Invalid | Plate? " - + (plate == null) - + " | Rod? " - + " |"); - } - // GT_ModHandler.addCraftingRecipe(, - // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | - // GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"P H", "PIP", " I ", - // Character.valueOf('I'), OrePrefixes.ingot.get(aMaterial), - // Character.valueOf('P'), OrePrefixes.plate.get(aMaterial), - // Character.valueOf('H'), OrePrefixes.toolHeadHammer.get(aMaterial)}); - } else { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)); - } - } else { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial)); - } - } - - Logger.INFO("Materials used for tool gen: " + used); - } - - @Override - public void run() { - Logger.INFO("Generating Electric Lighters for all valid GT Materials."); - this.materialsLoops(); - } - - public boolean addRecipe(Materials aMaterial, long aBatteryStorage, int aVoltageTier, ItemStack aBattery) { - - ItemStack aOutputStack = MetaGeneratedGregtechTools.INSTANCE.getToolWithStats( - MetaGeneratedGregtechTools.ELECTRIC_LIGHTER, - 1, - aMaterial, - Materials.Titanium, - new long[] { aBatteryStorage, GT_Values.V[aVoltageTier], 3L, -1L }); - - ItemStack aInputCutter = GT_MetaGenerated_Tool_01.INSTANCE - .getToolWithStats(GT_MetaGenerated_Tool_01.SOLDERING_IRON_LV, 1, aMaterial, aMaterial, null); - - long aDura = MetaGeneratedGregtechTools.getToolMaxDamage(aOutputStack); - if (aDura <= 32000) { - Logger.MATERIALS( - "Unable to generate Electric Lighter from " + MaterialUtils.getMaterialName(aMaterial) - + ", Durability: " - + aDura); - return false; - } - - return RecipeUtils.addShapedRecipe( - OrePrefixes.wireGt04.get(Materials.Gold), - aInputCutter, - OrePrefixes.wireGt04.get(Materials.Gold), - ELEMENT.STANDALONE.RUNITE.getPlate(1), - CI.getSensor(aVoltageTier, 1), - ELEMENT.STANDALONE.RUNITE.getPlate(1), - OrePrefixes.plate.get(aMaterial), - aBattery, - OrePrefixes.plate.get(aMaterial), - aOutputStack); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java index a431d4a500..3b9d5b8e0c 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/ProcessingElectricSnips.java @@ -49,8 +49,8 @@ public class ProcessingElectricSnips implements Interface_OreRecipeRegistrator, Logger.MATERIALS("Materials to attempt tool gen. with: " + size); int used = 0; Materials aMaterial = null; - for (int r = 0; r < size; r++) { - aMaterial = i[r]; + for (Materials materials : i) { + aMaterial = materials; if ((aMaterial != Materials.Stone) && (aMaterial != Materials.Flint) && (aMaterial != Materials.Rubber) && (aMaterial != Materials._NULL)) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java index 28d0609e93..acef57b368 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_AlloySmelter.java @@ -12,7 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_AlloySmelter extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java index 79a5947d66..0e67ab7ebc 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Assembler.java @@ -14,7 +14,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Assembler extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java index b072f7ee21..e85f8e4f5e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java @@ -25,7 +25,7 @@ import gtPlusPlus.core.util.minecraft.MaterialUtils; public class RecipeGen_BlastSmelter extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java index a6f19d05fe..a48fa23765 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelterGT_GTNH.java @@ -21,8 +21,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_BlastSmelterGT_GTNH { - private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<String, FluidStack>(); - private static Map<String, String> mCachedHotToColdRegistry = new HashMap<String, String>(); + private static Map<String, FluidStack> mCachedIngotToFluidRegistry = new HashMap<>(); + private static Map<String, String> mCachedHotToColdRegistry = new HashMap<>(); private static synchronized void setIngotToFluid(final ItemStackData stack, final FluidStack fluid) { if (stack != null && fluid != null) { @@ -186,7 +186,7 @@ public class RecipeGen_BlastSmelterGT_GTNH { boolean circuitFound = false; // Build correct input stack - ArrayList<ItemStack> aTempList = new ArrayList<ItemStack>(); + ArrayList<ItemStack> aTempList = new ArrayList<>(); for (ItemStack recipeItem : inputs) { if (ItemUtils.isControlCircuit(recipeItem)) { circuitFound = true; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java index ed8c18ba4b..b30a16f44f 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java @@ -25,7 +25,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_DustGeneration extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); @@ -338,7 +338,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base { } public static boolean generatePackagerRecipes(Material aMatInfo) { - AutoMap<Boolean> aResults = new AutoMap<Boolean>(); + AutoMap<Boolean> aResults = new AutoMap<>(); // Small Dust aResults.put( GT_Values.RA.addBoxingRecipe( diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java index d2d54a920c..7ef35b26a0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Extruder.java @@ -15,7 +15,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Extruder extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java index 561c0884cd..0510037f5d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_FluidCanning.java @@ -40,7 +40,7 @@ public class RecipeGen_FluidCanning implements Runnable { private static boolean mHasRun = false; - private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<RecipeGen_FluidCanning>(); + private static HashSet<RecipeGen_FluidCanning> mCache = new HashSet<>(); private static void addRunnableToRecipeCache(RecipeGen_FluidCanning r) { if (mHasRun) { @@ -144,8 +144,6 @@ public class RecipeGen_FluidCanning implements Runnable { recipe = aRecipe; disableOptional = aExtracting; isValid = true; - // Logger.INFO("Passed Validity Check. Hash: "+recipe.hashCode()); - // Logger.INFO("Mapped as: "+(disableOptional ? "Extracting" : "Canning")); addRunnableToRecipeCache(this); } else { // Logger.INFO("Failed Validity Check."); @@ -174,7 +172,7 @@ public class RecipeGen_FluidCanning implements Runnable { } } - private final boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { + private boolean addFluidExtractionRecipe(GT_Recipe aRecipe) { boolean result = false; CORE.crash(); Logger.INFO( @@ -211,7 +209,7 @@ public class RecipeGen_FluidCanning implements Runnable { return result; } - private final boolean addFluidCannerRecipe(GT_Recipe aRecipe) { + private boolean addFluidCannerRecipe(GT_Recipe aRecipe) { boolean result = false; int aCount1 = GT_Recipe_Map.sFluidCannerRecipes.mRecipeList.size(); int aCount2 = aCount1; @@ -257,7 +255,7 @@ public class RecipeGen_FluidCanning implements Runnable { + " | "; } - private final int getMapSize(GT_Recipe_Map aMap) { + private int getMapSize(GT_Recipe_Map aMap) { return aMap.mRecipeList.size(); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java index fa08380596..0d5c218ab9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluids.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Fluids extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java index d1bcab904c..c8f87d7cb3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Fluorite.java @@ -22,7 +22,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_Fluorite extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java index 734832807e..11475c1024 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MaterialProcessing.java @@ -21,7 +21,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_MaterialProcessing extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); @@ -57,11 +57,11 @@ public class RecipeGen_MaterialProcessing extends RecipeGen_Base { partSizes[hu] = (int) material.vSmallestRatio[hu]; } } - AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>(); + AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>(); int alnsnfds = 0; for (MaterialStack r : material.getComposites()) { if (r != null) { - componentMap.put(new Pair<Integer, Material>(partSizes[alnsnfds], r.getStackMaterial())); + componentMap.put(new Pair<>(partSizes[alnsnfds], r.getStackMaterial())); } alnsnfds++; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java index 0464ae80d7..f90c497edb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_MetalRecipe.java @@ -14,7 +14,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_MetalRecipe extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java index fdbeea89cf..68799b15d1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Ore.java @@ -27,7 +27,7 @@ import gtPlusPlus.core.util.minecraft.RecipeUtils; public class RecipeGen_Ore extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); @@ -73,7 +73,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { boolean allFailed = false; // Setup Bonuses - ArrayList<Material> aMatComp = new ArrayList<Material>(); + ArrayList<Material> aMatComp = new ArrayList<>(); for (Material j : MaterialUtils.getCompoundMaterialsRecursively(material)) { aMatComp.add(j); } @@ -84,7 +84,7 @@ public class RecipeGen_Ore extends RecipeGen_Base { } } - AutoMap<Material> amJ = new AutoMap<Material>(); + AutoMap<Material> amJ = new AutoMap<>(); int aIndexCounter = 0; for (Material g : aMatComp) { if (g.hasSolidForm()) { @@ -134,10 +134,10 @@ public class RecipeGen_Ore extends RecipeGen_Base { bonusB = tVoltageMultiplier > 100 ? material : mStone; } - AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<Pair<Integer, Material>>(); + AutoMap<Pair<Integer, Material>> componentMap = new AutoMap<>(); for (MaterialStack r : material.getComposites()) { if (r != null) { - componentMap.put(new Pair<Integer, Material>(r.getPartsPerOneHundred(), r.getStackMaterial())); + componentMap.put(new Pair<>(r.getPartsPerOneHundred(), r.getStackMaterial())); } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java index 22d3e689da..bc27630bcf 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plasma.java @@ -15,7 +15,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Plasma extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java index 9cd6fedbc0..75d7abbba0 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Plates.java @@ -19,7 +19,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_Plates extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java index d821751c7b..0087ee07d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_Recycling.java @@ -29,7 +29,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class RecipeGen_Recycling implements Runnable { - public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<Runnable>(); + public static AutoMap<Runnable> mQueuedRecyclingGenerators = new AutoMap<>(); public static void executeGenerators() { if (mQueuedRecyclingGenerators.size() > 0) { @@ -80,7 +80,7 @@ public class RecipeGen_Recycling implements Runnable { mValidPrefixesAsString[r].name() + Utils.sanitizeString(material.getLocalizedName()), 1); if (temp != null) { - mValidPairs[mSlotIndex++] = new Pair<OrePrefixes, ItemStack>(mValidPrefixesAsString[r], temp.copy()); + mValidPairs[mSlotIndex++] = new Pair<>(mValidPrefixesAsString[r], temp.copy()); } } @@ -218,7 +218,7 @@ public class RecipeGen_Recycling implements Runnable { if (mPrefix != null && mDust != null) { Logger.WARNING("Built valid dust pair."); - return new Pair<OrePrefixes, ItemStack>(mPrefix, mDust); + return new Pair<>(mPrefix, mDust); } else { Logger.WARNING("mPrefix: " + (mPrefix != null)); Logger.WARNING("mDust: " + (mDust != null)); @@ -310,7 +310,7 @@ public class RecipeGen_Recycling implements Runnable { public static ArrayList<ItemStack> getOres(final Object aOreName) { final String aName = (aOreName == null) ? "" : aOreName.toString(); - final ArrayList<ItemStack> rList = new ArrayList<ItemStack>(); + final ArrayList<ItemStack> rList = new ArrayList<>(); if (GT_Utility.isStringValid(aName)) { Logger.WARNING("Making a list of all OreDict entries for " + aOreName + "."); if (rList.addAll(OreDictionary.getOres(aName))) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java index e414d8c511..fed32b5f7d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java @@ -12,7 +12,7 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeGen_ShapedCrafting extends RecipeGen_Base { - public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<RunnableWithInfo<Material>>(); + public static final Set<RunnableWithInfo<Material>> mRecipeGenMap = new HashSet<>(); static { MaterialGenerator.mRecipeMapsToGenerate.put(mRecipeGenMap); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java index 7ca8d4d78e..980bf983ca 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_AlgaeFarm.java @@ -17,8 +17,8 @@ import gtPlusPlus.core.util.minecraft.ItemUtils; public class RecipeLoader_AlgaeFarm { - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); - private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<Integer, AutoMap<GT_Recipe>>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCache = new HashMap<>(); + private static final HashMap<Integer, AutoMap<GT_Recipe>> mRecipeCompostCache = new HashMap<>(); public static void generateRecipes() { for (int i = 0; i < 10; i++) { @@ -35,7 +35,7 @@ public class RecipeLoader_AlgaeFarm { AutoMap<GT_Recipe> aTemp = aMap.get(aTier); if (aTemp == null || aTemp.isEmpty()) { - aTemp = new AutoMap<GT_Recipe>(); + aTemp = new AutoMap<>(); aMap.put(aTier, aTemp); Logger.INFO("Tier " + aTier + aComp + " had no recipes, initialising new map."); } @@ -62,7 +62,7 @@ public class RecipeLoader_AlgaeFarm { return null; } - WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<Float>(); + WeightedCollection<Float> aOutputTimeMulti = new WeightedCollection<>(); for (int i = 100; i > 0; i--) { float aValue = 0; if (i < 10) { @@ -112,7 +112,7 @@ public class RecipeLoader_AlgaeFarm { private static ItemStack[] getOutputsForTier(int aTier) { // Create an Automap to dump contents into - AutoMap<ItemStack> aOutputMap = new AutoMap<ItemStack>(); + AutoMap<ItemStack> aOutputMap = new AutoMap<>(); // Add loot relevant to tier and also add any from lower tiers. diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java index 9c92f40608..27f289a7c5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_LFTR.java @@ -20,12 +20,12 @@ public class RecipeLoader_LFTR { private static void configureSparging() { if (mSpargeGases == null) { - mSpargeGases = new AutoMap<Fluid>(); + mSpargeGases = new AutoMap<>(); mSpargeGases.add(Materials.Helium.getGas(1).getFluid()); mSpargeGases.add(Materials.Fluorine.getGas(1).getFluid()); } if (mNobleGases == null) { - mNobleGases = new AutoMap<Fluid>(); + mNobleGases = new AutoMap<>(); mNobleGases.add(mSpargeGases.get(0)); mNobleGases.add(ELEMENT.getInstance().XENON.getFluid()); mNobleGases.add(ELEMENT.getInstance().NEON.getFluid()); @@ -34,7 +34,7 @@ public class RecipeLoader_LFTR { mNobleGases.add(ELEMENT.getInstance().RADON.getFluid()); } if (mFluorideGases == null) { - mFluorideGases = new AutoMap<Fluid>(); + mFluorideGases = new AutoMap<>(); mFluorideGases.add(mSpargeGases.get(1)); mFluorideGases.add(FLUORIDES.LITHIUM_FLUORIDE.getFluid()); mFluorideGases.add(FLUORIDES.NEPTUNIUM_HEXAFLUORIDE.getFluid()); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index c31500d084..8b59e2d232 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -18,8 +18,7 @@ public class RecipeLoader_MolecularTransformer { public static void run() { - for (int i = 0; i < transformerRecipes.size(); i++) { - MTRecipeRecord aRecipe = transformerRecipes.get(i); + for (MTRecipeRecord aRecipe : transformerRecipes) { int aEU = MaterialUtils.getVoltageForTier(5); Logger.INFO("======================="); Logger.INFO("Generating GT recipe for Molecular Transformer."); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java index 19f6f42f64..fcdd93d0fd 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/Gregtech4Content.java @@ -5,19 +5,11 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricAutoWorkbench; -import gtPlusPlus.xmod.gregtech.common.tileentities.automation.GT_MetaTileEntity_ElectricInventoryManager; 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.machines.basic.GT_MetaTileEntity_CropHarvestor; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_AutoCrafter; import gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.GT4Entity_ThermalBoiler; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneButtonPanel; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneCircuitBlock; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneLamp; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthDisplay; -import gtPlusPlus.xmod.gregtech.common.tileentities.redstone.GT_MetaTileEntity_RedstoneStrengthScale; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_AdvancedCraftingTable; -import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_BronzeCraftingTable; public class Gregtech4Content { @@ -25,47 +17,11 @@ public class Gregtech4Content { public static void run() { Logger.INFO("Max MTE: " + GregTech_API.METATILEENTITIES.length + " | " + GregTech_API.MAXIMUM_METATILE_IDS); - workbenches(); thermalBoiler(); multiCrafter(); tesseracts(); basic(); automation(); - redstone(); - } - - private static void workbenches() { - // Gregtech 4 Workbenches - Logger.INFO("Gregtech 4 Content | Registering Workbenches."); - GregtechItemList.GT4_Workbench_Bronze.set( - new GT_MetaTileEntity_BronzeCraftingTable( - 31081, - "workbench.basic", - "Bronze Workbench", - 0, - "Stores 16000L of fluid").getStackForm(1L)); - GregtechItemList.GT4_Workbench_Advanced.set( - new GT_MetaTileEntity_AdvancedCraftingTable( - 31082, - "workbench.advanced", - "Advanced Workbench", - 3, - "Stores 64000L of fluid").getStackForm(1L)); - } - - private static void redstone() { - Logger.INFO("Gregtech 4 Content | Registering Redstone Blocks."); - GregtechItemList.GT4_Redstone_Lamp.set(new GT_MetaTileEntity_RedstoneLamp(31120).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Button_Panel - .set(new GT_MetaTileEntity_RedstoneButtonPanel(31121).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Scale.set(new GT_MetaTileEntity_RedstoneStrengthScale(31122).getStackForm(1L)); - GregtechItemList.GT4_Redstone_Display.set( - new GT_MetaTileEntity_RedstoneStrengthDisplay( - 31123, - "redstone.display.strength", - "Redstone Display", - "Displays Redstone Strength").getStackForm(1L)); - GregtechItemList.GT4_Redstone_Circuit.set(new GT_MetaTileEntity_RedstoneCircuitBlock(31124).getStackForm(1L)); } private static void automation() { @@ -87,31 +43,6 @@ public class Gregtech4Content { GregtechItemList.GT4_Electric_Auto_Workbench_UV.set( new GT_MetaTileEntity_ElectricAutoWorkbench(31098, 8, "Automatic crafting machine").getStackForm(1L)); - Logger.INFO("Gregtech 4 Content | Registering Inventory Managers."); - GregtechItemList.GT4_Electric_Inventory_Manager_LV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31101, 1, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_MV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31102, 2, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_HV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31103, 3, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_EV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31104, 4, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_IV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31105, 5, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_LuV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31106, 6, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_ZPM.set( - new GT_MetaTileEntity_ElectricInventoryManager(31107, 7, "Manages your inventory and stuff") - .getStackForm(1L)); - GregtechItemList.GT4_Electric_Inventory_Manager_UV.set( - new GT_MetaTileEntity_ElectricInventoryManager(31108, 8, "Manages your inventory and stuff") - .getStackForm(1L)); } private static void basic() { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java index 7fd68be584..67d70e45e4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechBufferDynamos.java @@ -18,7 +18,7 @@ public class GregtechBufferDynamos { run2(); } - private static final void run2() { + private static void run2() { GregtechItemList.Hatch_Buffer_Dynamo_ULV.set( new GT_MetaTileEntity_Hatch_DynamoBuffer( mID++, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java index 6c05c6e79f..0b615b9c3d 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java @@ -648,9 +648,6 @@ public class GregtechConduits { Logger.ERROR(Material.name() + " has defaulted to 8v."); V = 0; } - // makeWires(T, ID, 2L, 4L, 2L, GT_Values.V[V], true, false); - // makeSuperConductors(T, ID, insulatedLoss, uninsulatedLoss, Amps, GT_Values.V[V], true, false); - // makeWires(T, ID, bEC ? 2L : 2L, bEC ? 4L : 4L, 2L, gregtech.api.enums.GT_Values.V[V], true, false); } private static void generateGTFluidPipes(final Materials material, final int startID, final int transferRatePerSec, @@ -949,8 +946,8 @@ public class GregtechConduits { String tName = aName.toString(); if (GT_Utility.isStringInvalid(tName)) return false; ArrayList<ItemStack> tList = GT_OreDictUnificator.getOres(tName); - for (int i = 0; i < tList.size(); ++i) - if (GT_Utility.areStacksEqual((ItemStack) tList.get(i), aStack, true)) return false; + for (ItemStack itemStack : tList) + if (GT_Utility.areStacksEqual((ItemStack) itemStack, aStack, true)) return false; OreDictionary.registerOre(tName, GT_Utility.copyAmount(1L, new Object[] { aStack })); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java index 7878709095..f8c36eb37b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechCustomHatches.java @@ -163,11 +163,8 @@ public class GregtechCustomHatches { * Super Input Busses */ - int aStartID = 30021; + int aStartID = 30022; - GregtechItemList.Hatch_SuperBus_Input_ULV.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.00", "Super Bus (I) (ULV)", 0)) - .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_LV.set( ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.01", "Super Bus (I) (LV)", 1)) .getStackForm(1L)); @@ -193,16 +190,13 @@ public class GregtechCustomHatches { ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.08", "Super Bus (I) (UV)", 8)) .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Input_MAX.set( - ((IMetaTileEntity) makeInputBus(aStartID++, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9)) + ((IMetaTileEntity) makeInputBus(aStartID, "hatch.superbus.input.tier.09", "Super Bus (I) (MAX)", 9)) .getStackForm(1L)); /* * Super Output Busses */ - - GregtechItemList.Hatch_SuperBus_Output_ULV.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.00", "Super Bus (O) (ULV)", 0)) - .getStackForm(1L)); + aStartID = 30031; GregtechItemList.Hatch_SuperBus_Output_LV.set( ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.01", "Super Bus (O) (LV)", 1)) .getStackForm(1L)); @@ -228,7 +222,7 @@ public class GregtechCustomHatches { ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.08", "Super Bus (O) (UV)", 8)) .getStackForm(1L)); GregtechItemList.Hatch_SuperBus_Output_MAX.set( - ((IMetaTileEntity) makeOutputBus(aStartID++, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9)) + ((IMetaTileEntity) makeOutputBus(aStartID, "hatch.superbus.output.tier.09", "Super Bus (O) (MAX)", 9)) .getStackForm(1L)); } @@ -248,15 +242,13 @@ public class GregtechCustomHatches { } private static void run5() { - int aID = 31777; + int aID = 31778; - GregtechItemList.GT_MetaTileEntity_ChiselBus_I - .set((makeChiselBus(aID++, "hatch.chisel.tier.00", "Chisel Bus I", 0)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_II + GregtechItemList.GT_MetaTileEntity_ChiselBus_LV .set((makeChiselBus(aID++, "hatch.chisel.tier.01", "Chisel Bus II", 1)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_III + GregtechItemList.GT_MetaTileEntity_ChiselBus_MV .set((makeChiselBus(aID++, "hatch.chisel.tier.02", "Chisel Bus III", 2)).getStackForm(1L)); - GregtechItemList.GT_MetaTileEntity_ChiselBus_IV + GregtechItemList.GT_MetaTileEntity_ChiselBus_HV .set((makeChiselBus(aID++, "hatch.chisel.tier.03", "Chisel Bus IV", 3)).getStackForm(1L)); } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java deleted file mode 100644 index bc05640e70..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechGeneratorsULV.java +++ /dev/null @@ -1,52 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import static gtPlusPlus.core.recipe.common.CI.bitsd; - -import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_CombustionGenerator; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_GasTurbine; -import gtPlusPlus.xmod.gregtech.common.tileentities.generators.ULV.GT_MetaTileEntity_ULV_SteamTurbine; - -public class GregtechGeneratorsULV { - - public static void run() { - - GregtechItemList.Generator_Diesel_ULV.set( - new GT_MetaTileEntity_ULV_CombustionGenerator( - 960, - "basicgenerator.diesel.tier.00", - "Simple Combustion Generator", - 0).getStackForm(1L)); - GregtechItemList.Generator_Gas_Turbine_ULV.set( - new GT_MetaTileEntity_ULV_GasTurbine(961, "basicgenerator.gas.tier.00", "Simple Gas Turbine", 0) - .getStackForm(1L)); - GregtechItemList.Generator_Steam_Turbine_ULV.set( - new GT_MetaTileEntity_ULV_SteamTurbine(962, "basicgenerator.steam.tier.00", "Simple Steam Turbine") - .getStackForm(1L)); - - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Diesel_ULV.get(1L, new Object[0]), - bitsd, - new Object[] { "PCP", "EME", "GWG", 'M', ItemList.Hull_ULV, 'P', GregtechItemList.Electric_Piston_ULV, - 'E', GregtechItemList.Electric_Motor_ULV, 'C', OrePrefixes.circuit.get(Materials.Primitive), - 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'G', - OrePrefixes.gearGt.get(Materials.Bronze) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Gas_Turbine_ULV.get(1L, new Object[0]), - bitsd, - new Object[] { "CRC", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, - 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), - 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy) }); - GT_ModHandler.addCraftingRecipe( - GregtechItemList.Generator_Steam_Turbine_ULV.get(1L, new Object[0]), - bitsd, - new Object[] { "PCP", "RMR", "EWE", 'M', ItemList.Hull_ULV, 'E', GregtechItemList.Electric_Motor_ULV, - 'R', OrePrefixes.rotor.get(Materials.Tin), 'C', OrePrefixes.circuit.get(Materials.Primitive), - 'W', OrePrefixes.cableGt01.get(Materials.RedAlloy), 'P', - OrePrefixes.pipeMedium.get(Materials.Copper) }); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java index 02e397ca35..e6c1febd66 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechPollutionDevices.java @@ -37,12 +37,6 @@ public class GregtechPollutionDevices { "Polluting the skies.", 0).getStackForm(1L)); - GregtechItemList.Pollution_Cleaner_ULV.set( - new GregtechMetaAtmosphericReconditioner( - 757, - "pollutioncleaner.01.tier.single", - "Pollution Scrubber", - 0).getStackForm(1L)); GregtechItemList.Pollution_Cleaner_LV.set( new GregtechMetaAtmosphericReconditioner( 758, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java deleted file mode 100644 index 0d52cc0fcb..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSteamCondenser.java +++ /dev/null @@ -1,22 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaCondensor; - -public class GregtechSteamCondenser { - - public static void run() { - Logger.INFO("Gregtech5u Content | Registering Steam Condensor."); - if (CORE.ConfigSwitches.enableMachine_SteamConverter) { - run1(); - } - } - - private static void run1() { - // Steam Condensors - GregtechItemList.Condensor_MAX.set( - new GregtechMetaCondensor(769, "steamcondensor.01.tier.single", "Steam Condensor").getStackForm(1L)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java index ccd7d6cbf7..08ce02b5fa 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechSuperChests.java @@ -1,6 +1,5 @@ package gtPlusPlus.xmod.gregtech.registration.gregtech; -import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import gtPlusPlus.xmod.gregtech.common.tileentities.storage.GT_MetaTileEntity_TieredChest; @@ -27,12 +26,5 @@ public class GregtechSuperChests { (new GT_MetaTileEntity_TieredChest(mId++, "super.chest.gtpp.tier.05", "Super Chest V" + aSuffix, 5)) .getStackForm(1L)); - // Do not add Recipes for GTNH, hide them from NEI instead. - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_LV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_MV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_HV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_EV.get(1L)); - ItemUtils.hideItemFromNEI(GregtechItemList.Super_Chest_IV.get(1L)); - } } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java deleted file mode 100644 index 0d560610ff..0000000000 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechTieredChunkloaders.java +++ /dev/null @@ -1,26 +0,0 @@ -package gtPlusPlus.xmod.gregtech.registration.gregtech; - -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; -import gtPlusPlus.xmod.gregtech.common.tileentities.machines.basic.GregtechMetaTileEntityChunkLoader; - -public class GregtechTieredChunkloaders { - - public static void run() { - Logger.INFO("Gregtech5u Content | Registering Chunk Loaders."); - run1(); - } - - private static void run1() { - int ID = 943; - GregtechItemList.GT_Chunkloader_HV.set( - new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.01", "Chunkloader MK I", 3) - .getStackForm(1L)); - GregtechItemList.GT_Chunkloader_IV.set( - new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.02", "Chunkloader MK II", 5) - .getStackForm(1L)); - GregtechItemList.GT_Chunkloader_ZPM.set( - new GregtechMetaTileEntityChunkLoader(ID++, "chunkloader.tier.03", "Chunkloader MK III", 7) - .getStackForm(1L)); - } -} diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java index fe7628933e..43645b16fb 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechWirelessChargers.java @@ -84,7 +84,7 @@ public class GregtechWirelessChargers { 8, "Hopefully won't give you cancer.", 0).getStackForm(1L)); - GregtechItemList.Charger_MAX.set( + GregtechItemList.Charger_UHV.set( new GregtechMetaWirelessCharger( mID++, "wificharger.09.tier.single", diff --git a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java index c4ca148920..823b775d99 100644 --- a/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java +++ b/src/main/java/gtPlusPlus/xmod/ic2/item/IC2_Items.java @@ -25,9 +25,6 @@ public class IC2_Items { public static ItemStack shaft_Material_3; // Vibrant Alloy public static ItemStack shaft_Material_4; // Iridium - public static ItemStack blockRTG; - public static ItemStack blockKineticGenerator; - private static final String[] mData1 = new String[] { "itemEnergeticRotorBlade", "itemMagnaliumRotorBlade" }; private static final String[] mData2 = new String[] { "itemEnergeticShaft", "itemMagnaliumShaft" }; private static final String[] mData3 = new String[] { "itemVibrantRotorBlade", "itemUltimetRotorBlade" }; diff --git a/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java b/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java deleted file mode 100644 index 45ccca163b..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ob/GliderHandler.java +++ /dev/null @@ -1,126 +0,0 @@ -package gtPlusPlus.xmod.ob; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.PlayerInteractEvent; -import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; - -import org.apache.commons.lang3.StringUtils; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; - -public class GliderHandler { - - private static final AutoMap<Integer> mDimensionalBlacklist = new AutoMap<Integer>(); - - @SubscribeEvent - public void onItemUsageEx(final PlayerInteractEvent event) { - if (event != null && event.entityPlayer != null) { - - if (event.action != Action.RIGHT_CLICK_BLOCK && event.action != Action.RIGHT_CLICK_AIR) { - Logger.WARNING("[OpenBlocks] Wrong type of PlayerInteractEvent, skipping."); - } - if (event.entityPlayer.worldObj.isRemote) { - return; - } - - ItemStack aItem = PlayerUtils.getItemStackInPlayersHand(event.entityPlayer); - if (ItemUtils.checkForInvalidItems(aItem)) { - Class aItemGliderClass = ReflectionUtils.getClass("openblocks.common.item.ItemHangGlider"); - if (aItemGliderClass.isInstance(aItem.getItem())) { - if (!canPlayerGlideInThisDimension(event.entityPlayer)) { - event.setCanceled(true); - PlayerUtils.messagePlayer(event.entityPlayer, "Glider is blacklisted in this dimension."); - Logger.WARNING( - "[OpenBlocks] " + event.entityPlayer.getCommandSenderName() - + " tried to use glider in dimension " - + event.entityPlayer.getEntityWorld().provider.dimensionId - + "."); - } else { - Logger.WARNING( - "[OpenBlocks] " + event.entityPlayer.getCommandSenderName() - + " used glider in dimension " - + event.entityPlayer.getEntityWorld().provider.dimensionId - + "."); - } - } else { - Logger.WARNING("[OpenBlocks] Item was not a glider."); - } - } else { - Logger.WARNING("[OpenBlocks] Bad Item in player hand."); - } - } else { - Logger.WARNING("[OpenBlocks] Bad event or player."); - } - } - - private static final boolean canPlayerGlideInThisDimension(EntityPlayer aPlayer) { - World aWorld = aPlayer.worldObj; - if (aWorld == null) { - return false; - } else { - if (aWorld.provider == null) { - return false; - } else { - int aDimID = aWorld.provider.dimensionId; - for (int i : mDimensionalBlacklist) { - if (i == aDimID) { - return false; - } - } - } - } - return true; - } - - static final void populateBlacklist() { - if (!mDimensionalBlacklist.isEmpty()) { - return; - } - File aBlacklist = gtPlusPlus.core.util.data.FileUtils.getFile("config/GTplusplus/", "GliderBlacklist", "cfg"); - List<String> lines = new ArrayList<String>(); - try { - lines = org.apache.commons.io.FileUtils.readLines(aBlacklist, "utf-8"); - } catch (IOException e) { - e.printStackTrace(); - } - if (lines.isEmpty()) { - FileWriter fw; - try { - String aInfoTip = "# Add one dimension ID per line. Lines with a # are comments and are ignored."; - fw = new FileWriter(aBlacklist); - fw.write(aInfoTip); - fw.close(); - lines.add(aInfoTip); - } catch (IOException e) { - e.printStackTrace(); - } - } - if (!lines.isEmpty()) { - for (String s : lines) { - if (s != null && !s.equals("") && !s.contains("#")) { - s = StringUtils.remove(s, " "); - s = StringUtils.trim(s); - s = StringUtils.remove(s, ","); - Integer g = Integer.decode(s); - if (g != null) { - mDimensionalBlacklist.add(g); - Logger.INFO("[OpenBlocks] Added Dimension with ID '" + g + "' to Blacklist for Glider."); - } - } - } - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java b/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java deleted file mode 100644 index 2f9178678d..0000000000 --- a/src/main/java/gtPlusPlus/xmod/ob/HANDLER_OpenBlocks.java +++ /dev/null @@ -1,20 +0,0 @@ -package gtPlusPlus.xmod.ob; - -import static gregtech.api.enums.Mods.OpenBlocks; - -import gtPlusPlus.core.util.Utils; - -public class HANDLER_OpenBlocks { - - public static void init() { - if (OpenBlocks.isModLoaded()) { - GliderHandler.populateBlacklist(); - } - } - - public static void postInit() { - if (OpenBlocks.isModLoaded()) { - Utils.registerEvent(new GliderHandler()); - } - } -} diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java index f44ba823db..19777cc7c9 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/commands/CommandDumpAspects.java @@ -73,10 +73,7 @@ public class CommandDumpAspects implements ICommand { @Override public boolean canCommandSenderUseCommand(final ICommandSender var1) { final EntityPlayer P = CommandUtils.getPlayer(var1); - if (P == null || !PlayerUtils.isPlayerOP(P)) { - return false; - } - return true; + return P != null && PlayerUtils.isPlayerOP(P); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java index 8fb8e2fc7d..d363b2cba9 100644 --- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java +++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java @@ -23,7 +23,7 @@ import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects; public class ThreadAspectScanner extends Thread { public static boolean mDoWeScan = false; - private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<String, AutoMap<ItemStack>>(); + private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<>(); public final File mAspectCacheFile; public ThreadAspectScanner() { @@ -49,7 +49,7 @@ public class ThreadAspectScanner extends Thread { } } } - AutoMap<ItemStack> m = new AutoMap<ItemStack>(); + AutoMap<ItemStack> m = new AutoMap<>(); if (mAllGameContent.containsKey(nameKey)) { m = mAllGameContent.get(nameKey); } @@ -123,14 +123,14 @@ public class ThreadAspectScanner extends Thread { if (a == null) { continue; } else { - AutoMap<Pair<String, Integer>> aspectPairs = new AutoMap<Pair<String, Integer>>(); + AutoMap<Pair<String, Integer>> aspectPairs = new AutoMap<>(); for (thaumcraft.api.aspects.Aspect c : a.getAspectsSortedAmount()) { if (c != null) { - aspectPairs.put(new Pair<String, Integer>(c.getName(), a.getAmount(c))); + aspectPairs.put(new Pair<>(c.getName(), a.getAmount(c))); } } try { - List<String> mList = new ArrayList<String>(); + List<String> mList = new ArrayList<>(); mList.add( stack.getDisplayName() + " | Meta: " + stack.getItemDamage() @@ -156,6 +156,5 @@ public class ThreadAspectScanner extends Thread { "Completed Aspect Iteration. AspectInfo.txt is now available to process in the GTplusplus configuration folder."); CommandDumpAspects.mLastScanTime = System.currentTimeMillis(); } - return; } } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java index b148e283ac..1023d0325f 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java @@ -12,9 +12,9 @@ import gtPlusPlus.xmod.tinkers.util.TinkersUtils; public class HANDLER_Tinkers { - public static AutoMap<BaseTinkersMaterial> mTinkerMaterials = new AutoMap<BaseTinkersMaterial>(); + public static AutoMap<BaseTinkersMaterial> mTinkerMaterials = new AutoMap<>(); - public static final void postInit() { + public static void postInit() { if (TinkerConstruct.isModLoaded()) { Fluid pyrotheumFluid = FluidRegistry.getFluid("pyrotheum"); @@ -25,10 +25,6 @@ public class HANDLER_Tinkers { // Generate Drying Rack recipes TinkersDryingRecipe.generateAllDryingRecipes(); - - for (BaseTinkersMaterial y : mTinkerMaterials) { - // y.generate(); - } } } } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java index 06f7ad47f5..8133b1f78d 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/material/BaseTinkersMaterial.java @@ -20,7 +20,7 @@ import gtPlusPlus.xmod.tinkers.util.TinkersUtils; public class BaseTinkersMaterial { - private static HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<String, Integer>(); + private static HashMap<String, Integer> aInternalMaterialIdMap = new HashMap<>(); private static int aNextFreeID; public final String mLocalName; @@ -88,7 +88,7 @@ public class BaseTinkersMaterial { } private static String calcStyle(Material aMaterial) { - String aReturn = "" + EnumChatFormatting.WHITE; + String aReturn; int aTemp = aMaterial.getMeltingPointC(); if (aTemp < 3600) { aReturn = "" + EnumChatFormatting.WHITE; @@ -110,46 +110,12 @@ public class BaseTinkersMaterial { return aMaterial.getRgbAsHex(); } - public Object generateToolMaterial(Material aMaterial) { - int level, dura, speed, dmg, reinf, primColour; - float handle, stonebound; - level = calcHarvestLevel(aMaterial); - dura = calcDurability(aMaterial); - speed = calcMiningSpeed(aMaterial); - dmg = calcAttack(aMaterial); - reinf = calcReinforced(aMaterial); - primColour = calcColour(aMaterial); - handle = calcHandleModifier(aMaterial); - // stonebound = calcHarvestLevel(aMaterial); - stonebound = 0; - return TinkersUtils.generateToolMaterial( - aMaterial.getLocalizedName(), - aMaterial.getUnlocalizedName(), - level, - dura, - speed, - dmg, - handle, - reinf, - stonebound, - calcStyle(aMaterial), - primColour); - } - public void generate() { Logger.INFO("[TiCon] Trying to generate Material: " + mLocalName); int id = mID; if (id > 0) { - // Object aTinkersCustomMaterial = generateToolMaterial(mMaterial); - // Logger.INFO("[TiCon] Created Material: "+mLocalName); - - // TinkersUtils.addToolMaterial(id, aTinkersCustomMaterial); - // TinkersUtils.addDefaultToolPartMaterial(id); - // TinkersUtils.addBowMaterial(id, calcBowDrawSpeed(mMaterial), 1.0F); - // TinkersUtils.addArrowMaterial(id, calcProjectileMass(mMaterial), calcProjectileFragility(mMaterial)); - NBTTagCompound tag = new NBTTagCompound(); tag.setInteger("Id", id); tag.setString("Name", mUnlocalName); @@ -215,8 +181,6 @@ public class BaseTinkersMaterial { return false; } - // Smeltery.addMelting(new ItemStack(ExtraUtils.unstableIngot, 1, 0), ExtraUtils.decorative1, 5, 850, - // aMaterial.getFluid(72)); TinkersUtils.registerFluidType(mLocalName, aMatBlock, 0, aMelt, aFluid, true); TinkersUtils.addMelting(aMaterial.getBlock(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144 * 9)); TinkersUtils.addMelting(aMaterial.getIngot(1), aMatBlock, 0, aMelt, aMaterial.getFluidStack(144)); @@ -232,10 +196,7 @@ public class BaseTinkersMaterial { .addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50); } - boolean extended = TinkersUtils.generateCastingRecipes(aMaterial, aID); - - // TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ExtraUtils.decorative1, 1, 5), new - // FluidStack(unstable, 1296), (ItemStack)null, true, 100); + TinkersUtils.generateCastingRecipes(aMaterial, aID); return true; } diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java index ef3a0f9cd0..6cbe12c967 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersDryingRecipe.java @@ -17,7 +17,7 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; public class TinkersDryingRecipe { - public static AutoMap<TinkersDryingRecipe> recipes = new AutoMap<TinkersDryingRecipe>(); + public static AutoMap<TinkersDryingRecipe> recipes = new AutoMap<>(); public final int time; public final ItemStack input; diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java index 6024e5192d..fb89680e6c 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/util/TinkersUtils.java @@ -45,7 +45,7 @@ public class TinkersUtils { private static Object mSmelteryInstance; private static Object mTinkersRegistryInstance; - private static final HashMap<String, Method> mMethodCache = new LinkedHashMap<String, Method>(); + private static final HashMap<String, Method> mMethodCache = new LinkedHashMap<>(); static { mClass_Smeltery = ReflectionUtils.getClass("tconstruct.library.crafting.Smeltery"); @@ -65,10 +65,6 @@ public class TinkersUtils { .getMethod(getCastingInstance(0), "getCastingRecipes", new Class[] {}); } - /** - * - * @param aSwitch - The Registry to return - */ private static void setTiConDataInstance() { if (!TinkerConstruct.isModLoaded()) { return; @@ -78,7 +74,7 @@ public class TinkersUtils { if (mClass_Smeltery != null) { try { mSmelteryInstance = ReflectionUtils.getField(mClass_Smeltery, "instance").get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} + } catch (IllegalArgumentException | IllegalAccessException ignored) {} } } if (mTinkersRegistryInstance == null) { @@ -86,38 +82,11 @@ public class TinkersUtils { try { mTinkersRegistryInstance = ReflectionUtils.getField(mClass_TConstructRegistry, "instance") .get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} + } catch (IllegalArgumentException | IllegalAccessException ignored) {} } } } - public static final boolean isTiConFirstInOD() { - if (TinkerConstruct.isModLoaded()) { - try { - return (boolean) ReflectionUtils.getField(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst") - .get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} - } - return false; - } - - public static final boolean stopTiconLoadingFirst() { - if (isTiConFirstInOD()) { - try { - ReflectionUtils.setFinalFieldValue(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst", false); - if ((boolean) ReflectionUtils.getField(ReflectionUtils.getClass("PHConstruct"), "tconComesFirst") - .get(null) == false) { - return true; - } - // Did not work, let's see where TiCon uses this and prevent it. - else { - ItemUtils.getNonTinkersDust("", 1); - } - } catch (Exception e) {} - } - return false; - } - /** * Add a new fluid as a valid Smeltery fuel. * @@ -134,36 +103,6 @@ public class TinkersUtils { new Object[] { fluid, power, duration }); } - /** - * Returns true if the liquid is a valid smeltery fuel. - */ - public static boolean isSmelteryFuel(Fluid fluid) { - setTiConDataInstance(); - return ReflectionUtils - .invoke(mSmelteryInstance, "isSmelteryFuel", new Class[] { Fluid.class }, new Object[] { fluid }); - } - - /** - * Returns the power of a smeltery fuel or 0 if it's not a fuel. - */ - public static int getFuelPower(Fluid fluid) { - setTiConDataInstance(); - return (int) ReflectionUtils - .invokeNonBool(mSmelteryInstance, "getFuelPower", new Class[] { Fluid.class }, new Object[] { fluid }); - } - - /** - * Returns the duration of a smeltery fuel or 0 if it's not a fuel. - */ - public static int getFuelDuration(Fluid fluid) { - setTiConDataInstance(); - return (int) ReflectionUtils.invokeNonBool( - mSmelteryInstance, - "getFuelDuration", - new Class[] { Fluid.class }, - new Object[] { fluid }); - } - public static boolean registerFluidType(String name, Block block, int meta, int baseTemperature, Fluid fluid, boolean isToolpart) { if (mMethodCache.get("registerFluidType") == null) { @@ -186,22 +125,7 @@ public class TinkersUtils { } } - public static boolean addBaseMeltingRecipes(Material aMaterial) { - return addMelting( - aMaterial.getBlock(1), - aMaterial.getBlock(), - 0, - aMaterial.getMeltingPointC(), - aMaterial.getFluidStack(144 * 9)) - && addMelting( - aMaterial.getIngot(1), - aMaterial.getBlock(), - 0, - aMaterial.getMeltingPointC(), - aMaterial.getFluidStack(144)); - } - - public static boolean addMelting(ItemStack input, Block block, int metadata, int temperature, FluidStack liquid) { + public static void addMelting(ItemStack input, Block block, int metadata, int temperature, FluidStack liquid) { if (mMethodCache.get("addMelting") == null) { Method m = ReflectionUtils.getMethod( mClass_Smeltery, @@ -215,13 +139,10 @@ public class TinkersUtils { } try { mMethodCache.get("addMelting").invoke(null, input, block, metadata, temperature, liquid); - return true; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - return false; - } + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) {} } - public static boolean addMelting(Object type, ItemStack input, int temperatureDifference, int fluidAmount) { + public static void addMelting(Object type, ItemStack input, int temperatureDifference, int fluidAmount) { if (mMethodCache.get("addMelting") == null) { Method m = ReflectionUtils .getMethod(mClass_Smeltery, "addMelting", mClass_FluidType, ItemStack.class, int.class, int.class); @@ -229,18 +150,10 @@ public class TinkersUtils { } try { mMethodCache.get("addMelting").invoke(null, type, input, temperatureDifference, fluidAmount); - return true; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - return false; - } - } - - public static boolean addBaseBasinRecipes(Material aMaterial) { - return addBasinRecipe(aMaterial.getBlock(1), aMaterial.getFluidStack(144 * 9), (ItemStack) null, true, 100); + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) {} } - public static boolean addBasinRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, - int delay) { + public static void addBasinRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) { if (mMethodCache.get("addBasinRecipe") == null) { Method m = ReflectionUtils.getMethod( ReflectionUtils.getClass("tconstruct.library.crafting.LiquidCasting"), @@ -254,18 +167,10 @@ public class TinkersUtils { } try { mMethodCache.get("addBasinRecipe").invoke(getCastingInstance(0), output, metal, cast, consume, delay); - return true; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - return false; - } + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) {} } - public static boolean addBaseCastingRecipes(Material aMaterial) { - ItemStack ingotcast = getPattern(1); - return addCastingTableRecipe(aMaterial.getIngot(1), aMaterial.getFluidStack(144), ingotcast, false, 50); - } - - public static boolean addCastingTableRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, + public static void addCastingTableRecipe(ItemStack output, FluidStack metal, ItemStack cast, boolean consume, int delay) { if (mMethodCache.get("addCastingTableRecipe") == null) { Method m = ReflectionUtils.getMethod( @@ -281,10 +186,7 @@ public class TinkersUtils { try { mMethodCache.get("addCastingTableRecipe") .invoke(getCastingInstance(1), output, metal, cast, consume, delay); - return true; - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - return false; - } + } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException ignored) {} } /** @@ -300,15 +202,9 @@ public class TinkersUtils { Method m = null; if (aType == 0) { m = ReflectionUtils.getMethod(mTinkersRegistryInstance, "getTableCasting", new Class[] {}); - // return ReflectionUtils.invokeVoid(getTiConDataInstance(1), "getTableCasting", new Class[] {}, new - // Object[] {}); } else if (aType == 1) { m = ReflectionUtils.getMethod(mTinkersRegistryInstance, "getBasinCasting", new Class[] {}); - // return ReflectionUtils.invokeVoid(getTiConDataInstance(1), "getBasinCasting", new Class[] {}, new - // Object[] {}); - } else { - // return null; - } + } // return null; if (m != null) { try { @@ -328,12 +224,11 @@ public class TinkersUtils { if (m != null) { try { mTinkerMetalPattern = (Item) m.get(null); - } catch (IllegalArgumentException | IllegalAccessException e) {} + } catch (IllegalArgumentException | IllegalAccessException ignored) {} } } if (mTinkerMetalPattern != null) { - ItemStack ingotCast = new ItemStack(mTinkerMetalPattern, aType, 0); - return ingotCast; + return new ItemStack(mTinkerMetalPattern, aType, 0); } return ItemUtils.getErrorStack(1, "Bad Tinkers Pattern"); } @@ -344,7 +239,7 @@ public class TinkersUtils { if (mDryingRackRecipes != null) { return mDryingRackRecipes; } - AutoMap<Object> aData = new AutoMap<Object>(); + AutoMap<Object> aData = new AutoMap<>(); int aCount = 0; try { ArrayList<?> recipes = (ArrayList<?>) ReflectionUtils @@ -366,22 +261,6 @@ public class TinkersUtils { return aData; } - /** - * Generates Tinkers {@link ToolMaterial}'s reflectively. - * - * @param name - * @param localizationString - * @param level - * @param durability - * @param speed - * @param damage - * @param handle - * @param reinforced - * @param stonebound - * @param style - * @param primaryColor - * @return - */ public static Object generateToolMaterial(String name, String localizationString, int level, int durability, int speed, int damage, float handle, int reinforced, float stonebound, String style, int primaryColor) { try { @@ -397,7 +276,7 @@ public class TinkersUtils { float.class, String.class, int.class); - Object myObject = constructor.newInstance( + return constructor.newInstance( name, localizationString, level, @@ -409,58 +288,12 @@ public class TinkersUtils { stonebound, style, primaryColor); - return myObject; } catch (Throwable t) { t.printStackTrace(); return null; } } - public static void addToolMaterial(int id, Object aToolMaterial) { - if (mMethodCache.get("addToolMaterial") == null) { - Method m = ReflectionUtils - .getMethod(mClass_TConstructRegistry, "addtoolMaterial", int.class, mClass_ToolMaterial); - mMethodCache.put("addToolMaterial", m); - } - try { - mMethodCache.get("addToolMaterial").invoke(mClass_TConstructRegistry, id, aToolMaterial); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - - } - } - - public static void addDefaultToolPartMaterial(int id) { - if (mMethodCache.get("addDefaultToolPartMaterial") == null) { - Method m = ReflectionUtils.getMethod(mClass_TConstructRegistry, "addDefaultToolPartMaterial", int.class); - mMethodCache.put("addDefaultToolPartMaterial", m); - } - try { - mMethodCache.get("addDefaultToolPartMaterial").invoke(mClass_TConstructRegistry, id); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - } - - public static void addBowMaterial(int id, int drawspeed, float maxSpeed) { - if (mMethodCache.get("addBowMaterial") == null) { - Method m = ReflectionUtils - .getMethod(mClass_TConstructRegistry, "addBowMaterial", int.class, int.class, float.class); - mMethodCache.put("addBowMaterial", m); - } - try { - mMethodCache.get("addBowMaterial").invoke(mClass_TConstructRegistry, id, drawspeed, maxSpeed); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - } - - public static void addArrowMaterial(int id, float mass, float fragility) { - if (mMethodCache.get("addArrowMaterial") == null) { - Method m = ReflectionUtils - .getMethod(mClass_TConstructRegistry, "addArrowMaterial", int.class, float.class, float.class); - mMethodCache.put("addArrowMaterial", m); - } - try { - mMethodCache.get("addArrowMaterial").invoke(mClass_TConstructRegistry, id, mass, fragility); - } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {} - } - public static List<?> getTableCastingRecipes() { Object aCastingTableHandlerInstance = getCastingInstance(0); List<?> aTemp; @@ -470,12 +303,12 @@ public class TinkersUtils { } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { e.printStackTrace(); } - return new ArrayList<Object>(); + return new ArrayList<>(); } - public static boolean generateCastingRecipes(Material aMaterial, int aID) { + public static void generateCastingRecipes(Material aMaterial, int aID) { - List<CastingRecipeHandler> newRecipies = new LinkedList<CastingRecipeHandler>(); + List<CastingRecipeHandler> newRecipies = new LinkedList<>(); Iterator<?> iterator1 = getTableCastingRecipes().iterator(); Fluid aMoltenIron = null; @@ -500,16 +333,15 @@ public class TinkersUtils { } } catch (IllegalArgumentException e) { e.printStackTrace(); - return false; + return; } } Object ft; try { ft = mMethod_getFluidType.invoke(null, aMaterial.getLocalizedName()); - Iterator<CastingRecipeHandler> iterator2 = newRecipies.iterator(); - while (iterator2.hasNext()) { - CastingRecipeHandler recipe = new CastingRecipeHandler(iterator2.next()); + for (CastingRecipeHandler newRecipy : newRecipies) { + CastingRecipeHandler recipe = new CastingRecipeHandler(newRecipy); if (!recipe.valid) { continue; } @@ -522,10 +354,8 @@ public class TinkersUtils { } } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { e.printStackTrace(); - return false; } - return true; } private static class CastingRecipeHandler { @@ -562,12 +392,6 @@ public class TinkersUtils { } } - public boolean matches(FluidStack metal, ItemStack inputCast) { - return this.castingMetal.isFluidEqual(metal) && (this.cast != null && this.cast.getItemDamage() == 32767 - && inputCast.getItem() == this.cast.getItem() - || ItemStack.areItemStacksEqual(this.cast, inputCast)); - } - public ItemStack getResult() { return this.output.copy(); } diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang index 457bee7fca..1a49d1a297 100644 --- a/src/main/resources/assets/gregtech/lang/en_US.lang +++ b/src/main/resources/assets/gregtech/lang/en_US.lang @@ -51,10 +51,11 @@ GTPP.battpack.tooltip.4=Also charges items on the hotbar //Tooltips for the Personal Healing Bauble GTPP.nanohealer.tooltip.1=Worn as a Necklace within Baubles -GTPP.nanohealer.tooltip.2=Drains 1638400EU per operation -GTPP.nanohealer.tooltip.3=Can restore HP, Hunger and Saturation -GTPP.nanohealer.tooltip.4=WILL NOT PREVENT DEATH -GTPP.nanohealer.tooltip.5=Shift+RMB to toggle notifications +GTPP.nanohealer.tooltip.2=Drains +GTPP.nanohealer.tooltip.3= EU per operation. +GTPP.nanohealer.tooltip.4=Can restore HP, Hunger and Saturation. +GTPP.nanohealer.tooltip.5=Will not prevent death. +GTPP.nanohealer.tooltip.6=Shift+RMB to toggle notifications. GTPP.nanohealer.hidden=Hiding Info? //10/4/19 |