From 861791f4fbc5b1f6b948ba7f18013cc4894ddb0e Mon Sep 17 00:00:00 2001 From: miozune Date: Wed, 27 Sep 2023 23:03:59 +0900 Subject: [PATCH] Fix GUIs not accepting numpad enter key (#159) * updateBuildScript * updateDependencies * Fix GUIs not accepting numpad enter key * Fix wildcard import --- build.gradle | 73 ++++++++++++++----- dependencies.gradle | 20 ++--- .../java/com/glodblock/github/FluidCraft.java | 8 +- .../github/client/gui/GuiDualInterface.java | 7 +- .../client/gui/GuiFluidLevelEmitter.java | 3 +- .../client/gui/GuiFluidPatternTerminalEx.java | 6 +- .../gui/GuiInterfaceTerminalWireless.java | 19 ++++- .../github/client/gui/GuiLevelMaintainer.java | 4 +- .../github/client/gui/GuiRenamer.java | 4 +- .../github/client/gui/base/FCBaseMEGui.java | 8 +- .../github/client/gui/base/FCGuiAmount.java | 4 +- .../github/client/gui/base/FCGuiMonitor.java | 24 +++++- .../container/ContainerFluidLevelEmitter.java | 4 +- .../container/ContainerFluidStorageBus.java | 6 +- .../container/ContainerInterfaceWireless.java | 6 +- .../base/FCContainerEncodeTerminal.java | 13 +++- .../container/base/FCContainerMonitor.java | 9 ++- .../glodblock/github/client/me/FluidRepo.java | 5 +- .../item/ItemWirelessUltraTerminal.java | 6 +- .../common/parts/PartFluidExportBus.java | 9 ++- .../common/parts/PartFluidImportBus.java | 7 +- .../common/parts/PartFluidLevelEmitter.java | 7 +- .../common/parts/PartFluidStorageBus.java | 18 ++++- .../github/common/parts/base/FCPart.java | 7 +- .../common/storage/FluidCellHandler.java | 6 +- .../common/tile/TileCertusQuartzTank.java | 6 +- .../common/tile/TileFluidDiscretizer.java | 13 +++- .../common/tile/TileFluidPacketDecoder.java | 5 +- .../github/coremod/FCClassTransformer.java | 8 +- .../ExternalStorageRegistryTransformer.java | 6 +- .../crossmod/extracells/ItemReplacements.java | 14 +++- .../github/crossmod/extracells/ProxyPart.java | 8 +- .../FluidConvertingInventoryAdaptor.java | 10 ++- .../inventory/MEMonitorIFluidHandler.java | 7 +- .../github/inventory/gui/GuiType.java | 61 +++++++++++++++- .../item/PortableFluidCellInventory.java | 7 +- .../WirelessCraftingTerminalInventory.java | 8 +- .../item/WirelessFluidTerminalInventory.java | 7 +- .../WirelessInterfaceTerminalInventory.java | 5 +- .../WirelessPatternTerminalExInventory.java | 8 +- .../WirelessPatternTerminalInventory.java | 8 +- .../github/loader/ChannelLoader.java | 18 ++++- .../github/loader/ItemAndBlockHolder.java | 39 +++++++++- .../github/loader/filter/FluidFilter.java | 2 +- .../com/glodblock/github/nei/NEIUtils.java | 4 +- .../glodblock/github/nei/NEI_FC_Config.java | 6 +- .../nei/recipes/DefaultExtractorLoader.java | 18 ++++- .../github/nei/recipes/FluidRecipe.java | 6 +- .../github/network/SPacketFluidUpdate.java | 9 ++- .../github/network/SPacketMEUpdateBuffer.java | 6 +- .../github/network/SPacketStringUpdate.java | 2 +- .../java/com/glodblock/github/util/Util.java | 7 +- 52 files changed, 483 insertions(+), 98 deletions(-) diff --git a/build.gradle b/build.gradle index b894d647..6a54d13b 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.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} } @@ -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 4c7c4e8a..2bc0c83e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,24 +1,24 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.3.80-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-247-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.4.3-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-258-GTNH:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.6.0:dev') compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.9.3:dev") + compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.9.4:dev") - compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.13:dev') - compileOnly('com.github.GTNewHorizons:EnderIO:2.4.24:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.162:dev') { + compileOnly('com.github.GTNewHorizons:ForestryMC:4.6.14:dev') + compileOnly('com.github.GTNewHorizons:EnderIO:2.5.0:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.25:dev') { exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework' } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.12-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.11-GTNH:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:GTplusplus:1.9.72:dev') { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.27:dev") { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.17-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:GTplusplus:1.10.11:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.7:dev") { transitive = false } } diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 27f59af5..96b5d375 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -20,7 +20,13 @@ import com.glodblock.github.util.ModAndClassUtil; import appeng.api.AEApi; 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.FMLMissingMappingsEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerStartingEvent; +import cpw.mods.fml.common.event.FMLServerStoppedEvent; import cpw.mods.fml.common.network.NetworkRegistry; @Mod( diff --git a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java index 040c417e..7d6c5c81 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java @@ -16,7 +16,12 @@ import com.glodblock.github.network.CPacketSwitchGuis; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.NameConst; -import appeng.api.config.*; +import appeng.api.config.AdvancedBlockingMode; +import appeng.api.config.InsertionMode; +import appeng.api.config.Settings; +import appeng.api.config.SidelessMode; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.client.gui.implementations.GuiUpgradeable; import appeng.client.gui.widgets.GuiImgButton; import appeng.client.gui.widgets.GuiTabButton; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java index 01965494..13464de0 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidLevelEmitter.java @@ -10,7 +10,8 @@ import com.glodblock.github.network.CPacketValueConfig; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.NameConst; -import appeng.api.config.*; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; import appeng.api.storage.data.IAEFluidStack; import appeng.client.gui.implementations.GuiUpgradeable; import appeng.client.gui.widgets.GuiImgButton; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java index 39b4a262..6ec82b0e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFluidPatternTerminalEx.java @@ -14,7 +14,11 @@ import com.glodblock.github.network.CPacketFluidPatternTermBtns; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.NameConst; -import appeng.api.config.*; +import appeng.api.config.ActionItems; +import appeng.api.config.ItemSubstitution; +import appeng.api.config.PatternBeSubstitution; +import appeng.api.config.PatternSlotConfig; +import appeng.api.config.Settings; import appeng.api.storage.ITerminalHost; import appeng.client.gui.widgets.GuiImgButton; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java index 4cb72969..4b726d29 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiInterfaceTerminalWireless.java @@ -1,6 +1,12 @@ package com.glodblock.github.client.gui; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.WeakHashMap; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; @@ -26,9 +32,16 @@ import com.glodblock.github.util.Util; import com.google.common.collect.HashMultimap; import appeng.api.AEApi; -import appeng.api.config.*; +import appeng.api.config.ActionItems; +import appeng.api.config.Settings; +import appeng.api.config.TerminalStyle; +import appeng.api.config.YesNo; import appeng.api.util.WorldCoord; -import appeng.client.gui.widgets.*; +import appeng.client.gui.widgets.GuiImgButton; +import appeng.client.gui.widgets.GuiScrollbar; +import appeng.client.gui.widgets.GuiTabButton; +import appeng.client.gui.widgets.IDropToFillTextField; +import appeng.client.gui.widgets.MEGuiTextField; import appeng.client.me.ClientDCInternalInv; import appeng.client.me.SlotDisconnected; import appeng.client.render.BlockPosHighlighter; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index f659ed50..5f37fc5f 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -1,6 +1,6 @@ package com.glodblock.github.client.gui; -import java.awt.*; +import java.awt.Rectangle; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -202,7 +202,7 @@ public class GuiLevelMaintainer extends AEBaseGui implements INEIGuiHandler { } else { this.input.setTextColor(0xFFFFFF); } - if (key == Keyboard.KEY_RETURN) { + if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { this.input.setFocused(false); this.input = null; } diff --git a/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java b/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java index 589c8938..a81ec4cd 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiRenamer.java @@ -3,6 +3,8 @@ package com.glodblock.github.client.gui; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; + import com.glodblock.github.FluidCraft; import com.glodblock.github.client.gui.container.ContainerRenamer; import com.glodblock.github.network.CPacketRenamer; @@ -55,7 +57,7 @@ public class GuiRenamer extends AEBaseGui implements IDropToFillTextField { @Override protected void keyTyped(final char character, final int key) { - if (key == 28) { // Enter + if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { FluidCraft.proxy.netHandler.sendToServer(new CPacketRenamer(this.textField.getText())); } else if (!this.textField.textboxKeyTyped(character, key)) { super.keyTyped(character, key); diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java b/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java index 56a65df7..7cf6ff2d 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCBaseMEGui.java @@ -7,7 +7,13 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; -import com.glodblock.github.client.gui.*; +import com.glodblock.github.client.gui.GuiEssentiaTerminal; +import com.glodblock.github.client.gui.GuiFCImgButton; +import com.glodblock.github.client.gui.GuiFluidCraftingWireless; +import com.glodblock.github.client.gui.GuiFluidPatternExWireless; +import com.glodblock.github.client.gui.GuiFluidPatternWireless; +import com.glodblock.github.client.gui.GuiFluidPortableCell; +import com.glodblock.github.client.gui.GuiInterfaceTerminalWireless; import com.glodblock.github.client.gui.container.base.FCBaseContainer; import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.inventory.gui.GuiType; diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiAmount.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiAmount.java index b428f615..86b58fa0 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiAmount.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiAmount.java @@ -5,6 +5,8 @@ import net.minecraft.client.gui.GuiTextField; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import org.lwjgl.input.Keyboard; + import com.glodblock.github.FluidCraft; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.network.CPacketSwitchGuis; @@ -92,7 +94,7 @@ public abstract class FCGuiAmount extends AEBaseGui { @Override protected void keyTyped(final char character, final int key) { if (!this.checkHotbarKeys(key)) { - if (key == 28) { + if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { this.actionPerformed(this.submit); } this.amountBox.textboxKeyTyped(character, key); diff --git a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java index 93d97c79..0919d022 100644 --- a/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/base/FCGuiMonitor.java @@ -16,7 +16,8 @@ import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.*; +import com.glodblock.github.client.gui.FCGuiTextField; +import com.glodblock.github.client.gui.GuiItemMonitor; import com.glodblock.github.client.gui.container.base.FCContainerMonitor; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; @@ -24,7 +25,11 @@ import com.glodblock.github.network.CPacketInventoryAction; import com.glodblock.github.util.Ae2ReflectClient; import com.glodblock.github.util.ModAndClassUtil; -import appeng.api.config.*; +import appeng.api.config.CraftingStatus; +import appeng.api.config.SearchBoxMode; +import appeng.api.config.Settings; +import appeng.api.config.TerminalStyle; +import appeng.api.config.YesNo; import appeng.api.implementations.tiles.IViewCellStorage; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; @@ -32,12 +37,23 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IDisplayRepo; import appeng.api.util.IConfigManager; import appeng.api.util.IConfigurableObject; -import appeng.client.gui.widgets.*; +import appeng.client.gui.widgets.GuiImgButton; +import appeng.client.gui.widgets.GuiScrollbar; +import appeng.client.gui.widgets.GuiTabButton; +import appeng.client.gui.widgets.IDropToFillTextField; +import appeng.client.gui.widgets.ISortSource; import appeng.client.me.InternalSlotME; import appeng.client.me.SlotDisconnected; import appeng.client.me.SlotME; import appeng.container.AEBaseContainer; -import appeng.container.slot.*; +import appeng.container.slot.AppEngSlot; +import appeng.container.slot.OptionalSlotFake; +import appeng.container.slot.SlotCraftingMatrix; +import appeng.container.slot.SlotCraftingTerm; +import appeng.container.slot.SlotDisabled; +import appeng.container.slot.SlotFake; +import appeng.container.slot.SlotFakeCraftingMatrix; +import appeng.container.slot.SlotPatternTerm; import appeng.core.AEConfig; import appeng.core.AELog; import appeng.core.localization.ButtonToolTips; diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidLevelEmitter.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidLevelEmitter.java index 3e65a46f..f80fbc67 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidLevelEmitter.java @@ -10,7 +10,9 @@ import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly; import com.glodblock.github.util.Ae2Reflect; -import appeng.api.config.*; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; import appeng.api.implementations.IUpgradeableHost; import appeng.container.guisync.GuiSync; import appeng.tile.inventory.AppEngInternalAEInventory; diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java index 26a1e61a..9c06106a 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidStorageBus.java @@ -12,7 +12,11 @@ import com.glodblock.github.inventory.slot.OptionalFluidSlotFakeTypeOnly; import com.glodblock.github.util.Ae2Reflect; import appeng.api.AEApi; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; +import appeng.api.config.Upgrades; import appeng.api.storage.IMEInventory; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IItemList; diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java index 8fb54a43..1afa5f5c 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerInterfaceWireless.java @@ -1,7 +1,9 @@ package com.glodblock.github.client.gui.container; import java.io.IOException; -import java.util.*; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.entity.player.InventoryPlayer; @@ -42,7 +44,7 @@ public class ContainerInterfaceWireless extends FCBaseContainer { private static long autoBase = Long.MIN_VALUE; private final Multimap supportedInterfaces = HashMultimap.create(); - private final Map byId = new HashMap<>(); + private final Map byId = new HashMap<>(); private IGrid grid; private NBTTagCompound data = new NBTTagCompound(); diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java index 9a12a504..95153be8 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerEncodeTerminal.java @@ -1,6 +1,10 @@ package com.glodblock.github.client.gui.container.base; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import net.minecraft.entity.player.EntityPlayer; @@ -33,7 +37,12 @@ import appeng.api.definitions.IDefinitions; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; import appeng.container.guisync.GuiSync; -import appeng.container.slot.*; +import appeng.container.slot.IOptionalSlotHost; +import appeng.container.slot.OptionalSlotFake; +import appeng.container.slot.SlotFake; +import appeng.container.slot.SlotFakeCraftingMatrix; +import appeng.container.slot.SlotPatternTerm; +import appeng.container.slot.SlotRestrictedInput; import appeng.helpers.IContainerCraftingPacket; import appeng.helpers.InventoryAction; import appeng.items.misc.ItemEncodedPattern; diff --git a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java index f0b08cc7..80afc26c 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/container/base/FCContainerMonitor.java @@ -13,7 +13,14 @@ import net.minecraft.item.ItemStack; import com.glodblock.github.inventory.item.IWirelessTerminal; import com.glodblock.github.network.SPacketMEUpdateBuffer; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.TypeFilter; +import appeng.api.config.ViewItems; import appeng.api.networking.IGridNode; import appeng.api.networking.energy.IEnergyGrid; import appeng.api.storage.IMEMonitor; diff --git a/src/main/java/com/glodblock/github/client/me/FluidRepo.java b/src/main/java/com/glodblock/github/client/me/FluidRepo.java index 6e626b4a..02b5405d 100644 --- a/src/main/java/com/glodblock/github/client/me/FluidRepo.java +++ b/src/main/java/com/glodblock/github/client/me/FluidRepo.java @@ -26,7 +26,10 @@ import com.glodblock.github.util.FluidSorters; import com.glodblock.github.util.Util; import appeng.api.AEApi; -import appeng.api.config.*; +import appeng.api.config.SearchBoxMode; +import appeng.api.config.Settings; +import appeng.api.config.SortOrder; +import appeng.api.config.ViewItems; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IDisplayRepo; import appeng.api.storage.data.IItemList; diff --git a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java index 133f628f..51807e85 100644 --- a/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java +++ b/src/main/java/com/glodblock/github/common/item/ItemWirelessUltraTerminal.java @@ -21,7 +21,11 @@ import com.glodblock.github.FluidCraft; import com.glodblock.github.common.tabs.FluidCraftingTabs; import com.glodblock.github.inventory.InventoryHandler; import com.glodblock.github.inventory.gui.GuiType; -import com.glodblock.github.inventory.item.*; +import com.glodblock.github.inventory.item.WirelessCraftingTerminalInventory; +import com.glodblock.github.inventory.item.WirelessFluidTerminalInventory; +import com.glodblock.github.inventory.item.WirelessInterfaceTerminalInventory; +import com.glodblock.github.inventory.item.WirelessPatternTerminalExInventory; +import com.glodblock.github.inventory.item.WirelessPatternTerminalInventory; import com.glodblock.github.loader.IRegister; import com.glodblock.github.network.CPacketSwitchGuis; import com.glodblock.github.util.BlockPos; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java index cb0f3c16..27a533aa 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidExportBus.java @@ -14,7 +14,14 @@ import com.glodblock.github.common.parts.base.FCSharedFluidBus; import com.glodblock.github.inventory.FluidConvertingInventoryAdaptor; import com.google.common.collect.ImmutableSet; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.Settings; +import appeng.api.config.Upgrades; +import appeng.api.config.YesNo; import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.crafting.ICraftingLink; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java index 46ebc01a..07b8bc43 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidImportBus.java @@ -12,7 +12,12 @@ import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.parts.base.FCSharedFluidBus; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.FuzzyMode; +import appeng.api.config.RedstoneMode; +import appeng.api.config.SchedulingMode; +import appeng.api.config.Settings; +import appeng.api.config.YesNo; import appeng.api.networking.IGridNode; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.MachineSource; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java index 6b9b0714..3abab719 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidLevelEmitter.java @@ -23,9 +23,12 @@ import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.RedstoneMode; +import appeng.api.config.Settings; import appeng.api.networking.IGridNode; -import appeng.api.networking.crafting.*; +import appeng.api.networking.crafting.ICraftingGrid; +import appeng.api.networking.crafting.ICraftingWatcher; +import appeng.api.networking.crafting.ICraftingWatcherHost; import appeng.api.networking.events.MENetworkChannelsChanged; import appeng.api.networking.events.MENetworkEventSubscribe; import appeng.api.networking.events.MENetworkPowerStatusChange; diff --git a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java index 1c66c42b..14fd5a5b 100644 --- a/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java +++ b/src/main/java/com/glodblock/github/common/parts/PartFluidStorageBus.java @@ -16,13 +16,19 @@ import net.minecraftforge.fluids.IFluidHandler; import com.glodblock.github.client.textures.FCPartsTexture; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.common.tile.TileFluidInterface; -import com.glodblock.github.inventory.*; +import com.glodblock.github.inventory.InventoryHandler; +import com.glodblock.github.inventory.MEMonitorIFluidHandler; import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.ModAndClassUtil; import appeng.api.AEApi; -import appeng.api.config.*; +import appeng.api.config.AccessRestriction; +import appeng.api.config.FuzzyMode; +import appeng.api.config.IncludeExclude; +import appeng.api.config.Settings; +import appeng.api.config.StorageFilter; +import appeng.api.config.Upgrades; import appeng.api.networking.IGridNode; import appeng.api.networking.events.MENetworkCellArrayUpdate; import appeng.api.networking.events.MENetworkChannelsChanged; @@ -39,7 +45,13 @@ import appeng.api.networking.ticking.TickingRequest; import appeng.api.parts.IPart; import appeng.api.parts.IPartCollisionHelper; import appeng.api.parts.IPartRenderHelper; -import appeng.api.storage.*; +import appeng.api.storage.ICellContainer; +import appeng.api.storage.IExternalStorageHandler; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; diff --git a/src/main/java/com/glodblock/github/common/parts/base/FCPart.java b/src/main/java/com/glodblock/github/common/parts/base/FCPart.java index 1bd485f6..b6bf7778 100644 --- a/src/main/java/com/glodblock/github/common/parts/base/FCPart.java +++ b/src/main/java/com/glodblock/github/common/parts/base/FCPart.java @@ -23,7 +23,12 @@ import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.SecurityPermissions; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.TypeFilter; +import appeng.api.config.ViewItems; import appeng.api.implementations.IPowerChannelState; import appeng.api.implementations.tiles.IViewCellStorage; import appeng.api.networking.GridFlags; diff --git a/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java b/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java index f4bb589e..9f4a5f09 100644 --- a/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java +++ b/src/main/java/com/glodblock/github/common/storage/FluidCellHandler.java @@ -10,7 +10,11 @@ import com.glodblock.github.inventory.gui.GuiType; import com.glodblock.github.util.BlockPos; import appeng.api.implementations.tiles.IChestOrDrive; -import appeng.api.storage.*; +import appeng.api.storage.ICellHandler; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.ISaveProvider; +import appeng.api.storage.StorageChannel; import appeng.client.texture.ExtraBlockTextures; public class FluidCellHandler implements ICellHandler { diff --git a/src/main/java/com/glodblock/github/common/tile/TileCertusQuartzTank.java b/src/main/java/com/glodblock/github/common/tile/TileCertusQuartzTank.java index 78bacb0a..aa54e130 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileCertusQuartzTank.java +++ b/src/main/java/com/glodblock/github/common/tile/TileCertusQuartzTank.java @@ -8,7 +8,11 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import com.glodblock.github.loader.ChannelLoader; import com.glodblock.github.util.BlockPos; diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java index d00d0a16..751af4ed 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidDiscretizer.java @@ -14,12 +14,21 @@ import appeng.api.config.Actionable; import appeng.api.networking.GridFlags; import appeng.api.networking.crafting.ICraftingGrid; import appeng.api.networking.energy.IEnergyGrid; -import appeng.api.networking.events.*; +import appeng.api.networking.events.MENetworkCellArrayUpdate; +import appeng.api.networking.events.MENetworkChannelsChanged; +import appeng.api.networking.events.MENetworkEventSubscribe; +import appeng.api.networking.events.MENetworkPowerStatusChange; +import appeng.api.networking.events.MENetworkStorageEvent; import appeng.api.networking.security.BaseActionSource; import appeng.api.networking.security.MachineSource; import appeng.api.networking.storage.IBaseMonitor; import appeng.api.networking.storage.IStorageGrid; -import appeng.api.storage.*; +import appeng.api.storage.ICellContainer; +import appeng.api.storage.IMEInventory; +import appeng.api.storage.IMEInventoryHandler; +import appeng.api.storage.IMEMonitor; +import appeng.api.storage.IMEMonitorHandlerReceiver; +import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; diff --git a/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java b/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java index 655beeed..d26ad0e3 100644 --- a/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java +++ b/src/main/java/com/glodblock/github/common/tile/TileFluidPacketDecoder.java @@ -5,7 +5,10 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidHandler; import com.glodblock.github.common.item.ItemFluidPacket; diff --git a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java index aaae9c12..6d38d376 100644 --- a/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java +++ b/src/main/java/com/glodblock/github/coremod/FCClassTransformer.java @@ -6,7 +6,13 @@ import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.ClassWriter; -import com.glodblock.github.coremod.transform.*; +import com.glodblock.github.coremod.transform.CraftingCpuTransformer; +import com.glodblock.github.coremod.transform.CraftingTreeNodeTransformer; +import com.glodblock.github.coremod.transform.DualityInterfaceTransformer; +import com.glodblock.github.coremod.transform.ExternalStorageRegistryTransformer; +import com.glodblock.github.coremod.transform.GuiCraftingTransformer; +import com.glodblock.github.coremod.transform.NEITransfermer; +import com.glodblock.github.coremod.transform.PacketCompressedNBTTransformer; public class FCClassTransformer implements IClassTransformer { diff --git a/src/main/java/com/glodblock/github/coremod/transform/ExternalStorageRegistryTransformer.java b/src/main/java/com/glodblock/github/coremod/transform/ExternalStorageRegistryTransformer.java index 6c175b15..0ad99cc6 100644 --- a/src/main/java/com/glodblock/github/coremod/transform/ExternalStorageRegistryTransformer.java +++ b/src/main/java/com/glodblock/github/coremod/transform/ExternalStorageRegistryTransformer.java @@ -1,6 +1,10 @@ package com.glodblock.github.coremod.transform; -import org.objectweb.asm.*; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import com.glodblock.github.coremod.FCClassTransformer; diff --git a/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java b/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java index be80ed6c..25560e8f 100644 --- a/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java +++ b/src/main/java/com/glodblock/github/crossmod/extracells/ItemReplacements.java @@ -9,8 +9,18 @@ import net.minecraft.nbt.NBTTagCompound; import com.glodblock.github.common.item.ItemBaseWirelessTerminal; import com.glodblock.github.common.item.ItemMultiFluidStorageCell; -import com.glodblock.github.crossmod.extracells.parts.*; -import com.glodblock.github.crossmod.extracells.storage.*; +import com.glodblock.github.crossmod.extracells.parts.ProxyFluidBusIO; +import com.glodblock.github.crossmod.extracells.parts.ProxyFluidInterface; +import com.glodblock.github.crossmod.extracells.parts.ProxyFluidStorage; +import com.glodblock.github.crossmod.extracells.parts.ProxyLevelEmitter; +import com.glodblock.github.crossmod.extracells.parts.ProxyOreDictExportBus; +import com.glodblock.github.crossmod.extracells.parts.ProxyStorageMonitor; +import com.glodblock.github.crossmod.extracells.storage.ProxyExtremeStorageCell; +import com.glodblock.github.crossmod.extracells.storage.ProxyFluidStorageCell; +import com.glodblock.github.crossmod.extracells.storage.ProxyItemCellHandler; +import com.glodblock.github.crossmod.extracells.storage.ProxyItemStorageCell; +import com.glodblock.github.crossmod.extracells.storage.ProxyVoidCellHandler; +import com.glodblock.github.crossmod.extracells.storage.ProxyVoidStorageCell; import com.glodblock.github.loader.ItemAndBlockHolder; import appeng.api.AEApi; diff --git a/src/main/java/com/glodblock/github/crossmod/extracells/ProxyPart.java b/src/main/java/com/glodblock/github/crossmod/extracells/ProxyPart.java index 18757bc2..012a1f9e 100644 --- a/src/main/java/com/glodblock/github/crossmod/extracells/ProxyPart.java +++ b/src/main/java/com/glodblock/github/crossmod/extracells/ProxyPart.java @@ -23,7 +23,13 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import appeng.api.networking.IGridNode; -import appeng.api.parts.*; +import appeng.api.parts.BusSupport; +import appeng.api.parts.IPart; +import appeng.api.parts.IPartCollisionHelper; +import appeng.api.parts.IPartDeprecated; +import appeng.api.parts.IPartHost; +import appeng.api.parts.IPartRenderHelper; +import appeng.api.parts.PartItemStack; import appeng.api.storage.data.IAEItemStack; import appeng.util.item.AEItemStack; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java index 8d3c45e4..459a23c6 100644 --- a/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java +++ b/src/main/java/com/glodblock/github/inventory/FluidConvertingInventoryAdaptor.java @@ -2,7 +2,11 @@ package com.glodblock.github.inventory; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import java.util.*; +import java.util.Collections; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; import javax.annotation.Nullable; @@ -24,7 +28,9 @@ import com.glodblock.github.util.BlockPos; import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.FuzzyMode; +import appeng.api.config.InsertionMode; +import appeng.api.config.Upgrades; import appeng.api.parts.IPart; import appeng.helpers.DualityInterface; import appeng.helpers.IInterfaceHost; diff --git a/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java b/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java index 80572097..4b3b38ac 100644 --- a/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java +++ b/src/main/java/com/glodblock/github/inventory/MEMonitorIFluidHandler.java @@ -1,6 +1,11 @@ package com.glodblock.github.inventory; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import javax.annotation.Nonnull; diff --git a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java index b3dec8c3..a89d0f73 100644 --- a/src/main/java/com/glodblock/github/inventory/gui/GuiType.java +++ b/src/main/java/com/glodblock/github/inventory/gui/GuiType.java @@ -6,13 +6,68 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; -import com.glodblock.github.client.gui.*; -import com.glodblock.github.client.gui.container.*; +import com.glodblock.github.client.gui.GuiDualInterface; +import com.glodblock.github.client.gui.GuiEssentiaTerminal; +import com.glodblock.github.client.gui.GuiFCPriority; +import com.glodblock.github.client.gui.GuiFluidAutoFiller; +import com.glodblock.github.client.gui.GuiFluidCraftAmount; +import com.glodblock.github.client.gui.GuiFluidCraftConfirm; +import com.glodblock.github.client.gui.GuiFluidCraftingWireless; +import com.glodblock.github.client.gui.GuiFluidIO; +import com.glodblock.github.client.gui.GuiFluidInterface; +import com.glodblock.github.client.gui.GuiFluidLevelEmitter; +import com.glodblock.github.client.gui.GuiFluidPacketDecoder; +import com.glodblock.github.client.gui.GuiFluidPatternEncoder; +import com.glodblock.github.client.gui.GuiFluidPatternExWireless; +import com.glodblock.github.client.gui.GuiFluidPatternTerminal; +import com.glodblock.github.client.gui.GuiFluidPatternTerminalCraftingStatus; +import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; +import com.glodblock.github.client.gui.GuiFluidPatternWireless; +import com.glodblock.github.client.gui.GuiFluidPortableCell; +import com.glodblock.github.client.gui.GuiFluidStorageBus; +import com.glodblock.github.client.gui.GuiFluidTerminal; +import com.glodblock.github.client.gui.GuiIngredientBuffer; +import com.glodblock.github.client.gui.GuiInterfaceTerminalWireless; +import com.glodblock.github.client.gui.GuiLargeIngredientBuffer; +import com.glodblock.github.client.gui.GuiLevelMaintainer; +import com.glodblock.github.client.gui.GuiOCPatternEditor; +import com.glodblock.github.client.gui.GuiPatternValueAmount; +import com.glodblock.github.client.gui.GuiRenamer; +import com.glodblock.github.client.gui.container.ContainerCraftingWireless; +import com.glodblock.github.client.gui.container.ContainerDualInterface; +import com.glodblock.github.client.gui.container.ContainerEssentiaMonitor; +import com.glodblock.github.client.gui.container.ContainerFluidAutoFiller; +import com.glodblock.github.client.gui.container.ContainerFluidCraftConfirm; +import com.glodblock.github.client.gui.container.ContainerFluidIO; +import com.glodblock.github.client.gui.container.ContainerFluidInterface; +import com.glodblock.github.client.gui.container.ContainerFluidLevelEmitter; +import com.glodblock.github.client.gui.container.ContainerFluidMonitor; +import com.glodblock.github.client.gui.container.ContainerFluidPacketDecoder; +import com.glodblock.github.client.gui.container.ContainerFluidPatternEncoder; +import com.glodblock.github.client.gui.container.ContainerFluidPatternExWireless; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminal; +import com.glodblock.github.client.gui.container.ContainerFluidPatternTerminalEx; +import com.glodblock.github.client.gui.container.ContainerFluidPatternWireless; +import com.glodblock.github.client.gui.container.ContainerFluidPortableCell; +import com.glodblock.github.client.gui.container.ContainerFluidStorageBus; +import com.glodblock.github.client.gui.container.ContainerIngredientBuffer; +import com.glodblock.github.client.gui.container.ContainerInterfaceWireless; +import com.glodblock.github.client.gui.container.ContainerLargeIngredientBuffer; +import com.glodblock.github.client.gui.container.ContainerLevelMaintainer; +import com.glodblock.github.client.gui.container.ContainerOCPatternEditor; +import com.glodblock.github.client.gui.container.ContainerPatternValueAmount; +import com.glodblock.github.client.gui.container.ContainerRenamer; import com.glodblock.github.common.parts.PartFluidLevelEmitter; import com.glodblock.github.common.parts.PartFluidStorageBus; import com.glodblock.github.common.parts.base.FCPart; import com.glodblock.github.common.parts.base.FCSharedFluidBus; -import com.glodblock.github.common.tile.*; +import com.glodblock.github.common.tile.TileFluidAutoFiller; +import com.glodblock.github.common.tile.TileFluidPacketDecoder; +import com.glodblock.github.common.tile.TileFluidPatternEncoder; +import com.glodblock.github.common.tile.TileIngredientBuffer; +import com.glodblock.github.common.tile.TileLargeIngredientBuffer; +import com.glodblock.github.common.tile.TileLevelMaintainer; +import com.glodblock.github.common.tile.TileOCPatternEditor; import com.glodblock.github.inventory.IDualHost; import com.glodblock.github.inventory.item.IFluidPortableCell; import com.glodblock.github.inventory.item.IWirelessTerminal; diff --git a/src/main/java/com/glodblock/github/inventory/item/PortableFluidCellInventory.java b/src/main/java/com/glodblock/github/inventory/item/PortableFluidCellInventory.java index 47747188..15e48199 100644 --- a/src/main/java/com/glodblock/github/inventory/item/PortableFluidCellInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/PortableFluidCellInventory.java @@ -7,7 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import com.glodblock.github.common.storage.FluidCellInventory; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.ViewItems; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.storage.IMEMonitor; import appeng.api.storage.MEMonitorHandler; diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java index 3dd9a9e3..0dce2685 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessCraftingTerminalInventory.java @@ -11,7 +11,13 @@ import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.inventory.ItemBiggerAppEngInventory; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.TypeFilter; +import appeng.api.config.ViewItems; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.networking.IGridNode; import appeng.api.storage.IMEInventoryHandler; diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java index 57bd3c5a..e28512b2 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessFluidTerminalInventory.java @@ -10,7 +10,12 @@ import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.ViewItems; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.networking.IGridNode; import appeng.api.storage.IMEInventoryHandler; diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java index e8f52a59..4ee0a9ba 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessInterfaceTerminalInventory.java @@ -10,7 +10,10 @@ import net.minecraftforge.common.util.ForgeDirection; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.TerminalStyle; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.networking.IGridNode; import appeng.api.storage.IMEMonitor; diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java index 61bdf4b9..be2e3149 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalExInventory.java @@ -16,7 +16,13 @@ import com.glodblock.github.inventory.ItemBiggerAppEngInventory; import com.glodblock.github.inventory.WirelessFluidPatternTerminalPatterns; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.TypeFilter; +import appeng.api.config.ViewItems; import appeng.api.implementations.ICraftingPatternItem; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.networking.IGridNode; diff --git a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java index c3bae787..7bea99f9 100644 --- a/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java +++ b/src/main/java/com/glodblock/github/inventory/item/WirelessPatternTerminalInventory.java @@ -16,7 +16,13 @@ import com.glodblock.github.inventory.ItemBiggerAppEngInventory; import com.glodblock.github.inventory.WirelessFluidPatternTerminalPatterns; import com.glodblock.github.util.Util; -import appeng.api.config.*; +import appeng.api.config.Actionable; +import appeng.api.config.PowerMultiplier; +import appeng.api.config.Settings; +import appeng.api.config.SortDir; +import appeng.api.config.SortOrder; +import appeng.api.config.TypeFilter; +import appeng.api.config.ViewItems; import appeng.api.implementations.ICraftingPatternItem; import appeng.api.implementations.items.IAEItemPowerStorage; import appeng.api.networking.IGridNode; diff --git a/src/main/java/com/glodblock/github/loader/ChannelLoader.java b/src/main/java/com/glodblock/github/loader/ChannelLoader.java index 3c8037ee..e1d78dbf 100644 --- a/src/main/java/com/glodblock/github/loader/ChannelLoader.java +++ b/src/main/java/com/glodblock/github/loader/ChannelLoader.java @@ -5,7 +5,23 @@ import net.minecraft.network.Packet; import net.minecraft.world.World; import com.glodblock.github.FluidCraft; -import com.glodblock.github.network.*; +import com.glodblock.github.network.CPacketCraftRequest; +import com.glodblock.github.network.CPacketDumpTank; +import com.glodblock.github.network.CPacketEncodePattern; +import com.glodblock.github.network.CPacketFluidPatternTermBtns; +import com.glodblock.github.network.CPacketFluidUpdate; +import com.glodblock.github.network.CPacketInventoryAction; +import com.glodblock.github.network.CPacketLevelMaintainer; +import com.glodblock.github.network.CPacketPatternValueSet; +import com.glodblock.github.network.CPacketRenamer; +import com.glodblock.github.network.CPacketSwitchGuis; +import com.glodblock.github.network.CPacketTransferRecipe; +import com.glodblock.github.network.CPacketValueConfig; +import com.glodblock.github.network.SPacketFluidUpdate; +import com.glodblock.github.network.SPacketMEFluidInvUpdate; +import com.glodblock.github.network.SPacketMEItemInvUpdate; +import com.glodblock.github.network.SPacketSetItemAmount; +import com.glodblock.github.network.SPacketStringUpdate; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java index 2ee67630..5b6e2b99 100644 --- a/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java +++ b/src/main/java/com/glodblock/github/loader/ItemAndBlockHolder.java @@ -3,8 +3,43 @@ package com.glodblock.github.loader; import static com.glodblock.github.common.storage.FluidCellInventory.singleByteAmount; import com.glodblock.github.common.Config; -import com.glodblock.github.common.block.*; -import com.glodblock.github.common.item.*; +import com.glodblock.github.common.block.BlockCertusQuartzTank; +import com.glodblock.github.common.block.BlockFluidAutoFiller; +import com.glodblock.github.common.block.BlockFluidBuffer; +import com.glodblock.github.common.block.BlockFluidDiscretizer; +import com.glodblock.github.common.block.BlockFluidInterface; +import com.glodblock.github.common.block.BlockFluidPacketDecoder; +import com.glodblock.github.common.block.BlockFluidPatternEncoder; +import com.glodblock.github.common.block.BlockIngredientBuffer; +import com.glodblock.github.common.block.BlockLargeIngredientBuffer; +import com.glodblock.github.common.block.BlockLevelMaintainer; +import com.glodblock.github.common.block.BlockOCPatternEditor; +import com.glodblock.github.common.block.BlockWalrus; +import com.glodblock.github.common.item.ItemBasicFluidStorageCell; +import com.glodblock.github.common.item.ItemBasicFluidStoragePart; +import com.glodblock.github.common.item.ItemCreativeFluidStorageCell; +import com.glodblock.github.common.item.ItemFluidConversionMonitor; +import com.glodblock.github.common.item.ItemFluidDrop; +import com.glodblock.github.common.item.ItemFluidEncodedPattern; +import com.glodblock.github.common.item.ItemFluidExportBus; +import com.glodblock.github.common.item.ItemFluidExtremeStorageCell; +import com.glodblock.github.common.item.ItemFluidImportBus; +import com.glodblock.github.common.item.ItemFluidLevelEmitter; +import com.glodblock.github.common.item.ItemFluidPacket; +import com.glodblock.github.common.item.ItemFluidStorageHousing; +import com.glodblock.github.common.item.ItemFluidStorageMonitor; +import com.glodblock.github.common.item.ItemMultiFluidStorageCell; +import com.glodblock.github.common.item.ItemPartFluidInterface; +import com.glodblock.github.common.item.ItemPartFluidP2PInterface; +import com.glodblock.github.common.item.ItemPartFluidPatternTerminal; +import com.glodblock.github.common.item.ItemPartFluidPatternTerminalEx; +import com.glodblock.github.common.item.ItemPartFluidStorageBus; +import com.glodblock.github.common.item.ItemPartFluidTerminal; +import com.glodblock.github.common.item.ItemPortableFluidCell; +import com.glodblock.github.common.item.ItemWirelessFluidTerminal; +import com.glodblock.github.common.item.ItemWirelessInterfaceTerminal; +import com.glodblock.github.common.item.ItemWirelessPatternTerminal; +import com.glodblock.github.common.item.ItemWirelessUltraTerminal; import com.glodblock.github.common.storage.CellType; import com.glodblock.github.util.NameConst; diff --git a/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java b/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java index 02e87946..9f877529 100644 --- a/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java +++ b/src/main/java/com/glodblock/github/loader/filter/FluidFilter.java @@ -1,6 +1,6 @@ package com.glodblock.github.loader.filter; -import static appeng.api.config.TypeFilter.*; +import static appeng.api.config.TypeFilter.ALL; import net.minecraft.item.Item; diff --git a/src/main/java/com/glodblock/github/nei/NEIUtils.java b/src/main/java/com/glodblock/github/nei/NEIUtils.java index d780a9a1..0657ebfa 100644 --- a/src/main/java/com/glodblock/github/nei/NEIUtils.java +++ b/src/main/java/com/glodblock/github/nei/NEIUtils.java @@ -1,6 +1,8 @@ package com.glodblock.github.nei; -import java.util.*; +import java.util.LinkedList; +import java.util.List; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; diff --git a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java index eb7f4cbe..7779686a 100644 --- a/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java +++ b/src/main/java/com/glodblock/github/nei/NEI_FC_Config.java @@ -1,7 +1,11 @@ package com.glodblock.github.nei; import com.glodblock.github.FluidCraft; -import com.glodblock.github.client.gui.*; +import com.glodblock.github.client.gui.GuiFluidCraftingWireless; +import com.glodblock.github.client.gui.GuiFluidPatternExWireless; +import com.glodblock.github.client.gui.GuiFluidPatternTerminal; +import com.glodblock.github.client.gui.GuiFluidPatternTerminalEx; +import com.glodblock.github.client.gui.GuiFluidPatternWireless; import com.glodblock.github.nei.recipes.FluidRecipe; import com.glodblock.github.util.ModAndClassUtil; diff --git a/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java b/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java index 5e83468c..90329a1c 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java +++ b/src/main/java/com/glodblock/github/nei/recipes/DefaultExtractorLoader.java @@ -1,9 +1,23 @@ package com.glodblock.github.nei.recipes; -import com.glodblock.github.nei.recipes.extractor.*; +import com.glodblock.github.nei.recipes.extractor.AvaritiaRecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.EnderIORecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.ForestryRecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.GTPPRecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.GregTech5RecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.GregTech6RecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.IndustrialCraftRecipeExtractor; +import com.glodblock.github.nei.recipes.extractor.VanillaRecipeExtractor; import com.glodblock.github.util.ModAndClassUtil; -import forestry.factory.recipes.nei.*; +import forestry.factory.recipes.nei.NEIHandlerBottler; +import forestry.factory.recipes.nei.NEIHandlerCarpenter; +import forestry.factory.recipes.nei.NEIHandlerCentrifuge; +import forestry.factory.recipes.nei.NEIHandlerFabricator; +import forestry.factory.recipes.nei.NEIHandlerFermenter; +import forestry.factory.recipes.nei.NEIHandlerMoistener; +import forestry.factory.recipes.nei.NEIHandlerSqueezer; +import forestry.factory.recipes.nei.NEIHandlerStill; import gregapi.recipes.Recipe; import gregtech.api.util.GTPP_Recipe; import gregtech.api.util.GT_Recipe; diff --git a/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java b/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java index c2083d94..8e4f54fc 100644 --- a/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java +++ b/src/main/java/com/glodblock/github/nei/recipes/FluidRecipe.java @@ -1,6 +1,10 @@ package com.glodblock.github.nei.recipes; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; import java.util.concurrent.atomic.AtomicInteger; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java b/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java index bc29d412..0ff0601b 100644 --- a/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketFluidUpdate.java @@ -8,7 +8,14 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.item.ItemStack; -import com.glodblock.github.client.gui.*; +import com.glodblock.github.client.gui.GuiEssentiaTerminal; +import com.glodblock.github.client.gui.GuiFluidIO; +import com.glodblock.github.client.gui.GuiFluidInterface; +import com.glodblock.github.client.gui.GuiFluidLevelEmitter; +import com.glodblock.github.client.gui.GuiFluidStorageBus; +import com.glodblock.github.client.gui.GuiFluidTerminal; +import com.glodblock.github.client.gui.GuiIngredientBuffer; +import com.glodblock.github.client.gui.GuiLargeIngredientBuffer; import com.glodblock.github.util.Util; import appeng.api.storage.data.IAEFluidStack; diff --git a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java index 9df587ab..f61b2deb 100644 --- a/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java +++ b/src/main/java/com/glodblock/github/network/SPacketMEUpdateBuffer.java @@ -1,6 +1,10 @@ package com.glodblock.github.network; -import java.util.*; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; diff --git a/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java b/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java index 2348613f..30698892 100644 --- a/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java +++ b/src/main/java/com/glodblock/github/network/SPacketStringUpdate.java @@ -3,7 +3,7 @@ package com.glodblock.github.network; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; -import com.glodblock.github.client.gui.*; +import com.glodblock.github.client.gui.GuiRenamer; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/glodblock/github/util/Util.java b/src/main/java/com/glodblock/github/util/Util.java index ab443941..4b59962d 100644 --- a/src/main/java/com/glodblock/github/util/Util.java +++ b/src/main/java/com/glodblock/github/util/Util.java @@ -14,7 +14,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.*; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTankInfo; +import net.minecraftforge.fluids.IFluidContainerItem; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.MutablePair;