From b21f0276ee1bf87c7c12a31678b155ebf20982b4 Mon Sep 17 00:00:00 2001 From: Glease <4586901+Glease@users.noreply.github.com> Date: Tue, 3 Oct 2023 15:28:58 +0800 Subject: [PATCH] fix EoH crash on restart (#244) * patch weird NPE * update buildscript --- build.gradle | 73 ++++++++++++++----- dependencies.gradle | 2 +- .../com/github/technus/tectech/TecTech.java | 7 +- .../technus/tectech/loader/MainLoader.java | 6 +- .../tectech/loader/recipe/Assembler.java | 7 +- .../recipe/ResearchStationAssemblyLine.java | 8 +- .../tectech/loader/thing/MachineLoader.java | 40 +++++++++- .../tectech/loader/thing/ThingsLoader.java | 16 +++- .../tectech/nei/TT_NEI_ResearchHandler.java | 2 +- .../tectech/nei/TT_NEI_ScannerHandler.java | 2 +- .../technus/tectech/recipe/TT_recipe.java | 10 ++- .../thing/item/gui/ScanDisplayScreen.java | 7 +- .../thing/metaTileEntity/Textures.java | 42 +---------- .../GT_MetaTileEntity_Hatch_Uncertainty.java | 8 +- .../GT_MetaTileEntity_EM_EyeOfHarmony.java | 22 ++---- .../multi/GT_MetaTileEntity_EM_switch.java | 7 +- .../multi/GT_MetaTileEntity_TM_teslaCoil.java | 15 +--- .../GT_MetaTileEntity_MultiblockBase_EM.java | 13 +--- .../GT_MetaTileEntity_DebugPollutor.java | 3 +- ...GT_MetaTileEntity_DebugPowerGenerator.java | 6 +- .../GT_MetaTileEntity_TT_Transformer.java | 6 +- .../single/GT_MetaTileEntity_TeslaCoil.java | 6 +- 22 files changed, 155 insertions(+), 153 deletions(-) diff --git a/build.gradle b/build.gradle index b894d6477..0407cc9f5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1692122114 +//version: 1695474595 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -89,6 +89,23 @@ def out = services.get(StyledTextOutputFactory).create('an-output') def projectJavaVersion = JavaLanguageVersion.of(8) boolean disableSpotless = project.hasProperty("disableSpotless") ? project.disableSpotless.toBoolean() : false +boolean disableCheckstyle = project.hasProperty("disableCheckstyle") ? project.disableCheckstyle.toBoolean() : false + +final String CHECKSTYLE_CONFIG = """ + + + + + + + + + + + +""" checkPropertyExists("modName") checkPropertyExists("modId") @@ -140,6 +157,17 @@ if (!disableSpotless) { apply from: Blowdryer.file('spotless.gradle') } +if (!disableCheckstyle) { + apply plugin: 'checkstyle' + tasks.named("checkstylePatchedMc") { enabled = false } + tasks.named("checkstyleMcLauncher") { enabled = false } + tasks.named("checkstyleIdeVirtualMain") { enabled = false } + tasks.named("checkstyleInjectedTags") { enabled = false } + checkstyle { + config = resources.text.fromString(CHECKSTYLE_CONFIG) + } +} + String javaSourceDir = "src/main/java/" String scalaSourceDir = "src/main/scala/" String kotlinSourceDir = "src/main/kotlin/" @@ -600,15 +628,10 @@ repositories { } maven { name = "ic2" - url = "https://maven.ic2.player.to/" - metadataSources { - mavenPom() - artifact() + url = getURL("https://maven.ic2.player.to/", "https://maven2.ic2.player.to/") + content { + includeGroup "net.industrial-craft" } - } - maven { - name = "ic2-mirror" - url = "https://maven2.ic2.player.to/" metadataSources { mavenPom() artifact() @@ -770,23 +793,14 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.4.0' - def asmVersion = '9.4' + def lwjgl3ifyVersion = '1.5.0' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.7') } - java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false} - java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") - java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") - java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') - java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} } @@ -1576,6 +1590,25 @@ def getSecondaryArtifacts() { return secondaryArtifacts } +def getURL(String main, String fallback) { + return pingURL(main, 10000) ? main : fallback +} + +// credit: https://stackoverflow.com/a/3584332 +def pingURL(String url, int timeout) { + url = url.replaceFirst("^https", "http") // Otherwise an exception may be thrown on invalid SSL certificates. + try { + HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection() + connection.setConnectTimeout(timeout) + connection.setReadTimeout(timeout) + connection.setRequestMethod("HEAD") + int responseCode = connection.getResponseCode() + return 200 <= responseCode && responseCode <= 399 + } catch (IOException ignored) { + return false + } +} + // For easier scripting of things that require variables defined earlier in the buildscript if (file('addon.late.gradle.kts').exists()) { apply from: 'addon.late.gradle.kts' diff --git a/dependencies.gradle b/dependencies.gradle index 2f96160a3..5fc9fecfd 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.12:dev') + api('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.29:dev') api('com.github.GTNewHorizons:Yamcl:0.5.86:dev') implementation('com.github.GTNewHorizons:GTNEIOrePlugin:1.1.3:dev') diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java index 03bb454ed..8eacdbb96 100644 --- a/src/main/java/com/github/technus/tectech/TecTech.java +++ b/src/main/java/com/github/technus/tectech/TecTech.java @@ -26,7 +26,12 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.*; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLLoadCompleteEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; import eu.usrv.yamcore.auxiliary.IngameErrorLog; import eu.usrv.yamcore.auxiliary.LogHelper; import gregtech.GT_Mod; diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 5e8da5e0b..1afd1f9b0 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -1,10 +1,6 @@ package com.github.technus.tectech.loader; -import static com.github.technus.tectech.TecTech.LOGGER; -import static com.github.technus.tectech.TecTech.configTecTech; -import static com.github.technus.tectech.TecTech.creativeTabTecTech; -import static com.github.technus.tectech.TecTech.instance; -import static com.github.technus.tectech.TecTech.proxy; +import static com.github.technus.tectech.TecTech.*; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.enums.Mods.TwilightForest; diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java index 12fddf3ba..ab6473162 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/Assembler.java @@ -15,7 +15,12 @@ import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.gtnewhorizon.structurelib.StructureLibAPI; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; diff --git a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java index 21d950a74..43bc86784 100644 --- a/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java +++ b/src/main/java/com/github/technus/tectech/loader/recipe/ResearchStationAssemblyLine.java @@ -16,7 +16,13 @@ import com.rwtema.extrautils.ExtraUtils; import fox.spiteful.avaritia.compat.ticon.Tonkers; -import gregtech.api.enums.*; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsBotania; +import gregtech.api.enums.MaterialsKevlar; +import gregtech.api.enums.MaterialsUEVplus; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.material.ALLOY; diff --git a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java index 588344d46..70765ecdd 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/MachineLoader.java @@ -6,10 +6,42 @@ import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; -import com.github.technus.tectech.thing.metaTileEntity.hatch.*; -import com.github.technus.tectech.thing.metaTileEntity.multi.*; -import com.github.technus.tectech.thing.metaTileEntity.pipe.*; -import com.github.technus.tectech.thing.metaTileEntity.single.*; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Capacitor; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_CreativeData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_CreativeMaintenance; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoMulti; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DynamoTunnel; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Holder; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputDataItems; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputData; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputDataItems; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_ParamText; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Rack; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Uncertainty; +import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_WirelessMulti; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_EyeOfHarmony; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_computer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_dataBank; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_infuser; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_research; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_switch; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_EM_transformer; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_microwave; +import com.github.technus.tectech.thing.metaTileEntity.multi.GT_MetaTileEntity_TM_teslaCoil; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_PipeBlock_Data; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_PipeBlock_Energy; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Data; +import com.github.technus.tectech.thing.metaTileEntity.pipe.GT_MetaTileEntity_Pipe_Energy; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_BuckConverter; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPollutor; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugPowerGenerator; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_DebugStructureWriter; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_OwnerDetector; +import com.github.technus.tectech.thing.metaTileEntity.single.GT_MetaTileEntity_TeslaCoil; /** * Created by danie_000 on 16.11.2016. diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java index 5cf8f68c8..d1a1a135d 100644 --- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java @@ -7,8 +7,20 @@ import com.github.technus.tectech.thing.block.QuantumGlassBlock; import com.github.technus.tectech.thing.block.ReactorSimBlock; import com.github.technus.tectech.thing.block.TileEyeOfHarmony; -import com.github.technus.tectech.thing.casing.*; -import com.github.technus.tectech.thing.item.*; +import com.github.technus.tectech.thing.casing.GT_Block_CasingsBA0; +import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT; +import com.github.technus.tectech.thing.casing.SpacetimeCompressionFieldCasing; +import com.github.technus.tectech.thing.casing.StabilisationFieldCasing; +import com.github.technus.tectech.thing.casing.TT_Container_Casings; +import com.github.technus.tectech.thing.casing.TimeAccelerationFieldCasing; +import com.github.technus.tectech.thing.item.EnderFluidLinkCover; +import com.github.technus.tectech.thing.item.EuMeterGT; +import com.github.technus.tectech.thing.item.ParametrizerMemoryCard; +import com.github.technus.tectech.thing.item.PowerPassUpgradeCover; +import com.github.technus.tectech.thing.item.TeslaCoilCapacitor; +import com.github.technus.tectech.thing.item.TeslaCoilComponent; +import com.github.technus.tectech.thing.item.TeslaCoilCover; +import com.github.technus.tectech.thing.item.TeslaStaff; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.Textures; diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java index c70442a63..a0edad5fc 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ResearchHandler.java @@ -3,7 +3,7 @@ import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import static gregtech.api.enums.ItemList.Display_Fluid; -import java.awt.*; +import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java index 405028e78..49ea22e5f 100644 --- a/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java +++ b/src/main/java/com/github/technus/tectech/nei/TT_NEI_ScannerHandler.java @@ -3,7 +3,7 @@ import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem; import static gregtech.api.enums.ItemList.Display_Fluid; -import java.awt.*; +import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java index f33164c3b..e044dccac 100644 --- a/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/TT_recipe.java @@ -4,10 +4,16 @@ import static com.google.common.math.LongMath.pow; import static gregtech.api.util.GT_Utility.formatNumbers; import static java.lang.Math.min; -import static net.minecraft.util.EnumChatFormatting.*; +import static net.minecraft.util.EnumChatFormatting.BOLD; +import static net.minecraft.util.EnumChatFormatting.DARK_RED; +import static net.minecraft.util.EnumChatFormatting.RESET; import static net.minecraft.util.StatCollector.translateToLocal; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; import java.util.function.Supplier; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java index 3a788ecee..791ff0102 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java +++ b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java @@ -1,12 +1,7 @@ package com.github.technus.tectech.thing.item.gui; import static com.github.technus.tectech.Reference.MODID; -import static org.lwjgl.opengl.GL11.GL_BLEND; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.glBlendFunc; -import static org.lwjgl.opengl.GL11.glDisable; -import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.*; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.PositionedSoundRecord; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java index fc906e709..91c9ff2b3 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java @@ -1,47 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity; import static gregtech.api.enums.Dyes.MACHINE_METAL; -import static gregtech.api.enums.Textures.BlockIcons.CustomIcon; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_8V_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_8V_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_8V_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_EV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_EV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_EV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_HV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_HV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_HV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_IV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_IV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_IV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LuV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LuV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_LuV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MAX_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MAX_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MAX_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_MV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_UV_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_UV_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_UV_TOP; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_ZPM_BOTTOM; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_ZPM_SIDE; -import static gregtech.api.enums.Textures.BlockIcons.MACHINE_ZPM_TOP; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_IN; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_IN_MULTI; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAYS_ENERGY_OUT_MULTI; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_IN; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_IN_MULTI; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_ON_WIRELESS; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_OUT; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ENERGY_OUT_MULTI; +import static gregtech.api.enums.Textures.BlockIcons.*; import gregtech.api.enums.Dyes; import gregtech.api.interfaces.IIconContainer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java index ab5b11019..41fe3f91a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Uncertainty.java @@ -2,13 +2,7 @@ import static net.minecraft.util.StatCollector.translateToLocal; import static net.minecraft.util.StatCollector.translateToLocalFormatted; -import static org.lwjgl.opengl.GL11.GL_BLEND; -import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.GL_SRC_ALPHA; -import static org.lwjgl.opengl.GL11.glBlendFunc; -import static org.lwjgl.opengl.GL11.glColor4f; -import static org.lwjgl.opengl.GL11.glDisable; -import static org.lwjgl.opengl.GL11.glEnable; +import static org.lwjgl.opengl.GL11.*; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index bc60e9993..347f32324 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -14,19 +14,8 @@ import static gregtech.api.enums.GT_Values.AuthorColen; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static gregtech.api.util.GT_Utility.formatNumbers; -import static java.lang.Math.abs; -import static java.lang.Math.exp; -import static java.lang.Math.max; -import static java.lang.Math.pow; -import static java.lang.Math.random; -import static net.minecraft.util.EnumChatFormatting.BLUE; -import static net.minecraft.util.EnumChatFormatting.DARK_RED; -import static net.minecraft.util.EnumChatFormatting.GOLD; -import static net.minecraft.util.EnumChatFormatting.GRAY; -import static net.minecraft.util.EnumChatFormatting.GREEN; -import static net.minecraft.util.EnumChatFormatting.RED; -import static net.minecraft.util.EnumChatFormatting.RESET; -import static net.minecraft.util.EnumChatFormatting.UNDERLINE; +import static java.lang.Math.*; +import static net.minecraft.util.EnumChatFormatting.*; import java.util.ArrayList; import java.util.Arrays; @@ -1164,6 +1153,7 @@ public CheckRecipeResult processRecipe(EyeOfHarmonyRecipe recipeObject) { } successChance = recipeChanceCalculator(); + currentRecipeRocketTier = currentRecipe.getRocketTier(); // Determine EU recipe output. euOutput = (long) (recipeObject.getEUOutput() * pow(0.77, currentCircuitMultiplier)); @@ -1235,12 +1225,13 @@ private void createRenderBlock(final EyeOfHarmonyRecipe currentRecipe) { } private double successChance; + private long currentRecipeRocketTier; private void outputFailedChance() { // 2^Tier spacetime released upon recipe failure. mOutputFluids = new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten( (long) (successChance * MOLTEN_SPACETIME_PER_FAILURE_TIER - * pow(SPACETIME_FAILURE_BASE, currentRecipe.getRocketTier() + 1))) }; + * pow(SPACETIME_FAILURE_BASE, currentRecipeRocketTier + 1))) }; super.outputAfterRecipe_EM(); } @@ -1401,6 +1392,7 @@ public String[] getStructureDescription(ItemStack stackSize) { private static final String RECIPE_RUNNING_NBT_TAG = EYE_OF_HARMONY + "recipeRunning"; private static final String RECIPE_EU_OUTPUT_NBT_TAG = EYE_OF_HARMONY + "euOutput"; private static final String RECIPE_SUCCESS_CHANCE_NBT_TAG = EYE_OF_HARMONY + "recipeSuccessChance"; + private static final String ROCKET_TIER_NBT_TAG = EYE_OF_HARMONY + "rocketTier"; private static final String CURRENT_CIRCUIT_MULTIPLIER_TAG = EYE_OF_HARMONY + "currentCircuitMultiplier"; private static final String ANIMATIONS_ENABLED = EYE_OF_HARMONY + "animationsEnabled"; @@ -1416,6 +1408,7 @@ public void saveNBTData(NBTTagCompound aNBT) { aNBT.setBoolean(RECIPE_RUNNING_NBT_TAG, recipeRunning); aNBT.setLong(RECIPE_EU_OUTPUT_NBT_TAG, euOutput); aNBT.setDouble(RECIPE_SUCCESS_CHANCE_NBT_TAG, successChance); + aNBT.setLong(ROCKET_TIER_NBT_TAG, currentRecipeRocketTier); aNBT.setLong(CURRENT_CIRCUIT_MULTIPLIER_TAG, currentCircuitMultiplier); aNBT.setBoolean(ANIMATIONS_ENABLED, animationsEnabled); @@ -1450,6 +1443,7 @@ public void loadNBTData(final NBTTagCompound aNBT) { recipeRunning = aNBT.getBoolean(RECIPE_RUNNING_NBT_TAG); euOutput = aNBT.getLong(RECIPE_EU_OUTPUT_NBT_TAG); successChance = aNBT.getDouble(RECIPE_SUCCESS_CHANCE_NBT_TAG); + currentRecipeRocketTier = aNBT.getLong(ROCKET_TIER_NBT_TAG); currentCircuitMultiplier = aNBT.getLong(CURRENT_CIRCUIT_MULTIPLIER_TAG); animationsEnabled = aNBT.getBoolean(ANIMATIONS_ENABLED); diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java index 26525eb53..d81a7f16a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_switch.java @@ -3,12 +3,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.textureOffset; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_HIGH; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java index 65a2e540e..193a958c5 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java @@ -10,23 +10,12 @@ import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.DynamoMulti; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.EnergyMulti; import static com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM.HatchElement.Param; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_HIGH; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_LOW; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_NEUTRAL; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_OK; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_HIGH; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_TOO_LOW; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WRONG; -import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.STATUS_WTF; +import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*; import static com.github.technus.tectech.util.CommonValues.V; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlocksTiered; import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose; -import static gregtech.api.enums.GT_HatchElement.Dynamo; -import static gregtech.api.enums.GT_HatchElement.Energy; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.util.GT_StructureUtility.buildHatchAdder; import static java.lang.Math.min; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java index 606eddabf..1daee413e 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java @@ -3,18 +3,9 @@ import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; import static com.github.technus.tectech.loader.TecTechConfig.POWERLESS_MODE; import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texturePage; -import static com.github.technus.tectech.util.CommonValues.MULTI_CHECK_AT; -import static com.github.technus.tectech.util.CommonValues.RECIPE_AT; -import static com.github.technus.tectech.util.CommonValues.TEC_MARK_GENERAL; -import static com.github.technus.tectech.util.CommonValues.V; -import static com.github.technus.tectech.util.CommonValues.VN; +import static com.github.technus.tectech.util.CommonValues.*; import static com.github.technus.tectech.util.TT_Utility.getTier; -import static gregtech.api.enums.GT_HatchElement.InputBus; -import static gregtech.api.enums.GT_HatchElement.InputHatch; -import static gregtech.api.enums.GT_HatchElement.Maintenance; -import static gregtech.api.enums.GT_HatchElement.Muffler; -import static gregtech.api.enums.GT_HatchElement.OutputBus; -import static gregtech.api.enums.GT_HatchElement.OutputHatch; +import static gregtech.api.enums.GT_HatchElement.*; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; import static java.lang.Math.min; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java index d51cd9e27..af837aa7a 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPollutor.java @@ -1,6 +1,7 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT; import static net.minecraft.util.StatCollector.translateToLocal; import java.util.function.Consumer; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java index 4dceb78d2..016e3ec63 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java @@ -1,10 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_LASER_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_LASER_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; import static com.github.technus.tectech.util.CommonValues.TRANSFER_AT; import static com.github.technus.tectech.util.CommonValues.VN; import static net.minecraft.util.StatCollector.translateToLocal; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java index 6f95ac145..a5146b54d 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TT_Transformer.java @@ -1,10 +1,6 @@ package com.github.technus.tectech.thing.metaTileEntity.single; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_MULTI_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_MULTI_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; import static net.minecraft.util.StatCollector.translateToLocal; import com.github.technus.tectech.util.CommonValues; diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java index 940c27683..16c3dbb90 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java @@ -4,11 +4,7 @@ import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.powerTeslaNodeMap; import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetAdd; import static com.github.technus.tectech.mechanics.tesla.ITeslaConnectable.TeslaUtil.teslaSimpleNodeSetRemove; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.MACHINE_CASINGS_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_MULTI_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_TT; -import static com.github.technus.tectech.thing.metaTileEntity.Textures.TESLA_TRANSCEIVER_TOP_BA; +import static com.github.technus.tectech.thing.metaTileEntity.Textures.*; import static com.github.technus.tectech.util.CommonValues.V; import static java.lang.Math.round; import static net.minecraft.util.StatCollector.translateToLocal;