diff options
| author | boubou19 <miisterunknown@gmail.com> | 2023-09-23 21:59:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-23 19:59:13 +0000 |
| commit | 53f71debbc849ac60682070cfae517b84c669016 (patch) | |
| tree | 4fe45869705fc05c58ba30976c8df33f98b67c7f | |
| parent | 6599b089a7d259ddf0313b10e26e00ab116d3699 (diff) | |
| download | GT5-Unofficial-53f71debbc849ac60682070cfae517b84c669016.tar.gz GT5-Unofficial-53f71debbc849ac60682070cfae517b84c669016.tar.bz2 GT5-Unofficial-53f71debbc849ac60682070cfae517b84c669016.zip | |
Update buildscript (#2305)
* update buildscript
* yeet wildcard imports
17 files changed, 1012 insertions, 39 deletions
diff --git a/build.gradle b/build.gradle index ac9652d0a3..6a54d13b0c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1695323114 +//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 = """ +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> +<module name="Checker"> + <module name="TreeWalker"> + <!-- Use CHECKSTYLE:OFF and CHECKSTYLE:ON comments to suppress checkstyle lints in a block --> + <module name="SuppressionCommentFilter"/> + <module name="AvoidStarImport"> + <!-- Allow static wildcard imports for cases like Opcodes and LWJGL classes, these don't get created accidentally by the IDE --> + <property name="allowStaticMemberImports" value="true"/> + </module> + </module> +</module> +""" 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/" @@ -765,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.5') } - 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} } diff --git a/src/main/java/gregtech/api/logic/ProcessingLogic.java b/src/main/java/gregtech/api/logic/ProcessingLogic.java index 345a3e59dd..4758af3254 100644 --- a/src/main/java/gregtech/api/logic/ProcessingLogic.java +++ b/src/main/java/gregtech/api/logic/ProcessingLogic.java @@ -13,7 +13,11 @@ import org.jetbrains.annotations.NotNull; import gregtech.api.interfaces.tileentity.IRecipeLockable; import gregtech.api.interfaces.tileentity.IVoidable; -import gregtech.api.recipe.check.*; +import gregtech.api.recipe.check.CheckRecipeResult; +import gregtech.api.recipe.check.CheckRecipeResultRegistry; +import gregtech.api.recipe.check.FindRecipeResult; +import gregtech.api.recipe.check.RecipeValidator; +import gregtech.api.recipe.check.SingleRecipeCheck; import gregtech.api.util.GT_OverclockCalculator; import gregtech.api.util.GT_ParallelHelper; import gregtech.api.util.GT_Recipe; diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 97d8abd05a..2412e0e8ff 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -8,7 +8,13 @@ import static mcp.mobius.waila.api.SpecialChars.GREEN; import static mcp.mobius.waila.api.SpecialChars.RED; import static mcp.mobius.waila.api.SpecialChars.RESET; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Optional; import java.util.function.Function; import javax.annotation.Nonnull; @@ -83,7 +89,11 @@ import gregtech.client.GT_SoundLoop; import gregtech.common.GT_Pollution; import gregtech.common.gui.modularui.widget.CheckRecipeResultSyncer; import gregtech.common.items.GT_MetaGenerated_Tool_01; -import gregtech.common.tileentities.machines.*; +import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_InputBus_ME; +import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_OutputBus_ME; +import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; +import gregtech.common.tileentities.machines.IDualInputHatch; +import gregtech.common.tileentities.machines.IDualInputInventory; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; diff --git a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java index af4ef30699..e0d23f0237 100644 --- a/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java @@ -1,7 +1,6 @@ package gregtech.api.multitileentity.base; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.enums.GT_Values.NBT; import static gregtech.api.enums.GT_Values.VALID_SIDES; import java.io.IOException; @@ -37,8 +36,12 @@ import com.gtnewhorizons.modularui.common.internal.network.NetworkUtils; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.GregTech_API; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.GT_Values.NBT; +import gregtech.api.enums.Materials; +import gregtech.api.enums.Mods; +import gregtech.api.enums.SoundResource; +import gregtech.api.enums.Textures; import gregtech.api.enums.Textures.BlockIcons.CustomIcon; import gregtech.api.gui.modularui.GT_UIInfos; import gregtech.api.interfaces.ITexture; diff --git a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java index a490e4275c..7925ebd5b9 100644 --- a/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java +++ b/src/main/java/gregtech/api/multitileentity/interfaces/IMultiTileEntity.java @@ -21,7 +21,15 @@ import net.minecraftforge.fluids.IFluidHandler; import cpw.mods.fml.common.Optional; import gregtech.api.enums.Mods; -import gregtech.api.interfaces.tileentity.*; +import gregtech.api.interfaces.tileentity.IBasicEnergyContainer; +import gregtech.api.interfaces.tileentity.IColoredTileEntity; +import gregtech.api.interfaces.tileentity.ICoverable; +import gregtech.api.interfaces.tileentity.IDebugableTileEntity; +import gregtech.api.interfaces.tileentity.IEnergyConnected; +import gregtech.api.interfaces.tileentity.IHasInventory; +import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; +import gregtech.api.interfaces.tileentity.ITexturedTileEntity; +import gregtech.api.interfaces.tileentity.ITurnable; import gregtech.api.multitileentity.MultiTileEntityBlockInternal; import gregtech.api.multitileentity.MultiTileEntityItemInternal; import gregtech.api.multitileentity.MultiTileEntityRegistry; diff --git a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java index b8ac727a91..0b6d4f587d 100644 --- a/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java +++ b/src/main/java/gregtech/api/multitileentity/machine/MultiTileBasicMachine.java @@ -1,7 +1,8 @@ package gregtech.api.multitileentity.machine; import static com.google.common.primitives.Ints.saturatedCast; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.B; +import static gregtech.api.enums.GT_Values.VN; import java.io.IOException; import java.util.ArrayList; @@ -26,9 +27,13 @@ import com.gtnewhorizons.modularui.api.forge.ItemStackHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.GT_Values.NBT; +import gregtech.api.enums.Mods; +import gregtech.api.enums.SoundResource; +import gregtech.api.enums.Textures; import gregtech.api.enums.Textures.BlockIcons.CustomIcon; +import gregtech.api.enums.TickTime; import gregtech.api.fluid.FluidTankGT; import gregtech.api.interfaces.ITexture; import gregtech.api.logic.PollutionLogic; diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java index cdefa21e71..24c057251e 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/Controller.java @@ -2,9 +2,122 @@ package gregtech.api.multitileentity.multiblock.base; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; import static gregtech.GT_Mod.GT_FML_LOGGER; -import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.*; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.EV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.HV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.IV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.LuV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MAX_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.MV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UEV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UHV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UIV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UMV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.UXV_Sensor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_Conveyor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_Emitter; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_FieldGenerator; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_Motor; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_Piston; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_Pump; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_RobotArm; +import static gregtech.api.multitileentity.enums.GT_MultiTileComponentCasing.ZPM_Sensor; import static gregtech.loaders.preload.GT_Loader_MultiTileEntities.COMPONENT_CASING_REGISTRY_NAME; -import static mcp.mobius.waila.api.SpecialChars.*; +import static mcp.mobius.waila.api.SpecialChars.GREEN; +import static mcp.mobius.waila.api.SpecialChars.RED; +import static mcp.mobius.waila.api.SpecialChars.RESET; import java.lang.ref.WeakReference; import java.util.ArrayList; @@ -57,7 +170,8 @@ import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; import com.gtnewhorizons.modularui.api.forge.ItemStackHandler; import com.gtnewhorizons.modularui.api.forge.ListItemHandler; import com.gtnewhorizons.modularui.api.math.Pos2d; -import com.gtnewhorizons.modularui.api.screen.*; +import com.gtnewhorizons.modularui.api.screen.ModularWindow; +import com.gtnewhorizons.modularui.api.screen.UIBuildContext; import com.gtnewhorizons.modularui.api.widget.IWidgetBuilder; import com.gtnewhorizons.modularui.api.widget.Widget; import com.gtnewhorizons.modularui.common.widget.DrawableWidget; diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java index 59aea8b135..1453502ea0 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/base/MultiBlockPart.java @@ -35,7 +35,13 @@ import com.gtnewhorizons.modularui.api.forge.IItemHandlerModifiable; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.ModularWindow.Builder; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; -import com.gtnewhorizons.modularui.common.widget.*; +import com.gtnewhorizons.modularui.common.widget.DrawableWidget; +import com.gtnewhorizons.modularui.common.widget.DropDownWidget; +import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget; +import com.gtnewhorizons.modularui.common.widget.Scrollable; +import com.gtnewhorizons.modularui.common.widget.SlotGroup; +import com.gtnewhorizons.modularui.common.widget.SlotWidget; +import com.gtnewhorizons.modularui.common.widget.TextWidget; import gregtech.api.enums.GT_Values; import gregtech.api.fluid.FluidTankGT; diff --git a/src/main/java/gregtech/api/multitileentity/multiblock/casing/Glasses.java b/src/main/java/gregtech/api/multitileentity/multiblock/casing/Glasses.java index 37f38f0bff..edc1bd0e5b 100644 --- a/src/main/java/gregtech/api/multitileentity/multiblock/casing/Glasses.java +++ b/src/main/java/gregtech/api/multitileentity/multiblock/casing/Glasses.java @@ -2,7 +2,10 @@ package gregtech.api.multitileentity.multiblock.casing; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlockUnlocalizedName; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofChain; -import static gregtech.api.enums.Mods.*; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.Botania; +import static gregtech.api.enums.Mods.IndustrialCraft2; +import static gregtech.api.enums.Mods.Thaumcraft; import com.gtnewhorizon.structurelib.structure.IStructureElementChain; diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 7277358e23..6178def3a0 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -9,7 +9,10 @@ import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GregTech; import static gregtech.api.enums.Mods.NEICustomDiagrams; import static gregtech.api.enums.Mods.Railcraft; -import static gregtech.api.recipe.check.FindRecipeResult.*; +import static gregtech.api.recipe.check.FindRecipeResult.EXPLODE; +import static gregtech.api.recipe.check.FindRecipeResult.NOT_FOUND; +import static gregtech.api.recipe.check.FindRecipeResult.ON_FIRE; +import static gregtech.api.recipe.check.FindRecipeResult.ofSuccess; import static gregtech.api.util.GT_RecipeBuilder.handleRecipeCollision; import static gregtech.api.util.GT_RecipeConstants.ADDITIVE_AMOUNT; import static gregtech.api.util.GT_RecipeMapUtil.FIRST_FLUIDSTACK_INPUT; @@ -30,7 +33,16 @@ import static net.minecraft.util.EnumChatFormatting.GRAY; import static net.minecraft.util.StatCollector.translateToLocal; import java.awt.Rectangle; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Function; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java index d0e56853ad..a3f3dd9eb7 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_ME.java @@ -1,8 +1,17 @@ package gregtech.common.tileentities.machines; -import static gregtech.api.enums.Textures.BlockIcons.*; - -import java.util.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_BUFFER; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_BUS; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.EnumSet; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; diff --git a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java index f2048f82ce..ffbed32445 100644 --- a/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java +++ b/src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_Hatch_CraftingInput_Slave.java @@ -1,8 +1,13 @@ package gregtech.common.tileentities.machines; -import static gregtech.api.enums.Textures.BlockIcons.*; - -import java.util.*; +import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_ME_CRAFTING_INPUT_SLAVE; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Optional; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 67500e8e59..46d682d6c0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -12,7 +12,7 @@ import static gregtech.api.enums.GT_HatchElement.InputHatch; import static gregtech.api.enums.GT_HatchElement.Maintenance; import static gregtech.api.enums.GT_HatchElement.OutputBus; import static gregtech.api.enums.GT_HatchElement.OutputHatch; -import static gregtech.api.enums.GT_Values.*; +import static gregtech.api.enums.GT_Values.VN; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_PROCESSING_ARRAY_ACTIVE_GLOW; diff --git a/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java b/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java index 0cc8d1bf44..7f3651990d 100644 --- a/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java +++ b/src/main/java/gregtech/crossmod/holoinventory/GT_InventoryDecoder.java @@ -1,6 +1,6 @@ package gregtech.crossmod.holoinventory; -import static net.dries007.holoInventory.util.NBTKeys.*; +import static net.dries007.holoInventory.util.NBTKeys.NBT_KEY_COUNT; import java.util.List; diff --git a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java index 71ca165a2f..369f91cdf8 100644 --- a/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java +++ b/src/main/java/gregtech/loaders/load/GT_Loader_MetaTileEntities_Recipes.java @@ -1,6 +1,224 @@ package gregtech.loaders.load; -import static gregtech.api.enums.MetaTileEntityIDs.*; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_EV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_HV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_IV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.ALLOY_SMELTER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_EV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_HV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_IV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_LV; +import static gregtech.api.enums.MetaTileEntityIDs.ARC_FURNACE_MV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLER_EV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLER_HV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLER_IV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.ASSEMBLER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_EV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_HV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_IV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_LV; +import static gregtech.api.enums.MetaTileEntityIDs.AUTOCLAVE_MV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_EV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_HV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_IV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_LV; +import static gregtech.api.enums.MetaTileEntityIDs.BENDING_MACHINE_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNER_EV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNER_HV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNER_IV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.CANNER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_EV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_HV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_IV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_LV; +import static gregtech.api.enums.MetaTileEntityIDs.CENTRIFUGE_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_EV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_HV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_IV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_LV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_BATH_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_EV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_HV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_IV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_LV; +import static gregtech.api.enums.MetaTileEntityIDs.CHEMICAL_REACTOR_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_EV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_HV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_IV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_LV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_LuV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_UV; +import static gregtech.api.enums.MetaTileEntityIDs.CIRCUIT_ASSEMBLER_ZPM; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_EV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_HV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_IV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_LV; +import static gregtech.api.enums.MetaTileEntityIDs.COMPRESSOR_MV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_EV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_HV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_IV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_LV; +import static gregtech.api.enums.MetaTileEntityIDs.CUTTING_MACHINE_MV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_EV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_HV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_IV; +import static gregtech.api.enums.MetaTileEntityIDs.DISTILLERY_LV; +import static |
