From 53f71debbc849ac60682070cfae517b84c669016 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Sat, 23 Sep 2023 21:59:13 +0200 Subject: Update buildscript (#2305) * update buildscript * yeet wildcard imports --- .../api/multitileentity/base/MultiTileEntity.java | 7 +- .../interfaces/IMultiTileEntity.java | 10 +- .../machine/MultiTileBasicMachine.java | 9 +- .../multiblock/base/Controller.java | 120 ++++++++++++++++++++- .../multiblock/base/MultiBlockPart.java | 8 +- .../multitileentity/multiblock/casing/Glasses.java | 5 +- 6 files changed, 149 insertions(+), 10 deletions(-) (limited to 'src/main/java/gregtech/api/multitileentity') 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; -- cgit