diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java index a8eab5b27c..882abdf319 100644 --- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java +++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java @@ -140,23 +140,12 @@ public int addArmor(final String armor) { public void serverStarting(final FMLServerStartingEvent e) {} public void onPreLoad() { - /* - * if (ConfigSwitches.enableCustomCapes){ String arr$[] = { "draknyte1", "fobius" }; int len$ = arr$.length; for - * (int i$ = 0; i$ < len$; i$++) { String tName = arr$[i$]; mCapeList.add(tName.toLowerCase()); } (new - * Thread(this)).start(); } - */ + } @Override public void run() { - /* - * try { if (ConfigSwitches.enableCustomCapes){ Logger.INFO("GT++ Mod: Downloading Cape List."); - * @SuppressWarnings("resource") Scanner tScanner = new Scanner(new - * URL("https://github.com/draknyte1/GTplusplus/blob/master/SupporterList.txt").openStream()); while - * (tScanner.hasNextLine()) { String tName = tScanner.nextLine(); if - * (!this.mCapeList.contains(tName.toLowerCase())) { this.mCapeList.add(tName.toLowerCase()); } } } } catch - * (Throwable e) { Logger.INFO("Failed to download GT++ cape list."); } - */ + } @Override diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 18287cc14f..9df69577e2 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -1,7 +1,6 @@ package gtPlusPlus.core.recipe; 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; @@ -115,67 +114,20 @@ public class RECIPES_Machines { // Nuclear Salt Processing Plant public static ItemStack RECIPE_SaltPlantController; - // Milling - public static ItemStack RECIPE_ISAMill_Controller; - public static ItemStack RECIPE_ISAMill_Gearbox; - public static ItemStack RECIPE_ISAMill_Casing; - public static ItemStack RECIPE_ISAMill_Hatch; - public static ItemStack RECIPE_Flotation_Controller; - public static ItemStack RECIPE_Flotation_Casing; - // Cyclotron public static ItemStack RECIPE_CyclotronController; public static ItemStack RECIPE_CyclotronOuterCasing; public static ItemStack RECIPE_CyclotronInnerCoil; - // Buffer Cores - public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore1", 1); - public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore2", 1); - public static ItemStack RECIPE_BufferCore_MV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore3", 1); - public static ItemStack RECIPE_BufferCore_HV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore4", 1); - public static ItemStack RECIPE_BufferCore_EV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore5", 1); - public static ItemStack RECIPE_BufferCore_IV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore6", 1); - public static ItemStack RECIPE_BufferCore_LuV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore7", 1); - public static ItemStack RECIPE_BufferCore_ZPM = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore8", 1); - public static ItemStack RECIPE_BufferCore_UV = ItemUtils.getItemStackFromFQRN("miscutils:item.itemBufferCore9", 1); - public static ItemStack RECIPE_BufferCore_MAX = ItemUtils - .getItemStackFromFQRN("miscutils:item.itemBufferCore10", 1); - - // Wire - public static String wireTier1 = "wireGt08Lead"; - public static String wireTier2 = "wireGt08Tin"; - public static String wireTier3 = "wireGt08Copper"; - public static String wireTier4 = "wireGt08Gold"; - public static String wireTier5 = "wireGt08Aluminium"; - public static String wireTier6 = "wireGt08Tungsten"; - public static String wireTier7 = "wireGt08Naquadah"; - public static String wireTier8 = "wireGt08Osmium"; - public static String wireTier9 = "wireGt08Superconductor"; - public static String wireTier10 = "wireGt16Superconductor"; - // Wire - public static String cableTier1 = "cableGt04Lead"; - public static String cableTier2 = "cableGt04Tin"; - public static String cableTier3 = "cableGt04Copper"; public static String cableTier4 = "cableGt04Gold"; - public static String cableTier5 = "cableGt04Aluminium"; public static String cableTier6 = "cableGt04Tungsten"; - public static String cableTier7 = "cableGt04Naquadah"; - public static String cableTier8 = "cableGt04Osmium"; - public static String cableTier9 = "cableGt04NiobiumTitanium"; - public static String cableTier10 = "cableGt08NiobiumTitanium"; public static String pipeTier1 = "pipeHuge" + "Clay"; public static String pipeTier2 = "pipeHuge" + "Potin"; public static String pipeTier3 = "pipeHuge" + "Steel"; public static String pipeTier4 = "pipeHuge" + "StainlessSteel"; - public static String pipeTier5 = "pipeHuge" + "TungstenSteel"; - public static String pipeTier6 = "pipeHuge" + "MaragingSteel300"; public static String pipeTier7 = "pipeHuge" + "Tantalloy60"; - public static String pipeTier8 = "pipeHuge" + "Tantalloy61"; - public static String pipeTier9 = "pipeHuge" + "Inconel792"; - public static String pipeTier10 = "pipeHuge" + "HastelloyX"; - public static String pipeTier11 = "pipeHuge" + "Europium"; // EV/IV MACHINES public static ItemStack IV_MACHINE_Electrolyzer; @@ -192,32 +144,16 @@ public class RECIPES_Machines { public static ItemStack IV_MACHINE_AlloySmelter; public static ItemStack IV_MACHINE_Mixer; public static ItemStack EV_MACHINE_ChemicalBath; - // Cables - public static String cableGt02Electrum = "cableGt02Electrum"; // Plates - public static String plateElectricalSteel = "plateElectricalSteel"; - public static String plateEnergeticAlloy = "plateEnergeticAlloy"; - public static String plateCobalt = "plateCobalt"; public static String plateBronze = "plateBronze"; public static String plateSteel = "plateSteel"; // Pipes - public static String pipeLargeCopper = "pipeLargeCopper"; - public static String pipeHugeSteel = "pipeHugeSteel"; public static String pipeHugeStainlessSteel = "pipeHugeStainlessSteel"; - public static String pipeHugeTitanium = "pipeHugeTitanium"; // Lava Boiler public static ItemStack boiler_Coal; - public static ItemStack blockBricks = ItemUtils.getItemStackFromFQRN("minecraft:brick_block", 1); - - // Batteries - public static String batteryBasic = "batteryBasic"; - public static String batteryAdvanced = "batteryAdvanced"; - public static String batteryElite = "batteryElite"; - public static String batteryMaster = "batteryMaster"; - public static String batteryUltimate = "batteryUltimate"; public static ItemStack IC2MFE; public static ItemStack IC2MFSU; 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 01d35de155..4d5d89edb7 100644 --- a/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java +++ b/src/main/java/gtPlusPlus/nei/GT_NEI_LFTR_Sparging.java @@ -92,7 +92,7 @@ public List getCache() { if (mCachedRecipes == null || (cache = mCachedRecipes.get()) == null) { cache = GasSpargingRecipeMap.mRecipes.stream() // do not use parallel stream. This is already parallelized // by NEI - .sorted().map(temp -> { return createCachedRecipe(temp); }).collect(Collectors.toList()); + .sorted().map(temp -> createCachedRecipe(temp)).collect(Collectors.toList()); // while the NEI parallelize handlers, for each individual handler it still uses sequential execution model // so we do not need any synchronization here mCachedRecipes = new SoftReference<>(cache); 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 4d64356203..bc812a81e2 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 @@ -186,7 +186,7 @@ public ResourceLocation getTextureFile() { // Quantum Force Transformer Casing // spotless:off - private static final CustomIcon Internal_Casing_QFT = mAnimated ? new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL") : new CustomIcon("TileEntites/MACHINE_CASING_QFT_COIL"); + private static final CustomIcon Internal_Casing_QFT = new CustomIcon("TileEntities/MACHINE_CASING_QFT_COIL"); public static final CustomIcon Casing_Coil_QFT = Internal_Casing_QFT; public static final CustomIcon NeutronPulseManipulator = mAnimated ? new CustomIcon("NeutronPulseManipulator") : new CustomIcon("NeutronPulseManipulatorStatic"); public static final CustomIcon CosmicFabricManipulator = mAnimated ? new CustomIcon("CosmicFabricManipulator") : new CustomIcon("CosmicFabricManipulatorStatic");