From f803769490afe6504a1b1d216b360e8620abe9cf Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Thu, 27 Apr 2023 21:35:27 +0200 Subject: [PATCH] Dep (#302) * update dep files * update bs * sa --- build.gradle | 140 +++++------------- dependencies.gradle | 24 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- src/main/java/appeng/api/config/Upgrades.java | 4 +- .../implementations/items/IBiometricCard.java | 4 +- .../networking/crafting/ICraftingGrid.java | 10 +- .../crafting/ICraftingRequester.java | 4 +- .../appeng/api/storage/MEMonitorHandler.java | 4 +- src/main/java/appeng/block/AEBaseBlock.java | 5 +- .../java/appeng/block/AEBaseStairBlock.java | 4 +- .../java/appeng/block/AEBaseTileBlock.java | 6 +- .../block/networking/BlockCableBus.java | 4 +- .../java/appeng/client/gui/AEBaseGui.java | 6 +- .../gui/implementations/GuiCraftConfirm.java | 4 +- .../gui/implementations/GuiCraftingCPU.java | 4 +- .../implementations/GuiInterfaceTerminal.java | 4 +- src/main/java/appeng/client/me/ItemRepo.java | 6 +- .../appeng/client/render/BusRenderHelper.java | 7 +- .../render/items/ToolBiometricCardRender.java | 4 +- .../implementations/ContainerCPUTable.java | 4 +- .../ContainerInterfaceTerminal.java | 6 +- src/main/java/appeng/core/AppEng.java | 5 +- .../java/appeng/core/CreativeTabFacade.java | 4 +- src/main/java/appeng/core/RecipeLoader.java | 4 +- src/main/java/appeng/core/Registration.java | 5 +- src/main/java/appeng/core/api/ApiPart.java | 4 +- .../core/api/definitions/ApiBlocks.java | 4 +- .../core/features/AEBlockFeatureHandler.java | 4 +- .../features/AECableBusFeatureHandler.java | 4 +- .../features/AETileBlockFeatureHandler.java | 4 +- .../appeng/core/features/BlockDefinition.java | 6 +- .../core/features/DamagedItemDefinition.java | 4 +- .../appeng/core/features/ItemDefinition.java | 6 +- .../core/features/ItemFeatureHandler.java | 4 +- .../core/features/MaterialStackSrc.java | 4 +- .../features/SlabBlockFeatureHandler.java | 4 +- .../features/StairBlockFeatureHandler.java | 4 +- .../appeng/core/features/TileDefinition.java | 6 +- .../features/WrappedDamageItemDefinition.java | 4 +- .../features/registries/PlayerRegistry.java | 4 +- .../registries/entries/InscriberRecipe.java | 4 +- src/main/java/appeng/core/sync/GuiBridge.java | 5 +- .../appeng/core/worlddata/CompassData.java | 4 +- .../appeng/core/worlddata/DimensionData.java | 6 +- .../appeng/core/worlddata/PlayerData.java | 4 +- .../java/appeng/core/worlddata/SpawnData.java | 4 +- .../appeng/core/worlddata/StorageData.java | 4 +- .../java/appeng/core/worlddata/WorldData.java | 6 +- .../java/appeng/crafting/CraftingJob.java | 4 +- .../appeng/crafting/CraftingTreeNode.java | 4 +- .../crafting/v2/CraftingCalculations.java | 8 +- .../appeng/crafting/v2/CraftingContext.java | 10 +- .../crafting/v2/CraftingTreeSerializer.java | 5 +- .../v2/resolvers/CraftableItemResolver.java | 4 +- .../java/appeng/helpers/DualityInterface.java | 4 +- .../appeng/helpers/MultiCraftingTracker.java | 4 +- src/main/java/appeng/hooks/AETrading.java | 4 +- src/main/java/appeng/hooks/TickHandler.java | 9 +- .../modules/BuildCraftBuilder.java | 4 +- .../java/appeng/integration/modules/DSU.java | 2 +- .../java/appeng/integration/modules/FMP.java | 4 +- .../modules/ImmibisMicroblocks.java | 9 +- .../appeng/integration/modules/Jabba.java | 3 +- .../integration/modules/OpenComputers.java | 2 +- .../java/appeng/integration/modules/RC.java | 5 +- .../appeng/integration/modules/Waila.java | 4 +- .../modules/helpers/JabbaBarrel.java | 3 +- .../MinefactoryReloadedDeepStorageUnit.java | 2 +- .../modules/waila/BaseWailaDataProvider.java | 8 +- .../modules/waila/PartWailaDataProvider.java | 13 +- .../modules/waila/TileWailaDataProvider.java | 11 +- .../waila/part/BasePartWailaDataProvider.java | 5 +- .../waila/part/ChannelWailaDataProvider.java | 5 +- .../waila/part/IPartWailaDataProvider.java | 5 +- .../waila/part/P2PStateWailaDataProvider.java | 9 +- .../modules/waila/part/PartAccessor.java | 4 +- .../part/PartStackWailaDataProvider.java | 3 +- .../part/PowerStateWailaDataProvider.java | 4 +- .../part/StorageMonitorWailaDataProvider.java | 4 +- .../waila/tile/ChargerWailaDataProvider.java | 5 +- .../CraftingMonitorWailaDataProvider.java | 5 +- .../tile/PowerStateWailaDataProvider.java | 5 +- .../tile/PowerStorageWailaDataProvider.java | 7 +- src/main/java/appeng/items/AEBaseItem.java | 3 +- .../items/materials/ItemMultiMaterial.java | 6 +- .../appeng/items/parts/ItemMultiPart.java | 5 +- .../storage/ItemAdvancedStorageCell.java | 4 +- .../items/storage/ItemBasicStorageCell.java | 5 +- .../items/storage/ItemExtremeStorageCell.java | 4 +- .../items/storage/ItemSpatialStorageCell.java | 4 +- .../appeng/items/tools/ToolBiometricCard.java | 4 +- .../appeng/items/tools/ToolNetworkTool.java | 4 +- .../items/tools/powered/ToolChargedStaff.java | 4 +- .../tools/powered/ToolColorApplicator.java | 5 +- .../tools/powered/ToolEntropyManipulator.java | 4 +- .../items/tools/powered/ToolMassCannon.java | 5 +- .../items/tools/powered/ToolPortableCell.java | 5 +- .../tools/powered/ToolWirelessTerminal.java | 5 +- .../powered/powersink/AERootPoweredItem.java | 4 +- .../items/tools/powered/powersink/IC2.java | 5 +- .../tools/powered/powersink/RedstoneFlux.java | 4 +- .../items/tools/quartz/ToolQuartzAxe.java | 4 +- .../tools/quartz/ToolQuartzCuttingKnife.java | 4 +- .../items/tools/quartz/ToolQuartzHoe.java | 4 +- .../items/tools/quartz/ToolQuartzPickaxe.java | 4 +- .../items/tools/quartz/ToolQuartzSpade.java | 4 +- .../items/tools/quartz/ToolQuartzSword.java | 4 +- .../items/tools/quartz/ToolQuartzWrench.java | 4 +- .../appeng/me/cache/CraftingGridCache.java | 4 +- .../java/appeng/me/cache/EnergyGridCache.java | 6 +- .../appeng/me/cache/GridStorageCache.java | 6 +- .../java/appeng/me/cache/NetworkMonitor.java | 6 +- src/main/java/appeng/me/cache/P2PCache.java | 6 +- .../java/appeng/me/cache/SecurityCache.java | 6 +- .../implementations/CraftingCPUCluster.java | 6 +- .../appeng/me/helpers/AENetworkProxy.java | 4 +- .../me/helpers/GenericInterestManager.java | 4 +- .../appeng/me/storage/SecurityInventory.java | 4 +- src/main/java/appeng/parts/AEBasePart.java | 5 +- src/main/java/appeng/parts/PartPlacement.java | 5 +- .../automation/PartAnnihilationPlane.java | 5 +- .../parts/automation/PartExportBus.java | 7 +- .../appeng/parts/layers/LayerPressure.java | 4 +- .../parts/layers/LayerSidedEnvironment.java | 5 +- .../java/appeng/parts/misc/PartInterface.java | 5 +- .../appeng/parts/p2p/PartP2PInterface.java | 5 +- .../parts/p2p/PartP2POpenComputers.java | 9 +- .../appeng/parts/p2p/PartP2PPressure.java | 8 +- .../java/appeng/parts/p2p/PartP2PTunnel.java | 5 +- .../java/appeng/recipes/GroupIngredient.java | 4 +- src/main/java/appeng/recipes/Ingredient.java | 4 +- .../java/appeng/recipes/IngredientSet.java | 4 +- .../java/appeng/recipes/RecipeHandler.java | 9 +- .../recipes/game/DisassembleRecipe.java | 4 +- .../appeng/recipes/game/FacadeRecipe.java | 4 +- .../appeng/recipes/loader/ConfigLoader.java | 4 +- .../java/appeng/recipes/loader/JarLoader.java | 4 +- .../appeng/server/subcommands/Supporters.java | 4 +- .../server/subcommands/ToggleFullAccess.java | 4 +- .../java/appeng/services/CompassService.java | 4 +- .../services/compass/CompassRegion.java | 4 +- .../appeng/services/export/ExportProcess.java | 3 +- .../export/MinecraftItemCSVExporter.java | 3 +- .../services/export/ModListChecker.java | 1 + .../version/VersionCheckerConfig.java | 4 +- .../services/version/VersionParser.java | 4 +- .../version/github/ReleaseFetcher.java | 6 +- .../java/appeng/tile/misc/TileInscriber.java | 4 +- .../java/appeng/tile/misc/TileInterface.java | 4 +- src/main/java/appeng/tile/misc/TilePaint.java | 5 +- .../appeng/tile/qnb/TileQuantumBridge.java | 4 +- .../java/appeng/transformer/AppEngCore.java | 3 +- .../appeng/transformer/asm/ASMTweaker.java | 4 +- .../java/appeng/util/ClassInstantiation.java | 4 +- src/main/java/appeng/util/Platform.java | 5 +- src/main/java/appeng/util/inv/IMEAdaptor.java | 4 +- src/main/java/appeng/util/item/OreHelper.java | 4 +- .../appeng/util/item/OreListMultiMap.java | 6 +- 158 files changed, 396 insertions(+), 512 deletions(-) diff --git a/build.gradle b/build.gradle index 055dcee43..17e7501a2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1680120787 +//version: 1682616243 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,29 +6,25 @@ */ -import com.diffplug.blowdryer.Blowdryer -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask +import com.gtnewhorizons.retrofuturagradle.util.Distribution import com.matthewprenger.cursegradle.CurseArtifact import com.matthewprenger.cursegradle.CurseRelation import com.modrinth.minotaur.dependencies.ModDependency import com.modrinth.minotaur.dependencies.VersionDependency -import cpw.mods.fml.relauncher.Side -import org.gradle.api.tasks.options.Option; import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory import org.gradle.internal.xml.XmlTransformer -import org.jetbrains.gradle.ext.* +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import javax.inject.Inject import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream -import javax.inject.Inject buildscript { repositories { @@ -66,21 +62,22 @@ plugins { id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version - id 'de.undercouch.download' version '5.3.0' + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'com.palantir.git-version' version '3.0.0' apply false + id 'de.undercouch.download' version '5.4.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle - id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.2.4' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' } boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -132,7 +129,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new // this is meant to be set using the user wide property file. by default we do nothing. propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea" -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts if (!disableSpotless) { apply plugin: 'com.diffplug.spotless' apply from: Blowdryer.file('spotless.gradle') @@ -201,6 +198,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -399,7 +404,7 @@ minecraft { username = developmentEnvironmentUserName.toString() - lwjgl3Version = "3.3.2-SNAPSHOT" + lwjgl3Version = "3.3.2" // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") @@ -713,13 +718,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.3.3' + def lwjgl3ifyVersion = '1.3.5' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.4') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -793,7 +798,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } @Inject - public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) { + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { super(side, gradle) this.lwjglVersion = 3 @@ -802,7 +807,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) this.classpath(project.java17PatchDependenciesCfg) - if (side == Side.CLIENT) { + if (side == Distribution.CLIENT) { this.classpath(project.minecraftTasks.lwjgl3Configuration) } // Use a raw provider instead of map to not create a dependency on the task @@ -814,7 +819,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } } -def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient") +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") runClient17Task.configure { setup(project) group = "Modded Minecraft" @@ -825,7 +830,7 @@ runClient17Task.configure { userUUID = minecraft.userUUID } -def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer") +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") runServer17Task.configure { setup(project) group = "Modded Minecraft" @@ -866,11 +871,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = relocateShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -886,7 +886,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -1219,7 +1220,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.2" +def buildscriptGradleVersion = "8.1.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1388,7 +1389,7 @@ static int replaceParams(File file, Map params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1430,11 +1431,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1442,34 +1439,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1477,50 +1447,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) + return dependencies.rfg.deobf(files(obfFile)) } - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() -} - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/dependencies.gradle b/dependencies.gradle index 40f7555a5..1edb771cf 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,16 +1,16 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.39-GTNH:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev') implementation('curse.maven:cofh-core-69162:2388751') - implementation('com.github.GTNewHorizons:BuildCraft:7.1.28:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.2.8:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.02:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Jabba:1.2.21:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.5.15:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.7.5.32-GTNH:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:waila:1.5.21:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Railcraft:9.13.10:api') {transitive = false} + implementation('com.github.GTNewHorizons:BuildCraft:7.1.33:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.3.3:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.82:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Jabba:1.2.22:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.5.16:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.2-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:waila:1.5.24:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive = false} compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') @@ -24,10 +24,10 @@ dependencies { functionalTestImplementation('org.junit.platform:junit-platform-engine') functionalTestImplementation('org.junit.platform:junit-platform-launcher') functionalTestImplementation('org.junit.platform:junit-platform-reporting') - functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.02:dev') { + functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.42.82:dev') { exclude module: "Applied-Energistics-2-Unofficial" } - functionalTestCompileOnly('com.github.GTNewHorizons:ForestryMC:4.5.8:dev') {transitive = false} // for gt5 api usage - functionalTestCompileOnly('com.github.GTNewHorizons:EnderIO:2.3.1.60:dev') {transitive = false} // for gt5 api usage + functionalTestCompileOnly('com.github.GTNewHorizons:ForestryMC:4.6.6:dev') {transitive = false} // for gt5 api usage + functionalTestCompileOnly('com.github.GTNewHorizons:EnderIO:2.4.11:dev') {transitive = false} // for gt5 api usage functionalTestCompileOnly('com.github.GTNewHorizons:ProjectRed:4.7.9-GTNH:dev') {transitive = false} // for gt5 api usage } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bdc9a83b1..37aef8d3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/appeng/api/config/Upgrades.java b/src/main/java/appeng/api/config/Upgrades.java index 586f3bdf3..54278c797 100644 --- a/src/main/java/appeng/api/config/Upgrades.java +++ b/src/main/java/appeng/api/config/Upgrades.java @@ -18,11 +18,11 @@ import java.util.Map; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.definitions.IItemDefinition; import appeng.api.util.AEItemDefinition; -import com.google.common.base.Optional; - public enum Upgrades { /** diff --git a/src/main/java/appeng/api/implementations/items/IBiometricCard.java b/src/main/java/appeng/api/implementations/items/IBiometricCard.java index 173379edf..f8a900948 100644 --- a/src/main/java/appeng/api/implementations/items/IBiometricCard.java +++ b/src/main/java/appeng/api/implementations/items/IBiometricCard.java @@ -17,12 +17,12 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; +import com.mojang.authlib.GameProfile; + import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; import appeng.api.networking.security.ISecurityRegistry; -import com.mojang.authlib.GameProfile; - public interface IBiometricCard { /** diff --git a/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java b/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java index faf61f959..0e8ff08de 100644 --- a/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java +++ b/src/main/java/appeng/api/networking/crafting/ICraftingGrid.java @@ -17,16 +17,16 @@ import java.util.concurrent.Future; import net.minecraft.world.World; -import appeng.api.networking.IGrid; -import appeng.api.networking.IGridCache; -import appeng.api.networking.security.BaseActionSource; -import appeng.api.storage.data.IAEItemStack; - import com.google.common.collect.ImmutableCollection; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; +import appeng.api.networking.IGrid; +import appeng.api.networking.IGridCache; +import appeng.api.networking.security.BaseActionSource; +import appeng.api.storage.data.IAEItemStack; + public interface ICraftingGrid extends IGridCache { /** diff --git a/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java b/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java index f95ce6176..d50892891 100644 --- a/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java +++ b/src/main/java/appeng/api/networking/crafting/ICraftingRequester.java @@ -13,12 +13,12 @@ package appeng.api.networking.crafting; +import com.google.common.collect.ImmutableSet; + import appeng.api.config.Actionable; import appeng.api.networking.security.IActionHost; import appeng.api.storage.data.IAEItemStack; -import com.google.common.collect.ImmutableSet; - public interface ICraftingRequester extends IActionHost { /** diff --git a/src/main/java/appeng/api/storage/MEMonitorHandler.java b/src/main/java/appeng/api/storage/MEMonitorHandler.java index 73bed1a81..b0049a389 100644 --- a/src/main/java/appeng/api/storage/MEMonitorHandler.java +++ b/src/main/java/appeng/api/storage/MEMonitorHandler.java @@ -17,14 +17,14 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map.Entry; +import com.google.common.collect.ImmutableList; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; -import com.google.common.collect.ImmutableList; - /** * Common implementation of a simple class that monitors injection/extraction of a inventory to send events to a list of * listeners. diff --git a/src/main/java/appeng/block/AEBaseBlock.java b/src/main/java/appeng/block/AEBaseBlock.java index 99d65329b..361a4760b 100644 --- a/src/main/java/appeng/block/AEBaseBlock.java +++ b/src/main/java/appeng/block/AEBaseBlock.java @@ -29,6 +29,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.base.Optional; + import appeng.api.util.IOrientable; import appeng.api.util.IOrientableBlock; import appeng.client.render.BaseBlockRender; @@ -42,9 +44,6 @@ import appeng.helpers.ICustomCollision; import appeng.tile.AEBaseTile; import appeng.util.LookDirection; import appeng.util.Platform; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/block/AEBaseStairBlock.java b/src/main/java/appeng/block/AEBaseStairBlock.java index 5287b9be5..407ea0758 100644 --- a/src/main/java/appeng/block/AEBaseStairBlock.java +++ b/src/main/java/appeng/block/AEBaseStairBlock.java @@ -15,13 +15,13 @@ import java.util.EnumSet; import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; +import com.google.common.base.Optional; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; import appeng.core.features.StairBlockFeatureHandler; -import com.google.common.base.Optional; - public abstract class AEBaseStairBlock extends BlockStairs implements IAEFeature { private final IFeatureHandler features; diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 7c2ef9902..5ba79be8a 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -34,6 +34,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.world.BlockEvent; +import com.google.common.base.Optional; +import com.google.common.collect.Lists; + import appeng.api.implementations.items.IMemoryCard; import appeng.api.implementations.items.MemoryCardMessages; import appeng.api.implementations.tiles.IColorableTile; @@ -51,9 +54,6 @@ import appeng.tile.networking.TileCableBus; import appeng.tile.storage.TileSkyChest; import appeng.util.Platform; import appeng.util.SettingsFrom; - -import com.google.common.base.Optional; -import com.google.common.collect.Lists; import cpw.mods.fml.relauncher.ReflectionHelper; public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature, ITileEntityProvider { diff --git a/src/main/java/appeng/block/networking/BlockCableBus.java b/src/main/java/appeng/block/networking/BlockCableBus.java index d875c8e44..f551e483d 100644 --- a/src/main/java/appeng/block/networking/BlockCableBus.java +++ b/src/main/java/appeng/block/networking/BlockCableBus.java @@ -32,8 +32,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection; -import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.parts.PartItemStack; @@ -64,6 +62,8 @@ import appeng.util.Platform; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection; +import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; @Interface( iface = "powercrystals.minefactoryreloaded.api.rednet.connectivity.IRedNetConnection", diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java index 21fd48564..00cc4229b 100644 --- a/src/main/java/appeng/client/gui/AEBaseGui.java +++ b/src/main/java/appeng/client/gui/AEBaseGui.java @@ -34,6 +34,9 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import com.google.common.base.Joiner; +import com.google.common.base.Stopwatch; + import appeng.api.storage.data.IAEItemStack; import appeng.client.gui.widgets.GuiScrollbar; import appeng.client.gui.widgets.ITooltip; @@ -57,9 +60,6 @@ import appeng.integration.IntegrationType; import appeng.integration.abstraction.INEI; import appeng.util.Platform; import appeng.util.item.AEItemStack; - -import com.google.common.base.Joiner; -import com.google.common.base.Stopwatch; import cpw.mods.fml.common.ObfuscationReflectionHelper; public abstract class AEBaseGui extends GuiContainer { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java index 19bfef4ea..1e2cbe7c6 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftConfirm.java @@ -20,6 +20,8 @@ import net.minecraft.item.ItemStack; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import com.google.common.base.Joiner; + import appeng.api.AEApi; import appeng.api.storage.ITerminalHost; import appeng.api.storage.data.IAEItemStack; @@ -45,8 +47,6 @@ import appeng.parts.reporting.PartTerminal; import appeng.util.Platform; import appeng.util.ReadableNumberConverter; -import com.google.common.base.Joiner; - public class GuiCraftConfirm extends AEBaseGui implements ICraftingCPUTableHolder { public enum DisplayMode { diff --git a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java index 068f866d2..692154b8f 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java +++ b/src/main/java/appeng/client/gui/implementations/GuiCraftingCPU.java @@ -27,6 +27,8 @@ import net.minecraft.util.ChatComponentTranslation; import org.apache.commons.lang3.time.DurationFormatUtils; import org.lwjgl.opengl.GL11; +import com.google.common.base.Joiner; + import appeng.api.AEApi; import appeng.api.config.SortDir; import appeng.api.config.SortOrder; @@ -53,8 +55,6 @@ import appeng.core.sync.packets.PacketValueConfig; import appeng.util.Platform; import appeng.util.ReadableNumberConverter; -import com.google.common.base.Joiner; - public class GuiCraftingCPU extends AEBaseGui implements ISortSource { private static final int GUI_HEIGHT = 184; diff --git a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java index 78cc9a974..317662094 100644 --- a/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java +++ b/src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java @@ -23,6 +23,8 @@ import net.minecraft.world.World; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; +import com.google.common.collect.HashMultimap; + import appeng.api.AEApi; import appeng.api.config.ActionItems; import appeng.api.config.Settings; @@ -51,8 +53,6 @@ import appeng.integration.IntegrationType; import appeng.parts.reporting.PartInterfaceTerminal; import appeng.util.Platform; -import com.google.common.collect.HashMultimap; - public class GuiInterfaceTerminal extends AEBaseGui implements IDropToFillTextField { private static final int MAGIC_HEIGHT_NUMBER = 52 + 99; diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 6b2cba86f..4bf8271d9 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -22,6 +22,9 @@ import javax.annotation.Nonnull; import net.minecraft.item.ItemStack; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; + import appeng.api.AEApi; import appeng.api.config.*; import appeng.api.storage.data.IAEItemStack; @@ -36,9 +39,6 @@ import appeng.util.Platform; import appeng.util.item.OreHelper; import appeng.util.item.OreReference; import appeng.util.prioitylist.IPartitionList; - -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; import cpw.mods.fml.relauncher.ReflectionHelper; public class ItemRepo { diff --git a/src/main/java/appeng/client/render/BusRenderHelper.java b/src/main/java/appeng/client/render/BusRenderHelper.java index 337e9c0d4..b68699e01 100644 --- a/src/main/java/appeng/client/render/BusRenderHelper.java +++ b/src/main/java/appeng/client/render/BusRenderHelper.java @@ -20,6 +20,9 @@ import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.base.Function; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinition; import appeng.api.parts.IBoxProvider; @@ -31,10 +34,6 @@ import appeng.block.networking.BlockCableBus; import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.tile.AEBaseTile; - -import com.google.common.base.Function; -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java index b22f9dd22..98746ad58 100644 --- a/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java +++ b/src/main/java/appeng/client/render/items/ToolBiometricCardRender.java @@ -18,12 +18,12 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import com.mojang.authlib.GameProfile; + import appeng.api.implementations.items.IBiometricCard; import appeng.api.util.AEColor; import appeng.client.texture.ExtraItemTextures; -import com.mojang.authlib.GameProfile; - public class ToolBiometricCardRender implements IItemRenderer { @Override diff --git a/src/main/java/appeng/container/implementations/ContainerCPUTable.java b/src/main/java/appeng/container/implementations/ContainerCPUTable.java index f254e0b4f..6a9371753 100644 --- a/src/main/java/appeng/container/implementations/ContainerCPUTable.java +++ b/src/main/java/appeng/container/implementations/ContainerCPUTable.java @@ -7,6 +7,8 @@ import java.util.function.Predicate; import net.minecraft.entity.player.EntityPlayerMP; +import com.google.common.collect.ImmutableSet; + import appeng.api.networking.IGrid; import appeng.api.networking.crafting.ICraftingCPU; import appeng.api.networking.crafting.ICraftingGrid; @@ -18,8 +20,6 @@ import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketCraftingCPUsUpdate; import appeng.util.Platform; -import com.google.common.collect.ImmutableSet; - public class ContainerCPUTable implements ICraftingCPUSelectorContainer { private final AEBaseContainer parent; diff --git a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java index 103d9d9c1..f3d1089c3 100644 --- a/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java +++ b/src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java @@ -22,6 +22,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import appeng.api.config.Settings; import appeng.api.config.Upgrades; import appeng.api.config.YesNo; @@ -47,9 +50,6 @@ import appeng.util.inv.AdaptorPlayerHand; import appeng.util.inv.ItemSlot; import appeng.util.inv.WrapperInvSlot; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - public final class ContainerInterfaceTerminal extends AEBaseContainer { /** diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 06bc7aa37..2b379d584 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -17,6 +17,8 @@ import javax.annotation.Nonnull; import net.minecraftforge.common.config.Configuration; +import com.google.common.base.Stopwatch; + import appeng.core.crash.CrashInfo; import appeng.core.crash.IntegrationCrashEnhancement; import appeng.core.crash.ModCrashEnhancement; @@ -33,9 +35,6 @@ import appeng.services.export.ExportConfig; import appeng.services.export.ExportProcess; import appeng.services.export.ForgeExportConfig; import appeng.util.Platform; - -import com.google.common.base.Stopwatch; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; diff --git a/src/main/java/appeng/core/CreativeTabFacade.java b/src/main/java/appeng/core/CreativeTabFacade.java index bfe39f38a..3f4f7f787 100644 --- a/src/main/java/appeng/core/CreativeTabFacade.java +++ b/src/main/java/appeng/core/CreativeTabFacade.java @@ -15,11 +15,11 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.items.parts.ItemFacade; -import com.google.common.base.Optional; - public final class CreativeTabFacade extends CreativeTabs { public static CreativeTabFacade instance = null; diff --git a/src/main/java/appeng/core/RecipeLoader.java b/src/main/java/appeng/core/RecipeLoader.java index 60a285bc2..3cf288084 100644 --- a/src/main/java/appeng/core/RecipeLoader.java +++ b/src/main/java/appeng/core/RecipeLoader.java @@ -18,14 +18,14 @@ import javax.annotation.Nonnull; import org.apache.commons.io.FileUtils; +import com.google.common.base.Preconditions; + import appeng.api.recipes.IRecipeHandler; import appeng.recipes.CustomRecipeConfig; import appeng.recipes.loader.ConfigLoader; import appeng.recipes.loader.JarLoader; import appeng.recipes.loader.RecipeResourceCopier; -import com.google.common.base.Preconditions; - /** * handles the decision if recipes should be loaded from jar, loaded from file system or force copied from jar * diff --git a/src/main/java/appeng/core/Registration.java b/src/main/java/appeng/core/Registration.java index 8159a9a85..ff0c6a5ba 100644 --- a/src/main/java/appeng/core/Registration.java +++ b/src/main/java/appeng/core/Registration.java @@ -25,6 +25,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; +import com.google.common.base.Preconditions; + import appeng.api.AEApi; import appeng.api.IAppEngApi; import appeng.api.config.Upgrades; @@ -76,9 +78,6 @@ import appeng.tile.AEBaseTile; import appeng.util.Platform; import appeng.worldgen.MeteoriteWorldGen; import appeng.worldgen.QuartzWorldGen; - -import com.google.common.base.Preconditions; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; diff --git a/src/main/java/appeng/core/api/ApiPart.java b/src/main/java/appeng/core/api/ApiPart.java index 70ffc6524..2dbe5c76b 100644 --- a/src/main/java/appeng/core/api/ApiPart.java +++ b/src/main/java/appeng/core/api/ApiPart.java @@ -31,6 +31,8 @@ import org.objectweb.asm.tree.ClassNode; import org.objectweb.asm.tree.MethodInsnNode; import org.objectweb.asm.tree.MethodNode; +import com.google.common.base.Joiner; + import appeng.api.parts.CableRenderMode; import appeng.api.parts.IPartHelper; import appeng.api.parts.IPartItem; @@ -45,8 +47,6 @@ import appeng.parts.PartPlacement; import appeng.tile.networking.TileCableBus; import appeng.util.Platform; -import com.google.common.base.Joiner; - public class ApiPart implements IPartHelper { private final Map tileImplementations = new HashMap(); diff --git a/src/main/java/appeng/core/api/definitions/ApiBlocks.java b/src/main/java/appeng/core/api/definitions/ApiBlocks.java index e07ec7b5a..62c776efd 100644 --- a/src/main/java/appeng/core/api/definitions/ApiBlocks.java +++ b/src/main/java/appeng/core/api/definitions/ApiBlocks.java @@ -13,6 +13,8 @@ package appeng.core.api.definitions; import java.util.EnumSet; import java.util.Set; +import com.google.common.collect.ImmutableSet; + import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; import appeng.api.definitions.ITileDefinition; @@ -41,8 +43,6 @@ import appeng.debug.BlockCubeGenerator; import appeng.debug.BlockItemGen; import appeng.debug.BlockPhantomNode; -import com.google.common.collect.ImmutableSet; - /** * Internal implementation for the API blocks */ diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index 5dd5cbc47..b371ad4a3 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -12,11 +12,11 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; import appeng.core.CreativeTab; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; public final class AEBlockFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index df343d192..4e4fa624a 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -14,14 +14,14 @@ import java.util.EnumSet; import net.minecraft.tileentity.TileEntity; +import com.google.common.base.Optional; + import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseTileBlock; import appeng.block.networking.BlockCableBus; import appeng.core.CommonHelper; import appeng.core.CreativeTab; import appeng.util.Platform; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; public final class AECableBusFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java index f94391806..755dad0c0 100644 --- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java @@ -12,14 +12,14 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseTileBlock; import appeng.core.CommonHelper; import appeng.core.CreativeTab; import appeng.tile.AEBaseTile; import appeng.util.Platform; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; public final class AETileBlockFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/BlockDefinition.java b/src/main/java/appeng/core/features/BlockDefinition.java index db044488d..9cb9eba8a 100644 --- a/src/main/java/appeng/core/features/BlockDefinition.java +++ b/src/main/java/appeng/core/features/BlockDefinition.java @@ -18,14 +18,14 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import appeng.api.definitions.IBlockDefinition; -import appeng.block.AEBaseBlock; - import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.collect.ObjectArrays; +import appeng.api.definitions.IBlockDefinition; +import appeng.block.AEBaseBlock; + public class BlockDefinition extends ItemDefinition implements IBlockDefinition { private static final ItemBlockTransformer ITEMBLOCK_TRANSFORMER = new ItemBlockTransformer(); diff --git a/src/main/java/appeng/core/features/DamagedItemDefinition.java b/src/main/java/appeng/core/features/DamagedItemDefinition.java index 34e83ec3a..b5d6d51ff 100644 --- a/src/main/java/appeng/core/features/DamagedItemDefinition.java +++ b/src/main/java/appeng/core/features/DamagedItemDefinition.java @@ -16,12 +16,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import appeng.api.definitions.IItemDefinition; - import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import appeng.api.definitions.IItemDefinition; + public final class DamagedItemDefinition implements IItemDefinition { private static final ItemTransformer ITEM_TRANSFORMER = new ItemTransformer(); diff --git a/src/main/java/appeng/core/features/ItemDefinition.java b/src/main/java/appeng/core/features/ItemDefinition.java index 555ade901..96ded1518 100644 --- a/src/main/java/appeng/core/features/ItemDefinition.java +++ b/src/main/java/appeng/core/features/ItemDefinition.java @@ -14,13 +14,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; -import appeng.api.definitions.IItemDefinition; -import appeng.util.Platform; - import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import appeng.api.definitions.IItemDefinition; +import appeng.util.Platform; + public class ItemDefinition implements IItemDefinition { private final Optional item; diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index fe5c51fff..be1c9d7a2 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -14,12 +14,12 @@ import java.util.EnumSet; import net.minecraft.item.Item; +import com.google.common.base.Optional; + import appeng.api.definitions.IItemDefinition; import appeng.core.CreativeTab; import appeng.core.CreativeTabFacade; import appeng.items.parts.ItemFacade; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; public final class ItemFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/MaterialStackSrc.java b/src/main/java/appeng/core/features/MaterialStackSrc.java index e00fe16a4..afd5219bf 100644 --- a/src/main/java/appeng/core/features/MaterialStackSrc.java +++ b/src/main/java/appeng/core/features/MaterialStackSrc.java @@ -13,10 +13,10 @@ package appeng.core.features; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import appeng.items.materials.MaterialType; - import com.google.common.base.Preconditions; +import appeng.items.materials.MaterialType; + public class MaterialStackSrc implements IStackSrc { private final MaterialType src; diff --git a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java index f5d5abf06..0cceb383e 100644 --- a/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/SlabBlockFeatureHandler.java @@ -12,12 +12,12 @@ package appeng.core.features; import java.util.EnumSet; +import com.google.common.base.Optional; + import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseItemBlockSlab; import appeng.block.AEBaseSlabBlock; import appeng.core.CreativeTab; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; public class SlabBlockFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java index 6b2c6ba36..4e829d936 100644 --- a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java @@ -14,10 +14,10 @@ import java.util.EnumSet; import net.minecraft.block.BlockStairs; +import com.google.common.base.Optional; + import appeng.api.definitions.IBlockDefinition; import appeng.core.CreativeTab; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.GameRegistry; public class StairBlockFeatureHandler implements IFeatureHandler { diff --git a/src/main/java/appeng/core/features/TileDefinition.java b/src/main/java/appeng/core/features/TileDefinition.java index 90ccbc87a..4f0d222e3 100644 --- a/src/main/java/appeng/core/features/TileDefinition.java +++ b/src/main/java/appeng/core/features/TileDefinition.java @@ -12,13 +12,13 @@ package appeng.core.features; import net.minecraft.tileentity.TileEntity; -import appeng.api.definitions.ITileDefinition; -import appeng.block.AEBaseTileBlock; - import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import appeng.api.definitions.ITileDefinition; +import appeng.block.AEBaseTileBlock; + public final class TileDefinition extends BlockDefinition implements ITileDefinition { private static final TileEntityTransformer TILEENTITY_TRANSFORMER = new TileEntityTransformer(); diff --git a/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java b/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java index cd14c533c..099fe9271 100644 --- a/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java +++ b/src/main/java/appeng/core/features/WrappedDamageItemDefinition.java @@ -17,12 +17,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; -import appeng.api.definitions.ITileDefinition; - import com.google.common.base.Function; import com.google.common.base.Optional; import com.google.common.base.Preconditions; +import appeng.api.definitions.ITileDefinition; + public final class WrappedDamageItemDefinition implements ITileDefinition { private final ITileDefinition definition; diff --git a/src/main/java/appeng/core/features/registries/PlayerRegistry.java b/src/main/java/appeng/core/features/registries/PlayerRegistry.java index 298e3897e..514b940e3 100644 --- a/src/main/java/appeng/core/features/registries/PlayerRegistry.java +++ b/src/main/java/appeng/core/features/registries/PlayerRegistry.java @@ -14,11 +14,11 @@ import javax.annotation.Nullable; import net.minecraft.entity.player.EntityPlayer; +import com.mojang.authlib.GameProfile; + import appeng.api.features.IPlayerRegistry; import appeng.core.worlddata.WorldData; -import com.mojang.authlib.GameProfile; - public class PlayerRegistry implements IPlayerRegistry { @Override diff --git a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java index f93776ef6..570926993 100644 --- a/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java +++ b/src/main/java/appeng/core/features/registries/entries/InscriberRecipe.java @@ -9,11 +9,11 @@ import javax.annotation.Nullable; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.features.IInscriberRecipe; import appeng.api.features.InscriberProcessType; -import com.google.common.base.Optional; - /** * Basic inscriber recipe * diff --git a/src/main/java/appeng/core/sync/GuiBridge.java b/src/main/java/appeng/core/sync/GuiBridge.java index 6f3baedea..8c736f9e2 100644 --- a/src/main/java/appeng/core/sync/GuiBridge.java +++ b/src/main/java/appeng/core/sync/GuiBridge.java @@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.Lists; + import appeng.api.AEApi; import appeng.api.config.SecurityPermissions; import appeng.api.definitions.IComparableDefinition; @@ -67,9 +69,6 @@ import appeng.tile.storage.TileDrive; import appeng.tile.storage.TileIOPort; import appeng.tile.storage.TileSkyChest; import appeng.util.Platform; - -import com.google.common.collect.Lists; - import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.relauncher.ReflectionHelper; diff --git a/src/main/java/appeng/core/worlddata/CompassData.java b/src/main/java/appeng/core/worlddata/CompassData.java index f71f9a01a..74df37237 100644 --- a/src/main/java/appeng/core/worlddata/CompassData.java +++ b/src/main/java/appeng/core/worlddata/CompassData.java @@ -14,10 +14,10 @@ import java.io.File; import javax.annotation.Nonnull; -import appeng.services.CompassService; - import com.google.common.base.Preconditions; +import appeng.services.CompassService; + /** * @author thatsIch * @version rv3 - 30.05.2015 diff --git a/src/main/java/appeng/core/worlddata/DimensionData.java b/src/main/java/appeng/core/worlddata/DimensionData.java index a9b9a724e..85f9acfec 100644 --- a/src/main/java/appeng/core/worlddata/DimensionData.java +++ b/src/main/java/appeng/core/worlddata/DimensionData.java @@ -20,15 +20,15 @@ import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; + import appeng.api.util.WorldCoord; import appeng.core.AEConfig; import appeng.core.sync.network.NetworkHandler; import appeng.core.sync.packets.PacketNewStorageDimension; import appeng.hooks.TickHandler; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; - /** * @author thatsIch * @version rv3 - 30.05.2015 diff --git a/src/main/java/appeng/core/worlddata/PlayerData.java b/src/main/java/appeng/core/worlddata/PlayerData.java index de15c670d..b6ff23aaf 100644 --- a/src/main/java/appeng/core/worlddata/PlayerData.java +++ b/src/main/java/appeng/core/worlddata/PlayerData.java @@ -20,12 +20,12 @@ import net.minecraftforge.common.config.ConfigCategory; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; -import appeng.core.CommonHelper; - import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.mojang.authlib.GameProfile; +import appeng.core.CommonHelper; + /** * Handles the matching between UUIDs and internal IDs for security systems. This whole system could be replaced by * storing directly the UUID, using a lot more traffic though diff --git a/src/main/java/appeng/core/worlddata/SpawnData.java b/src/main/java/appeng/core/worlddata/SpawnData.java index bbf079a85..751e6f817 100644 --- a/src/main/java/appeng/core/worlddata/SpawnData.java +++ b/src/main/java/appeng/core/worlddata/SpawnData.java @@ -22,10 +22,10 @@ import javax.annotation.Nonnull; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import appeng.core.AELog; - import com.google.common.base.Preconditions; +import appeng.core.AELog; + /** * @author thatsIch * @version rv3 - 30.05.2015 diff --git a/src/main/java/appeng/core/worlddata/StorageData.java b/src/main/java/appeng/core/worlddata/StorageData.java index 42fd8fe68..2ddfeca90 100644 --- a/src/main/java/appeng/core/worlddata/StorageData.java +++ b/src/main/java/appeng/core/worlddata/StorageData.java @@ -20,12 +20,12 @@ import javax.annotation.Nullable; import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import com.google.common.base.Preconditions; + import appeng.core.AELog; import appeng.me.GridStorage; import appeng.me.GridStorageSearch; -import com.google.common.base.Preconditions; - /** * @author thatsIch * @version rv3 - 30.05.2015 diff --git a/src/main/java/appeng/core/worlddata/WorldData.java b/src/main/java/appeng/core/worlddata/WorldData.java index 3fd2cec60..24745f10e 100644 --- a/src/main/java/appeng/core/worlddata/WorldData.java +++ b/src/main/java/appeng/core/worlddata/WorldData.java @@ -20,13 +20,13 @@ import javax.annotation.Nullable; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.config.Configuration; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; + import appeng.core.AEConfig; import appeng.services.CompassService; import appeng.services.compass.CompassThreadFactory; -import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; - /** * Singleton access to anything related to world-based data. *

diff --git a/src/main/java/appeng/crafting/CraftingJob.java b/src/main/java/appeng/crafting/CraftingJob.java index 271b0b5ae..01074017b 100644 --- a/src/main/java/appeng/crafting/CraftingJob.java +++ b/src/main/java/appeng/crafting/CraftingJob.java @@ -17,6 +17,8 @@ import java.util.concurrent.TimeUnit; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; +import com.google.common.base.Stopwatch; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; @@ -36,8 +38,6 @@ import appeng.hooks.TickHandler; import appeng.me.cache.CraftingGridCache; import appeng.me.cluster.implementations.CraftingCPUCluster; -import com.google.common.base.Stopwatch; - public class CraftingJob implements ICraftingJob, Runnable { private static final String LOG_CRAFTING_JOB = "CraftingJob (%s) issued by %s requesting [%s] using %s bytes took %s ms"; diff --git a/src/main/java/appeng/crafting/CraftingTreeNode.java b/src/main/java/appeng/crafting/CraftingTreeNode.java index b68606dd5..cb50da7b0 100644 --- a/src/main/java/appeng/crafting/CraftingTreeNode.java +++ b/src/main/java/appeng/crafting/CraftingTreeNode.java @@ -16,6 +16,8 @@ import java.util.List; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -26,8 +28,6 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.me.cluster.implementations.CraftingCPUCluster; -import com.google.common.collect.Lists; - public class CraftingTreeNode { // what slot! diff --git a/src/main/java/appeng/crafting/v2/CraftingCalculations.java b/src/main/java/appeng/crafting/v2/CraftingCalculations.java index e613c9033..0ac909ba3 100644 --- a/src/main/java/appeng/crafting/v2/CraftingCalculations.java +++ b/src/main/java/appeng/crafting/v2/CraftingCalculations.java @@ -7,16 +7,16 @@ import java.util.function.ToLongBiFunction; import org.apache.logging.log4j.Level; +import com.google.common.collect.ArrayListMultimap; +import com.google.common.collect.ListMultimap; +import com.google.common.collect.Multimaps; + import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.core.AELog; import appeng.crafting.v2.resolvers.*; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; -import com.google.common.collect.Multimaps; - /** * You can register additional crafting handlers here */ diff --git a/src/main/java/appeng/crafting/v2/CraftingContext.java b/src/main/java/appeng/crafting/v2/CraftingContext.java index 6b9f12a0e..d1c9590a6 100644 --- a/src/main/java/appeng/crafting/v2/CraftingContext.java +++ b/src/main/java/appeng/crafting/v2/CraftingContext.java @@ -12,6 +12,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import com.google.common.collect.ClassToInstanceMap; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.MutableClassToInstanceMap; + import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.crafting.ICraftingGrid; @@ -32,11 +37,6 @@ import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.util.Platform; import appeng.util.item.AEItemStack; import appeng.util.item.OreListMultiMap; - -import com.google.common.collect.ClassToInstanceMap; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.MutableClassToInstanceMap; import cpw.mods.fml.common.FMLCommonHandler; /** diff --git a/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java b/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java index ab80f0f81..86f50227a 100644 --- a/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java +++ b/src/main/java/appeng/crafting/v2/CraftingTreeSerializer.java @@ -9,6 +9,8 @@ import java.util.*; import net.minecraft.world.World; +import com.google.common.base.Throwables; + import appeng.api.implementations.ICraftingPatternItem; import appeng.api.networking.crafting.ICraftingPatternDetails; import appeng.api.storage.data.IAEItemStack; @@ -17,9 +19,6 @@ import appeng.core.AEConfig; import appeng.crafting.v2.resolvers.*; import appeng.util.item.AEFluidStack; import appeng.util.item.AEItemStack; - -import com.google.common.base.Throwables; - import cpw.mods.fml.common.network.ByteBufUtils; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java b/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java index 382ab6f18..4483d46e2 100644 --- a/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java +++ b/src/main/java/appeng/crafting/v2/resolvers/CraftableItemResolver.java @@ -11,6 +11,8 @@ import net.minecraft.world.World; import org.apache.logging.log4j.Level; +import com.google.common.collect.ImmutableList; + import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; import appeng.api.networking.crafting.ICraftingPatternDetails; @@ -30,8 +32,6 @@ import appeng.me.cluster.implementations.CraftingCPUCluster; import appeng.util.Platform; import appeng.util.item.AEItemStack; import appeng.util.item.HashBasedItemList; - -import com.google.common.collect.ImmutableList; import io.netty.buffer.ByteBuf; public class CraftableItemResolver implements CraftingRequestResolver { diff --git a/src/main/java/appeng/helpers/DualityInterface.java b/src/main/java/appeng/helpers/DualityInterface.java index c43a7c7a6..632d43379 100644 --- a/src/main/java/appeng/helpers/DualityInterface.java +++ b/src/main/java/appeng/helpers/DualityInterface.java @@ -26,6 +26,8 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.ImmutableSet; + import appeng.api.AEApi; import appeng.api.config.*; import appeng.api.crafting.ICraftingIconProvider; @@ -81,8 +83,6 @@ import appeng.util.inv.ItemSlot; import appeng.util.inv.WrapperInvSlot; import appeng.util.item.AEItemStack; import cofh.api.transport.IItemDuct; - -import com.google.common.collect.ImmutableSet; import cpw.mods.fml.common.Loader; public class DualityInterface implements IGridTickable, IStorageMonitorable, IInventoryDestination, IAEAppEngInventory, diff --git a/src/main/java/appeng/helpers/MultiCraftingTracker.java b/src/main/java/appeng/helpers/MultiCraftingTracker.java index 2d595b4a4..828a9b501 100644 --- a/src/main/java/appeng/helpers/MultiCraftingTracker.java +++ b/src/main/java/appeng/helpers/MultiCraftingTracker.java @@ -16,6 +16,8 @@ import java.util.concurrent.Future; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import com.google.common.collect.ImmutableSet; + import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.crafting.ICraftingGrid; @@ -26,8 +28,6 @@ import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.data.IAEItemStack; import appeng.util.InventoryAdaptor; -import com.google.common.collect.ImmutableSet; - public class MultiCraftingTracker { private final int size; diff --git a/src/main/java/appeng/hooks/AETrading.java b/src/main/java/appeng/hooks/AETrading.java index 0d7d22fed..73fa9f987 100644 --- a/src/main/java/appeng/hooks/AETrading.java +++ b/src/main/java/appeng/hooks/AETrading.java @@ -18,11 +18,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.village.MerchantRecipe; import net.minecraft.village.MerchantRecipeList; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.api.definitions.IMaterials; - -import com.google.common.base.Optional; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; public class AETrading implements IVillageTradeHandler { diff --git a/src/main/java/appeng/hooks/TickHandler.java b/src/main/java/appeng/hooks/TickHandler.java index d97140cdb..99d774cb9 100644 --- a/src/main/java/appeng/hooks/TickHandler.java +++ b/src/main/java/appeng/hooks/TickHandler.java @@ -20,6 +20,10 @@ import net.minecraft.world.World; import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.event.world.WorldEvent; +import com.google.common.base.Stopwatch; +import com.google.common.collect.LinkedListMultimap; +import com.google.common.collect.Multimap; + import appeng.api.AEApi; import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingJob; @@ -35,11 +39,6 @@ import appeng.me.NetworkList; import appeng.tile.AEBaseTile; import appeng.util.IWorldCallable; import appeng.util.Platform; - -import com.google.common.base.Stopwatch; -import com.google.common.collect.LinkedListMultimap; -import com.google.common.collect.Multimap; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; diff --git a/src/main/java/appeng/integration/modules/BuildCraftBuilder.java b/src/main/java/appeng/integration/modules/BuildCraftBuilder.java index 1ffb21e3a..aea56b9e1 100644 --- a/src/main/java/appeng/integration/modules/BuildCraftBuilder.java +++ b/src/main/java/appeng/integration/modules/BuildCraftBuilder.java @@ -16,6 +16,8 @@ import java.lang.reflect.Method; import net.minecraft.block.Block; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; @@ -31,8 +33,6 @@ import appeng.integration.modules.BCHelpers.AERotatableBlockSchematic; import buildcraft.api.blueprints.BuilderAPI; import buildcraft.api.blueprints.ISchematicRegistry; -import com.google.common.base.Optional; - /** * The builder has no interface, because it provides no functionality * diff --git a/src/main/java/appeng/integration/modules/DSU.java b/src/main/java/appeng/integration/modules/DSU.java index d6912d44e..85de6e61b 100644 --- a/src/main/java/appeng/integration/modules/DSU.java +++ b/src/main/java/appeng/integration/modules/DSU.java @@ -12,7 +12,6 @@ package appeng.integration.modules; import net.minecraft.tileentity.TileEntity; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import appeng.api.AEApi; import appeng.api.storage.IMEInventory; import appeng.helpers.Reflected; @@ -21,6 +20,7 @@ import appeng.integration.IntegrationHelper; import appeng.integration.abstraction.IDSU; import appeng.integration.modules.helpers.MFRDSUHandler; import appeng.integration.modules.helpers.MinefactoryReloadedDeepStorageUnit; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class DSU implements IDSU, IIntegrationModule { diff --git a/src/main/java/appeng/integration/modules/FMP.java b/src/main/java/appeng/integration/modules/FMP.java index 4a914b39b..4d43ca235 100644 --- a/src/main/java/appeng/integration/modules/FMP.java +++ b/src/main/java/appeng/integration/modules/FMP.java @@ -19,6 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import com.google.common.collect.Lists; + import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IBlocks; @@ -41,8 +43,6 @@ import codechicken.multipart.MultiPartRegistry.IPartFactory; import codechicken.multipart.MultipartGenerator; import codechicken.multipart.TMultiPart; import codechicken.multipart.TileMultipart; - -import com.google.common.collect.Lists; import cpw.mods.fml.common.eventhandler.Event; public class FMP implements IIntegrationModule, IPartFactory, IPartConverter, IFMP { diff --git a/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java b/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java index a5d462851..d9b0d5c60 100644 --- a/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java +++ b/src/main/java/appeng/integration/modules/ImmibisMicroblocks.java @@ -12,15 +12,14 @@ package appeng.integration.modules; import java.lang.reflect.Method; -import mods.immibis.core.api.multipart.ICoverSystem; -import mods.immibis.core.api.multipart.IMultipartTile; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.parts.IPartHost; @@ -30,8 +29,8 @@ import appeng.helpers.Reflected; import appeng.integration.IIntegrationModule; import appeng.integration.IntegrationHelper; import appeng.integration.abstraction.IImmibisMicroblocks; - -import com.google.common.base.Optional; +import mods.immibis.core.api.multipart.ICoverSystem; +import mods.immibis.core.api.multipart.IMultipartTile; public class ImmibisMicroblocks implements IImmibisMicroblocks, IIntegrationModule { diff --git a/src/main/java/appeng/integration/modules/Jabba.java b/src/main/java/appeng/integration/modules/Jabba.java index 7e56d783a..ef2d349fa 100644 --- a/src/main/java/appeng/integration/modules/Jabba.java +++ b/src/main/java/appeng/integration/modules/Jabba.java @@ -1,7 +1,5 @@ package appeng.integration.modules; -import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel; - import net.minecraft.tileentity.TileEntity; import appeng.api.AEApi; @@ -12,6 +10,7 @@ import appeng.integration.IIntegrationModule; import appeng.integration.IntegrationHelper; import appeng.integration.modules.helpers.JabbaBarrel; import appeng.integration.modules.helpers.JabbaStorageHandler; +import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel; public class Jabba implements IIntegrationModule { diff --git a/src/main/java/appeng/integration/modules/OpenComputers.java b/src/main/java/appeng/integration/modules/OpenComputers.java index 217a1b7bb..745f22c2b 100644 --- a/src/main/java/appeng/integration/modules/OpenComputers.java +++ b/src/main/java/appeng/integration/modules/OpenComputers.java @@ -10,7 +10,6 @@ package appeng.integration.modules; -import li.cil.oc.api.Items; import appeng.api.AEApi; import appeng.api.IAppEngApi; import appeng.api.config.TunnelType; @@ -21,6 +20,7 @@ import appeng.integration.IIntegrationModule; import appeng.integration.IntegrationHelper; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; +import li.cil.oc.api.Items; public class OpenComputers implements IIntegrationModule { diff --git a/src/main/java/appeng/integration/modules/RC.java b/src/main/java/appeng/integration/modules/RC.java index c00b0c744..c3517e758 100644 --- a/src/main/java/appeng/integration/modules/RC.java +++ b/src/main/java/appeng/integration/modules/RC.java @@ -10,15 +10,14 @@ package appeng.integration.modules; -import mods.railcraft.api.crafting.IRockCrusherRecipe; -import mods.railcraft.api.crafting.RailcraftCraftingManager; - import net.minecraft.item.ItemStack; import appeng.helpers.Reflected; import appeng.integration.IIntegrationModule; import appeng.integration.IntegrationHelper; import appeng.integration.abstraction.IRC; +import mods.railcraft.api.crafting.IRockCrusherRecipe; +import mods.railcraft.api.crafting.RailcraftCraftingManager; public class RC implements IRC, IIntegrationModule { diff --git a/src/main/java/appeng/integration/modules/Waila.java b/src/main/java/appeng/integration/modules/Waila.java index 5b8b0e574..f350d6952 100644 --- a/src/main/java/appeng/integration/modules/Waila.java +++ b/src/main/java/appeng/integration/modules/Waila.java @@ -10,8 +10,6 @@ package appeng.integration.modules; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaRegistrar; import appeng.helpers.Reflected; import appeng.integration.IIntegrationModule; import appeng.integration.IntegrationHelper; @@ -19,6 +17,8 @@ import appeng.integration.modules.waila.PartWailaDataProvider; import appeng.integration.modules.waila.TileWailaDataProvider; import appeng.tile.AEBaseTile; import cpw.mods.fml.common.event.FMLInterModComms; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; public class Waila implements IIntegrationModule { diff --git a/src/main/java/appeng/integration/modules/helpers/JabbaBarrel.java b/src/main/java/appeng/integration/modules/helpers/JabbaBarrel.java index 63d4b571d..db6493ae1 100644 --- a/src/main/java/appeng/integration/modules/helpers/JabbaBarrel.java +++ b/src/main/java/appeng/integration/modules/helpers/JabbaBarrel.java @@ -1,7 +1,5 @@ package appeng.integration.modules.helpers; -import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -12,6 +10,7 @@ import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.util.item.AEItemStack; +import mcp.mobius.betterbarrels.common.blocks.TileEntityBarrel; public class JabbaBarrel implements IMEInventory { diff --git a/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java b/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java index a0853ac95..440c6119b 100644 --- a/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java +++ b/src/main/java/appeng/integration/modules/helpers/MinefactoryReloadedDeepStorageUnit.java @@ -13,7 +13,6 @@ package appeng.integration.modules.helpers; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; import appeng.api.config.Actionable; import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IMEInventory; @@ -21,6 +20,7 @@ import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.util.item.AEItemStack; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public class MinefactoryReloadedDeepStorageUnit implements IMEInventory { diff --git a/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java index 8a4ca4cc8..cd05ca1dc 100644 --- a/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/BaseWailaDataProvider.java @@ -12,16 +12,16 @@ package appeng.integration.modules.waila; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + /** * Base implementation for {@link mcp.mobius.waila.api.IWailaDataProvider} * diff --git a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java index ba582012e..4b7d0277f 100644 --- a/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/PartWailaDataProvider.java @@ -12,10 +12,6 @@ package appeng.integration.modules.waila; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,12 +19,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import appeng.api.parts.IPart; -import appeng.integration.modules.waila.part.*; - import com.google.common.base.Optional; import com.google.common.collect.Lists; +import appeng.api.parts.IPart; +import appeng.integration.modules.waila.part.*; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + /** * Delegation provider for parts through {@link IPartWailaDataProvider} * diff --git a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java index 04a6092e6..51059f0a1 100644 --- a/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/TileWailaDataProvider.java @@ -12,22 +12,21 @@ package appeng.integration.modules.waila; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.google.common.collect.Lists; + import appeng.integration.modules.waila.tile.ChargerWailaDataProvider; import appeng.integration.modules.waila.tile.CraftingMonitorWailaDataProvider; import appeng.integration.modules.waila.tile.PowerStateWailaDataProvider; import appeng.integration.modules.waila.tile.PowerStorageWailaDataProvider; - -import com.google.common.collect.Lists; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; /** * Delegation provider for tiles through {@link mcp.mobius.waila.api.IWailaDataProvider} diff --git a/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java index 6e536cce9..e051cffd5 100644 --- a/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/BasePartWailaDataProvider.java @@ -12,9 +12,6 @@ package appeng.integration.modules.waila.part; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,6 +20,8 @@ import net.minecraft.world.World; import appeng.api.parts.IPart; import appeng.api.parts.PartItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Default implementation of {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} diff --git a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java index 97c68f7c5..f10d62617 100644 --- a/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/ChannelWailaDataProvider.java @@ -12,9 +12,6 @@ package appeng.integration.modules.waila.part; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -27,6 +24,8 @@ import appeng.parts.networking.PartDenseCable; import appeng.parts.networking.PartUltraDenseCableSmart; import gnu.trove.map.TObjectShortMap; import gnu.trove.map.hash.TObjectShortHashMap; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Channel-information provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java index 58d8d3aa8..c72ea5ade 100644 --- a/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/IPartWailaDataProvider.java @@ -12,9 +12,6 @@ package appeng.integration.modules.waila.part; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -22,6 +19,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import appeng.api.parts.IPart; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * An abstraction layer of the {@link appeng.integration.modules.waila.part.IPartWailaDataProvider} for diff --git a/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java index 49ee5b31d..45bd6e7e2 100644 --- a/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/P2PStateWailaDataProvider.java @@ -12,21 +12,20 @@ package appeng.integration.modules.waila.part; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import com.google.common.collect.Iterators; + import appeng.api.parts.IPart; import appeng.core.localization.ButtonToolTips; import appeng.core.localization.WailaText; import appeng.me.GridAccessException; import appeng.parts.p2p.PartP2PTunnel; - -import com.google.common.collect.Iterators; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Provides information about a P2P tunnel to WAILA. diff --git a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java index 45894525f..6961f76e2 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartAccessor.java @@ -14,12 +14,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; +import com.google.common.base.Optional; + import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; import appeng.api.parts.SelectedPart; -import com.google.common.base.Optional; - /** * Accessor to access specific parts for WAILA * diff --git a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java index 4727a8b2e..e065b3d3d 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PartStackWailaDataProvider.java @@ -10,12 +10,11 @@ package appeng.integration.modules.waila.part; -import mcp.mobius.waila.api.IWailaConfigHandler; - import net.minecraft.item.ItemStack; import appeng.api.parts.IPart; import appeng.api.parts.PartItemStack; +import mcp.mobius.waila.api.IWailaConfigHandler; /** * Part ItemStack provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java index bc83bf640..4be556cef 100644 --- a/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/PowerStateWailaDataProvider.java @@ -12,11 +12,11 @@ package appeng.integration.modules.waila.part; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; import appeng.api.implementations.IPowerChannelState; import appeng.api.parts.IPart; import appeng.core.localization.WailaText; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Power state provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java index e7d9af428..63a608f7a 100644 --- a/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/part/StorageMonitorWailaDataProvider.java @@ -12,14 +12,14 @@ package appeng.integration.modules.waila.part; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; import appeng.api.implementations.parts.IPartStorageMonitor; import appeng.api.parts.IPart; import appeng.api.storage.data.IAEFluidStack; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IAEStack; import appeng.core.localization.WailaText; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Storage monitor provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java index 2939676b9..8f2b1c80d 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/ChargerWailaDataProvider.java @@ -12,9 +12,6 @@ package appeng.integration.modules.waila.tile; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -23,6 +20,8 @@ import net.minecraft.tileentity.TileEntity; import appeng.core.localization.WailaText; import appeng.integration.modules.waila.BaseWailaDataProvider; import appeng.tile.misc.TileCharger; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Charger provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java index b7d1c428b..f8d0cbc43 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/CraftingMonitorWailaDataProvider.java @@ -12,9 +12,6 @@ package appeng.integration.modules.waila.tile; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -22,6 +19,8 @@ import appeng.api.storage.data.IAEItemStack; import appeng.core.localization.WailaText; import appeng.integration.modules.waila.BaseWailaDataProvider; import appeng.tile.crafting.TileCraftingMonitorTile; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Crafting-monitor provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java index 39b858228..d31795ce3 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStateWailaDataProvider.java @@ -12,15 +12,14 @@ package appeng.integration.modules.waila.tile; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import appeng.api.implementations.IPowerChannelState; import appeng.core.localization.WailaText; import appeng.integration.modules.waila.BaseWailaDataProvider; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Power state provider for WAILA diff --git a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java index c117b596a..dd96277bc 100644 --- a/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java +++ b/src/main/java/appeng/integration/modules/waila/tile/PowerStorageWailaDataProvider.java @@ -12,10 +12,6 @@ package appeng.integration.modules.waila.tile; import java.util.List; -import mcp.mobius.waila.api.ITaggedList; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -28,6 +24,9 @@ import appeng.integration.modules.waila.BaseWailaDataProvider; import appeng.util.Platform; import gnu.trove.map.TObjectLongMap; import gnu.trove.map.hash.TObjectLongHashMap; +import mcp.mobius.waila.api.ITaggedList; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; /** * Power storage provider for WAILA diff --git a/src/main/java/appeng/items/AEBaseItem.java b/src/main/java/appeng/items/AEBaseItem.java index 3ccf17fe6..15a380ec1 100644 --- a/src/main/java/appeng/items/AEBaseItem.java +++ b/src/main/java/appeng/items/AEBaseItem.java @@ -18,10 +18,9 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import appeng.core.features.*; - import com.google.common.base.Optional; +import appeng.core.features.*; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/materials/ItemMultiMaterial.java b/src/main/java/appeng/items/materials/ItemMultiMaterial.java index f38a24263..e8fa2b6ab 100644 --- a/src/main/java/appeng/items/materials/ItemMultiMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMultiMaterial.java @@ -32,6 +32,9 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; + import appeng.api.config.Upgrades; import appeng.api.implementations.IUpgradeableHost; import appeng.api.implementations.items.IItemGroup; @@ -50,9 +53,6 @@ import appeng.items.AEBaseItem; import appeng.util.InventoryAdaptor; import appeng.util.Platform; -import com.google.common.base.Preconditions; -import com.google.common.collect.ImmutableSet; - public final class ItemMultiMaterial extends AEBaseItem implements IStorageComponent, IUpgradeModule { public static ItemMultiMaterial instance; diff --git a/src/main/java/appeng/items/parts/ItemMultiPart.java b/src/main/java/appeng/items/parts/ItemMultiPart.java index ec83280ee..2425c9df3 100644 --- a/src/main/java/appeng/items/parts/ItemMultiPart.java +++ b/src/main/java/appeng/items/parts/ItemMultiPart.java @@ -25,6 +25,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import com.google.common.base.Preconditions; + import appeng.api.AEApi; import appeng.api.exceptions.MissingDefinition; import appeng.api.implementations.items.IItemGroup; @@ -41,9 +43,6 @@ import appeng.core.localization.GuiText; import appeng.integration.IntegrationRegistry; import appeng.integration.IntegrationType; import appeng.items.AEBaseItem; - -import com.google.common.base.Preconditions; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java b/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java index 064b0a733..278beb0ff 100644 --- a/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemAdvancedStorageCell.java @@ -4,14 +4,14 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IItemDefinition; import appeng.api.exceptions.MissingDefinition; import appeng.core.features.AEFeature; import appeng.items.materials.MaterialType; -import com.google.common.base.Optional; - public class ItemAdvancedStorageCell extends ItemBasicStorageCell { @SuppressWarnings("Guava") diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index ccdb51cfc..07bb6df27 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -24,6 +24,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.config.IncludeExclude; @@ -47,9 +49,6 @@ import appeng.items.contents.CellUpgrades; import appeng.items.materials.MaterialType; import appeng.util.InventoryAdaptor; import appeng.util.Platform; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/storage/ItemExtremeStorageCell.java b/src/main/java/appeng/items/storage/ItemExtremeStorageCell.java index 5abfb3da2..4123e940c 100644 --- a/src/main/java/appeng/items/storage/ItemExtremeStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemExtremeStorageCell.java @@ -6,10 +6,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import appeng.core.features.AEFeature; - import com.google.common.base.Optional; +import appeng.core.features.AEFeature; + public class ItemExtremeStorageCell extends ItemBasicStorageCell { protected final int totalTypes; diff --git a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java index c1267322d..01f16eb18 100644 --- a/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemSpatialStorageCell.java @@ -19,6 +19,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import com.google.common.base.Optional; + import appeng.api.implementations.TransitionResult; import appeng.api.implementations.items.ISpatialStorageCell; import appeng.api.util.WorldCoord; @@ -30,8 +32,6 @@ import appeng.spatial.StorageHelper; import appeng.spatial.StorageWorldProvider; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ItemSpatialStorageCell extends AEBaseItem implements ISpatialStorageCell { private final int maxRegion; diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 5b1f929b9..f05f589a1 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -22,6 +22,8 @@ import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.event.ForgeEventFactory; +import com.mojang.authlib.GameProfile; + import appeng.api.config.SecurityPermissions; import appeng.api.features.IPlayerRegistry; import appeng.api.implementations.items.IBiometricCard; @@ -32,8 +34,6 @@ import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; import appeng.util.Platform; -import com.mojang.authlib.GameProfile; - public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { public ToolBiometricCard() { diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index f878a3304..80cac8d77 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -23,6 +23,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import com.google.common.base.Optional; + import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.api.implementations.items.IAEWrench; @@ -44,8 +46,6 @@ import appeng.transformer.annotations.Integration.Interface; import appeng.util.Platform; import buildcraft.api.tools.IToolWrench; -import com.google.common.base.Optional; - @Interface(iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore) public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench, IToolWrench { diff --git a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java index 4fc4a6acc..82e812edd 100644 --- a/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java +++ b/src/main/java/appeng/items/tools/powered/ToolChargedStaff.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraftforge.event.ForgeEventFactory; +import com.google.common.base.Optional; + import appeng.core.AEConfig; import appeng.core.features.AEFeature; import appeng.core.sync.packets.PacketLightning; @@ -25,8 +27,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.server.ServerHelper; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolChargedStaff extends AEBasePoweredItem { public ToolChargedStaff() { diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index 690e2f72b..c0d9bf3a6 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -26,6 +26,8 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -59,9 +61,6 @@ import appeng.tile.misc.TilePaint; import appeng.util.ItemSorters; import appeng.util.Platform; import appeng.util.item.AEItemStack; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 73ac0dcc7..7c591e846 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -33,6 +33,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Optional; + import appeng.api.util.DimensionalCoord; import appeng.block.misc.BlockTinyTNT; import appeng.core.AEConfig; @@ -43,8 +45,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.InWorldToolOperationResult; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockTool { private final Map heatUp; diff --git a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java index a874469ad..46fc2d23d 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMassCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMassCannon.java @@ -30,6 +30,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -63,9 +65,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.me.storage.CellInventoryHandler; import appeng.tile.misc.TilePaint; import appeng.util.Platform; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 80acb9e41..8f420e5ff 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -20,6 +20,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.config.FuzzyMode; import appeng.api.implementations.guiobjects.IGuiItem; @@ -41,9 +43,6 @@ import appeng.items.contents.PortableCellViewer; import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.me.storage.CellInventoryHandler; import appeng.util.Platform; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index 37bab90da..9898ea457 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -20,6 +20,8 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.config.*; import appeng.api.features.IWirelessTermHandler; @@ -31,9 +33,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem; import appeng.util.ConfigManager; import appeng.util.IConfigManagerHost; import appeng.util.Platform; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java index 09916cf3d..1903079be 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java +++ b/src/main/java/appeng/items/tools/powered/powersink/AERootPoweredItem.java @@ -19,6 +19,8 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import com.google.common.base.Optional; + import appeng.api.config.AccessRestriction; import appeng.api.config.PowerUnits; import appeng.api.implementations.items.IAEItemPowerStorage; @@ -26,8 +28,6 @@ import appeng.core.localization.GuiText; import appeng.items.AEBaseItem; import appeng.util.Platform; -import com.google.common.base.Optional; - public abstract class AERootPoweredItem extends AEBaseItem implements IAEItemPowerStorage { private static final String POWER_NBT_KEY = "internalCurrentPower"; diff --git a/src/main/java/appeng/items/tools/powered/powersink/IC2.java b/src/main/java/appeng/items/tools/powered/powersink/IC2.java index 8e960b011..ad711bc49 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/IC2.java +++ b/src/main/java/appeng/items/tools/powered/powersink/IC2.java @@ -14,14 +14,13 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.config.PowerUnits; import appeng.integration.IntegrationType; import appeng.transformer.annotations.Integration.Interface; import appeng.transformer.annotations.Integration.InterfaceList; import appeng.transformer.annotations.Integration.Method; - -import com.google.common.base.Optional; - import ic2.api.item.IElectricItemManager; import ic2.api.item.ISpecialElectricItem; diff --git a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java index 6605bc55e..0b12a72c3 100644 --- a/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java +++ b/src/main/java/appeng/items/tools/powered/powersink/RedstoneFlux.java @@ -12,13 +12,13 @@ package appeng.items.tools.powered.powersink; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.api.config.PowerUnits; import appeng.integration.IntegrationType; import appeng.transformer.annotations.Integration.Interface; import cofh.api.energy.IEnergyContainerItem; -import com.google.common.base.Optional; - @Interface(iface = "cofh.api.energy.IEnergyContainerItem", iname = IntegrationType.RFItem) public abstract class RedstoneFlux extends IC2 implements IEnergyContainerItem { diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java index 886b97ca5..38b7240b1 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzAxe.java @@ -15,14 +15,14 @@ import java.util.EnumSet; import net.minecraft.item.ItemAxe; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; import appeng.core.features.ItemFeatureHandler; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolQuartzAxe extends ItemAxe implements IAEFeature { private final AEFeature type; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index dedfea377..f0a6a2f20 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -18,6 +18,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.base.Optional; + import appeng.api.implementations.guiobjects.IGuiItem; import appeng.api.implementations.guiobjects.IGuiItemObject; import appeng.core.features.AEFeature; @@ -28,8 +30,6 @@ import appeng.tile.AEBaseTile; import appeng.tile.networking.TileCableBus; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem { private final AEFeature type; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java index 78b67f5e6..70ef36d8a 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzHoe.java @@ -15,14 +15,14 @@ import java.util.EnumSet; import net.minecraft.item.ItemHoe; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; import appeng.core.features.ItemFeatureHandler; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolQuartzHoe extends ItemHoe implements IAEFeature { private final AEFeature feature; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java index 94e4cc230..a445e4290 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzPickaxe.java @@ -15,14 +15,14 @@ import java.util.EnumSet; import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; import appeng.core.features.ItemFeatureHandler; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolQuartzPickaxe extends ItemPickaxe implements IAEFeature { private final AEFeature type; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java index 5afea9ef3..a94b4686d 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzSpade.java @@ -15,14 +15,14 @@ import java.util.EnumSet; import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; import appeng.core.features.ItemFeatureHandler; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolQuartzSpade extends ItemSpade implements IAEFeature { private final AEFeature type; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java index 4ec734526..a7749cc75 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzSword.java @@ -15,14 +15,14 @@ import java.util.EnumSet; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; +import com.google.common.base.Optional; + import appeng.core.features.AEFeature; import appeng.core.features.IAEFeature; import appeng.core.features.IFeatureHandler; import appeng.core.features.ItemFeatureHandler; import appeng.util.Platform; -import com.google.common.base.Optional; - public class ToolQuartzSword extends ItemSword implements IAEFeature { private final AEFeature type; diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java index c9b41f3e2..7eab7cb45 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzWrench.java @@ -20,6 +20,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import com.google.common.base.Optional; + import appeng.api.implementations.items.IAEWrench; import appeng.api.util.DimensionalCoord; import appeng.core.features.AEFeature; @@ -29,8 +31,6 @@ import appeng.transformer.annotations.Integration.Interface; import appeng.util.Platform; import buildcraft.api.tools.IToolWrench; -import com.google.common.base.Optional; - @Interface(iface = "buildcraft.api.tools.IToolWrench", iname = IntegrationType.BuildCraftCore) public class ToolQuartzWrench extends AEBaseItem implements IAEWrench, IToolWrench { diff --git a/src/main/java/appeng/me/cache/CraftingGridCache.java b/src/main/java/appeng/me/cache/CraftingGridCache.java index c10033892..b75c5b83a 100644 --- a/src/main/java/appeng/me/cache/CraftingGridCache.java +++ b/src/main/java/appeng/me/cache/CraftingGridCache.java @@ -20,6 +20,8 @@ import java.util.stream.StreamSupport; import net.minecraft.world.World; +import com.google.common.collect.*; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.IGrid; @@ -53,8 +55,6 @@ import appeng.tile.crafting.TileCraftingTile; import appeng.util.ItemSorters; import appeng.util.item.OreListMultiMap; -import com.google.common.collect.*; - public class CraftingGridCache implements ICraftingGrid, ICraftingProviderHelper, ICellProvider, IMEInventoryHandler { diff --git a/src/main/java/appeng/me/cache/EnergyGridCache.java b/src/main/java/appeng/me/cache/EnergyGridCache.java index c7158a577..c9b857a67 100644 --- a/src/main/java/appeng/me/cache/EnergyGridCache.java +++ b/src/main/java/appeng/me/cache/EnergyGridCache.java @@ -12,6 +12,9 @@ package appeng.me.cache; import java.util.*; +import com.google.common.collect.HashMultiset; +import com.google.common.collect.Multiset; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -25,9 +28,6 @@ import appeng.me.GridNode; import appeng.me.energy.EnergyThreshold; import appeng.me.energy.EnergyWatcher; -import com.google.common.collect.HashMultiset; -import com.google.common.collect.Multiset; - public class EnergyGridCache implements IEnergyGrid { private final TreeSet interests = new TreeSet(); diff --git a/src/main/java/appeng/me/cache/GridStorageCache.java b/src/main/java/appeng/me/cache/GridStorageCache.java index 4f72563fb..3aa94a073 100644 --- a/src/main/java/appeng/me/cache/GridStorageCache.java +++ b/src/main/java/appeng/me/cache/GridStorageCache.java @@ -15,6 +15,9 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.SetMultimap; + import appeng.api.AEApi; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; @@ -38,9 +41,6 @@ import appeng.me.helpers.GenericInterestManager; import appeng.me.storage.ItemWatcher; import appeng.me.storage.NetworkInventoryHandler; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.SetMultimap; - public class GridStorageCache implements IStorageGrid { private final IGrid myGrid; diff --git a/src/main/java/appeng/me/cache/NetworkMonitor.java b/src/main/java/appeng/me/cache/NetworkMonitor.java index 51d5d6730..6dfe3669c 100644 --- a/src/main/java/appeng/me/cache/NetworkMonitor.java +++ b/src/main/java/appeng/me/cache/NetworkMonitor.java @@ -17,6 +17,9 @@ import javax.annotation.Nonnegative; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; + import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; import appeng.api.networking.events.MENetworkStorageEvent; @@ -29,9 +32,6 @@ import appeng.api.storage.data.IAEStack; import appeng.api.storage.data.IItemList; import appeng.me.storage.ItemWatcher; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; - public class NetworkMonitor> implements IMEMonitor { @Nonnull diff --git a/src/main/java/appeng/me/cache/P2PCache.java b/src/main/java/appeng/me/cache/P2PCache.java index f33aa83cb..b4731eeb6 100644 --- a/src/main/java/appeng/me/cache/P2PCache.java +++ b/src/main/java/appeng/me/cache/P2PCache.java @@ -12,6 +12,9 @@ package appeng.me.cache; import java.util.HashMap; +import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.Multimap; + import appeng.api.networking.*; import appeng.api.networking.events.MENetworkBootingStatusChange; import appeng.api.networking.events.MENetworkEventSubscribe; @@ -21,9 +24,6 @@ import appeng.me.cache.helpers.TunnelCollection; import appeng.parts.p2p.PartP2PTunnel; import appeng.parts.p2p.PartP2PTunnelME; -import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.Multimap; - public class P2PCache implements IGridCache { private final IGrid myGrid; diff --git a/src/main/java/appeng/me/cache/SecurityCache.java b/src/main/java/appeng/me/cache/SecurityCache.java index 9da9c64b2..86218e6e5 100644 --- a/src/main/java/appeng/me/cache/SecurityCache.java +++ b/src/main/java/appeng/me/cache/SecurityCache.java @@ -14,6 +14,9 @@ import java.util.*; import net.minecraft.entity.player.EntityPlayer; +import com.google.common.base.Preconditions; +import com.mojang.authlib.GameProfile; + import appeng.api.config.SecurityPermissions; import appeng.api.networking.IGrid; import appeng.api.networking.IGridHost; @@ -26,9 +29,6 @@ import appeng.api.networking.security.ISecurityProvider; import appeng.core.worlddata.WorldData; import appeng.me.GridNode; -import com.google.common.base.Preconditions; -import com.mojang.authlib.GameProfile; - public class SecurityCache implements ISecurityGrid { private final IGrid myGrid; diff --git a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java index ed9c0ed5e..f00753bc5 100644 --- a/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java +++ b/src/main/java/appeng/me/cluster/implementations/CraftingCPUCluster.java @@ -25,6 +25,9 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; import net.minecraft.world.WorldServer; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -63,9 +66,6 @@ import appeng.tile.crafting.TileCraftingMonitorTile; import appeng.tile.crafting.TileCraftingTile; import appeng.util.Platform; import appeng.util.item.AEItemStack; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import cpw.mods.fml.common.FMLCommonHandler; public final class CraftingCPUCluster implements IAECluster, ICraftingCPU { diff --git a/src/main/java/appeng/me/helpers/AENetworkProxy.java b/src/main/java/appeng/me/helpers/AENetworkProxy.java index 485139857..20dd93829 100644 --- a/src/main/java/appeng/me/helpers/AENetworkProxy.java +++ b/src/main/java/appeng/me/helpers/AENetworkProxy.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; +import com.mojang.authlib.GameProfile; + import appeng.api.AEApi; import appeng.api.networking.*; import appeng.api.networking.crafting.ICraftingGrid; @@ -38,8 +40,6 @@ import appeng.parts.networking.PartCable; import appeng.tile.AEBaseTile; import appeng.util.Platform; -import com.mojang.authlib.GameProfile; - public class AENetworkProxy implements IGridBlock { private final IGridProxyable gp; diff --git a/src/main/java/appeng/me/helpers/GenericInterestManager.java b/src/main/java/appeng/me/helpers/GenericInterestManager.java index f05df74e6..aabb7ae38 100644 --- a/src/main/java/appeng/me/helpers/GenericInterestManager.java +++ b/src/main/java/appeng/me/helpers/GenericInterestManager.java @@ -13,10 +13,10 @@ package appeng.me.helpers; import java.util.Collection; import java.util.LinkedList; -import appeng.api.storage.data.IAEStack; - import com.google.common.collect.Multimap; +import appeng.api.storage.data.IAEStack; + public class GenericInterestManager { private final Multimap container; diff --git a/src/main/java/appeng/me/storage/SecurityInventory.java b/src/main/java/appeng/me/storage/SecurityInventory.java index 09bd3fd45..04365d7db 100644 --- a/src/main/java/appeng/me/storage/SecurityInventory.java +++ b/src/main/java/appeng/me/storage/SecurityInventory.java @@ -10,6 +10,8 @@ package appeng.me.storage; +import com.mojang.authlib.GameProfile; + import appeng.api.AEApi; import appeng.api.config.AccessRestriction; import appeng.api.config.Actionable; @@ -24,8 +26,6 @@ import appeng.api.storage.data.IItemList; import appeng.me.GridAccessException; import appeng.tile.misc.TileSecurity; -import com.mojang.authlib.GameProfile; - public class SecurityInventory implements IMEInventoryHandler { private final IItemList storedItems = AEApi.instance().storage().createItemList(); diff --git a/src/main/java/appeng/parts/AEBasePart.java b/src/main/java/appeng/parts/AEBasePart.java index cac1664ca..6219365bc 100644 --- a/src/main/java/appeng/parts/AEBasePart.java +++ b/src/main/java/appeng/parts/AEBasePart.java @@ -32,6 +32,8 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import com.google.common.base.Preconditions; + import appeng.api.AEApi; import appeng.api.config.Upgrades; import appeng.api.definitions.IDefinitions; @@ -55,9 +57,6 @@ import appeng.parts.networking.PartCable; import appeng.tile.inventory.AppEngInternalAEInventory; import appeng.util.Platform; import appeng.util.SettingsFrom; - -import com.google.common.base.Preconditions; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; diff --git a/src/main/java/appeng/parts/PartPlacement.java b/src/main/java/appeng/parts/PartPlacement.java index 609a58e97..10f939247 100644 --- a/src/main/java/appeng/parts/PartPlacement.java +++ b/src/main/java/appeng/parts/PartPlacement.java @@ -31,6 +31,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import net.minecraftforge.event.world.BlockEvent; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.definitions.IItems; @@ -48,9 +50,6 @@ import appeng.integration.abstraction.IFMP; import appeng.integration.abstraction.IImmibisMicroblocks; import appeng.util.LookDirection; import appeng.util.Platform; - -import com.google.common.base.Optional; - import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; diff --git a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java index 8fef44200..46bb9ee40 100644 --- a/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java +++ b/src/main/java/appeng/parts/automation/PartAnnihilationPlane.java @@ -29,6 +29,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.world.BlockEvent; +import com.google.common.collect.Lists; + import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; import appeng.api.config.YesNo; @@ -58,9 +60,6 @@ import appeng.server.ServerHelper; import appeng.util.IWorldCallable; import appeng.util.Platform; import appeng.util.item.AEItemStack; - -import com.google.common.collect.Lists; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/automation/PartExportBus.java b/src/main/java/appeng/parts/automation/PartExportBus.java index 725eaf323..4df973585 100644 --- a/src/main/java/appeng/parts/automation/PartExportBus.java +++ b/src/main/java/appeng/parts/automation/PartExportBus.java @@ -16,6 +16,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.Vec3; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; + import appeng.api.config.*; import appeng.api.networking.IGridNode; import appeng.api.networking.crafting.ICraftingGrid; @@ -42,10 +45,6 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.item.AEItemStack; import appeng.util.prioitylist.OreFilteredList; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/layers/LayerPressure.java b/src/main/java/appeng/parts/layers/LayerPressure.java index e955f25c5..bc814893f 100644 --- a/src/main/java/appeng/parts/layers/LayerPressure.java +++ b/src/main/java/appeng/parts/layers/LayerPressure.java @@ -14,10 +14,10 @@ import javax.annotation.Nullable; import net.minecraftforge.common.util.ForgeDirection; -import pneumaticCraft.api.tileentity.IAirHandler; -import pneumaticCraft.api.tileentity.ISidedPneumaticMachine; import appeng.api.parts.IPart; import appeng.api.parts.LayerBase; +import pneumaticCraft.api.tileentity.IAirHandler; +import pneumaticCraft.api.tileentity.ISidedPneumaticMachine; public class LayerPressure extends LayerBase implements ISidedPneumaticMachine { diff --git a/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java b/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java index 879f1fe8f..fde167b40 100644 --- a/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java +++ b/src/main/java/appeng/parts/layers/LayerSidedEnvironment.java @@ -12,9 +12,6 @@ package appeng.parts.layers; import javax.annotation.Nullable; -import li.cil.oc.api.network.Node; -import li.cil.oc.api.network.SidedEnvironment; - import net.minecraftforge.common.util.ForgeDirection; import appeng.api.parts.IPart; @@ -22,6 +19,8 @@ import appeng.api.parts.LayerBase; import appeng.core.Registration; import appeng.helpers.Reflected; import cpw.mods.fml.common.event.FMLInitializationEvent; +import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.SidedEnvironment; /** * Reflected in {@link Registration#initialize(FMLInitializationEvent)} diff --git a/src/main/java/appeng/parts/misc/PartInterface.java b/src/main/java/appeng/parts/misc/PartInterface.java index d9f7fd151..237041960 100644 --- a/src/main/java/appeng/parts/misc/PartInterface.java +++ b/src/main/java/appeng/parts/misc/PartInterface.java @@ -25,6 +25,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.ImmutableSet; + import appeng.api.config.Actionable; import appeng.api.config.Upgrades; import appeng.api.implementations.tiles.ITileStorageMonitorable; @@ -57,9 +59,6 @@ import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.InvOperation; import appeng.util.Platform; import appeng.util.inv.IInventoryDestination; - -import com.google.common.collect.ImmutableSet; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/p2p/PartP2PInterface.java b/src/main/java/appeng/parts/p2p/PartP2PInterface.java index f2da3a015..05d9984bb 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PInterface.java +++ b/src/main/java/appeng/parts/p2p/PartP2PInterface.java @@ -15,6 +15,8 @@ import net.minecraft.util.IIcon; import net.minecraft.util.Vec3; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.ImmutableSet; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.Upgrades; @@ -49,9 +51,6 @@ import appeng.tile.inventory.IAEAppEngInventory; import appeng.tile.inventory.InvOperation; import appeng.util.Platform; import appeng.util.inv.IInventoryDestination; - -import com.google.common.collect.ImmutableSet; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java index 1751d0c37..7d28425a1 100644 --- a/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java +++ b/src/main/java/appeng/parts/p2p/PartP2POpenComputers.java @@ -12,11 +12,6 @@ package appeng.parts.p2p; import javax.annotation.Nullable; -import li.cil.oc.api.API; -import li.cil.oc.api.Items; -import li.cil.oc.api.Network; -import li.cil.oc.api.network.*; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IIcon; @@ -32,6 +27,10 @@ import appeng.transformer.annotations.Integration.Interface; import appeng.transformer.annotations.Integration.InterfaceList; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import li.cil.oc.api.API; +import li.cil.oc.api.Items; +import li.cil.oc.api.Network; +import li.cil.oc.api.network.*; @InterfaceList( value = { @Interface(iface = "li.cil.oc.api.network.Environment", iname = IntegrationType.OpenComputers), diff --git a/src/main/java/appeng/parts/p2p/PartP2PPressure.java b/src/main/java/appeng/parts/p2p/PartP2PPressure.java index 6bb780ccd..02642bf92 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PPressure.java +++ b/src/main/java/appeng/parts/p2p/PartP2PPressure.java @@ -19,10 +19,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import pneumaticCraft.api.block.BlockSupplier; -import pneumaticCraft.api.tileentity.AirHandlerSupplier; -import pneumaticCraft.api.tileentity.IAirHandler; -import pneumaticCraft.api.tileentity.ISidedPneumaticMachine; import appeng.api.networking.IGridNode; import appeng.api.networking.ticking.IGridTickable; import appeng.api.networking.ticking.TickRateModulation; @@ -31,6 +27,10 @@ import appeng.core.settings.TickRates; import appeng.integration.IntegrationType; import appeng.transformer.annotations.Integration.Interface; import appeng.util.Platform; +import pneumaticCraft.api.block.BlockSupplier; +import pneumaticCraft.api.tileentity.AirHandlerSupplier; +import pneumaticCraft.api.tileentity.IAirHandler; +import pneumaticCraft.api.tileentity.ISidedPneumaticMachine; @Interface(iface = "pneumaticCraft.api.tileentity.ISidedPneumaticMachine", iname = IntegrationType.PneumaticCraft) public final class PartP2PPressure extends PartP2PTunnel diff --git a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java index 1fe717a4f..82e2512d7 100644 --- a/src/main/java/appeng/parts/p2p/PartP2PTunnel.java +++ b/src/main/java/appeng/parts/p2p/PartP2PTunnel.java @@ -24,6 +24,8 @@ import net.minecraft.util.*; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.ForgeEventFactory; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -46,9 +48,6 @@ import appeng.me.cache.helpers.TunnelCollection; import appeng.parts.PartBasicState; import appeng.util.Platform; import buildcraft.api.tools.IToolWrench; - -import com.google.common.base.Optional; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/appeng/recipes/GroupIngredient.java b/src/main/java/appeng/recipes/GroupIngredient.java index 0039b1922..c5ae6c742 100644 --- a/src/main/java/appeng/recipes/GroupIngredient.java +++ b/src/main/java/appeng/recipes/GroupIngredient.java @@ -17,13 +17,13 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Preconditions; + import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RecipeError; import appeng.api.exceptions.RegistrationError; import appeng.api.recipes.IIngredient; -import com.google.common.base.Preconditions; - public class GroupIngredient implements IIngredient { private final String name; diff --git a/src/main/java/appeng/recipes/Ingredient.java b/src/main/java/appeng/recipes/Ingredient.java index 35c1310d0..5b8b259b6 100644 --- a/src/main/java/appeng/recipes/Ingredient.java +++ b/src/main/java/appeng/recipes/Ingredient.java @@ -18,6 +18,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Preconditions; + import appeng.api.AEApi; import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RecipeError; @@ -25,8 +27,6 @@ import appeng.api.exceptions.RegistrationError; import appeng.api.recipes.IIngredient; import appeng.api.recipes.ResolverResult; import appeng.api.recipes.ResolverResultSet; - -import com.google.common.base.Preconditions; import cpw.mods.fml.common.registry.GameRegistry; public class Ingredient implements IIngredient { diff --git a/src/main/java/appeng/recipes/IngredientSet.java b/src/main/java/appeng/recipes/IngredientSet.java index 66fd3217a..95ca01704 100644 --- a/src/main/java/appeng/recipes/IngredientSet.java +++ b/src/main/java/appeng/recipes/IngredientSet.java @@ -16,13 +16,13 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import com.google.common.base.Preconditions; + import appeng.api.exceptions.MissingIngredientError; import appeng.api.exceptions.RegistrationError; import appeng.api.recipes.IIngredient; import appeng.api.recipes.ResolverResultSet; -import com.google.common.base.Preconditions; - public class IngredientSet implements IIngredient { private final int qty; diff --git a/src/main/java/appeng/recipes/RecipeHandler.java b/src/main/java/appeng/recipes/RecipeHandler.java index 55978cea6..923287f8e 100644 --- a/src/main/java/appeng/recipes/RecipeHandler.java +++ b/src/main/java/appeng/recipes/RecipeHandler.java @@ -24,6 +24,10 @@ import javax.annotation.Nonnull; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import com.google.common.base.Optional; +import com.google.common.base.Preconditions; +import com.google.common.collect.HashMultimap; + import appeng.api.AEApi; import appeng.api.definitions.IBlocks; import appeng.api.definitions.IDefinitions; @@ -45,11 +49,6 @@ import appeng.items.misc.ItemCrystalSeed; import appeng.items.parts.ItemMultiPart; import appeng.recipes.handlers.IWebsiteSerializer; import appeng.recipes.handlers.OreRegistration; - -import com.google.common.base.Optional; -import com.google.common.base.Preconditions; -import com.google.common.collect.HashMultimap; - import cpw.mods.fml.common.LoaderState; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier; diff --git a/src/main/java/appeng/recipes/game/DisassembleRecipe.java b/src/main/java/appeng/recipes/game/DisassembleRecipe.java index 0b3cb9129..bc588dfac 100644 --- a/src/main/java/appeng/recipes/game/DisassembleRecipe.java +++ b/src/main/java/appeng/recipes/game/DisassembleRecipe.java @@ -22,6 +22,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.*; import appeng.api.storage.IMEInventory; @@ -29,8 +31,6 @@ import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; -import com.google.common.base.Optional; - public final class DisassembleRecipe implements IRecipe { private static final ItemStack MISMATCHED_STACK = null; diff --git a/src/main/java/appeng/recipes/game/FacadeRecipe.java b/src/main/java/appeng/recipes/game/FacadeRecipe.java index 55229dc87..e99ec91be 100644 --- a/src/main/java/appeng/recipes/game/FacadeRecipe.java +++ b/src/main/java/appeng/recipes/game/FacadeRecipe.java @@ -19,13 +19,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; import net.minecraft.world.World; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IComparableDefinition; import appeng.api.definitions.IDefinitions; import appeng.items.parts.ItemFacade; -import com.google.common.base.Optional; - public final class FacadeRecipe implements IRecipe { private final IComparableDefinition anchor; diff --git a/src/main/java/appeng/recipes/loader/ConfigLoader.java b/src/main/java/appeng/recipes/loader/ConfigLoader.java index 4967bcf0f..9db854f49 100644 --- a/src/main/java/appeng/recipes/loader/ConfigLoader.java +++ b/src/main/java/appeng/recipes/loader/ConfigLoader.java @@ -17,10 +17,10 @@ import java.io.InputStreamReader; import javax.annotation.Nonnull; -import appeng.api.recipes.IRecipeLoader; - import com.google.common.base.Preconditions; +import appeng.api.recipes.IRecipeLoader; + /** * Loads the recipes from the config folder */ diff --git a/src/main/java/appeng/recipes/loader/JarLoader.java b/src/main/java/appeng/recipes/loader/JarLoader.java index 0759de6cf..ed139733a 100644 --- a/src/main/java/appeng/recipes/loader/JarLoader.java +++ b/src/main/java/appeng/recipes/loader/JarLoader.java @@ -15,10 +15,10 @@ import java.io.InputStreamReader; import javax.annotation.Nonnull; -import appeng.api.recipes.IRecipeLoader; - import com.google.common.base.Preconditions; +import appeng.api.recipes.IRecipeLoader; + public class JarLoader implements IRecipeLoader { private final String rootPath; diff --git a/src/main/java/appeng/server/subcommands/Supporters.java b/src/main/java/appeng/server/subcommands/Supporters.java index 85015ca28..2b81a62a4 100644 --- a/src/main/java/appeng/server/subcommands/Supporters.java +++ b/src/main/java/appeng/server/subcommands/Supporters.java @@ -14,10 +14,10 @@ import net.minecraft.command.ICommandSender; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; -import appeng.server.ISubCommand; - import com.google.common.base.Joiner; +import appeng.server.ISubCommand; + public class Supporters implements ISubCommand { @Override diff --git a/src/main/java/appeng/server/subcommands/ToggleFullAccess.java b/src/main/java/appeng/server/subcommands/ToggleFullAccess.java index 1d1664ba7..af3fbc154 100644 --- a/src/main/java/appeng/server/subcommands/ToggleFullAccess.java +++ b/src/main/java/appeng/server/subcommands/ToggleFullAccess.java @@ -5,11 +5,11 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChatComponentText; +import com.mojang.authlib.GameProfile; + import appeng.me.cache.SecurityCache; import appeng.server.ISubCommand; -import com.mojang.authlib.GameProfile; - public class ToggleFullAccess implements ISubCommand { @Override diff --git a/src/main/java/appeng/services/CompassService.java b/src/main/java/appeng/services/CompassService.java index 64830edaa..3194f1f98 100644 --- a/src/main/java/appeng/services/CompassService.java +++ b/src/main/java/appeng/services/CompassService.java @@ -22,13 +22,13 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.event.world.WorldEvent; +import com.google.common.base.Preconditions; + import appeng.api.AEApi; import appeng.api.util.DimensionalCoord; import appeng.services.compass.CompassReader; import appeng.services.compass.ICompassCallback; import appeng.util.Platform; - -import com.google.common.base.Preconditions; import cpw.mods.fml.common.eventhandler.SubscribeEvent; public final class CompassService { diff --git a/src/main/java/appeng/services/compass/CompassRegion.java b/src/main/java/appeng/services/compass/CompassRegion.java index 6e6e3d885..0768223ac 100644 --- a/src/main/java/appeng/services/compass/CompassRegion.java +++ b/src/main/java/appeng/services/compass/CompassRegion.java @@ -17,10 +17,10 @@ import java.nio.channels.FileChannel; import javax.annotation.Nonnull; -import appeng.core.worlddata.MeteorDataNameEncoder; - import com.google.common.base.Preconditions; +import appeng.core.worlddata.MeteorDataNameEncoder; + public final class CompassRegion { private final int lowX; diff --git a/src/main/java/appeng/services/export/ExportProcess.java b/src/main/java/appeng/services/export/ExportProcess.java index 52aec0aa2..a233a77e0 100644 --- a/src/main/java/appeng/services/export/ExportProcess.java +++ b/src/main/java/appeng/services/export/ExportProcess.java @@ -18,11 +18,10 @@ import javax.annotation.Nonnull; import net.minecraft.item.Item; -import appeng.core.AELog; - import com.google.common.base.Preconditions; import com.google.common.base.Stopwatch; +import appeng.core.AELog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; diff --git a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java index 3afd0b8e2..cd295b376 100644 --- a/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java +++ b/src/main/java/appeng/services/export/MinecraftItemCSVExporter.java @@ -26,13 +26,12 @@ import net.minecraft.util.StatCollector; import org.apache.commons.io.FileUtils; -import appeng.core.AELog; - import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; +import appeng.core.AELog; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; diff --git a/src/main/java/appeng/services/export/ModListChecker.java b/src/main/java/appeng/services/export/ModListChecker.java index 9189b0a84..68bd91cc7 100644 --- a/src/main/java/appeng/services/export/ModListChecker.java +++ b/src/main/java/appeng/services/export/ModListChecker.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import org.apache.commons.codec.digest.DigestUtils; import com.google.common.base.Preconditions; + import cpw.mods.fml.common.ModContainer; /** diff --git a/src/main/java/appeng/services/version/VersionCheckerConfig.java b/src/main/java/appeng/services/version/VersionCheckerConfig.java index 002bef9d9..2d2979e6f 100644 --- a/src/main/java/appeng/services/version/VersionCheckerConfig.java +++ b/src/main/java/appeng/services/version/VersionCheckerConfig.java @@ -17,10 +17,10 @@ import javax.annotation.Nonnull; import net.minecraftforge.common.config.Configuration; -import appeng.core.AELog; - import com.google.common.base.Preconditions; +import appeng.core.AELog; + /** * Separate config file to handle the version checker */ diff --git a/src/main/java/appeng/services/version/VersionParser.java b/src/main/java/appeng/services/version/VersionParser.java index ee06f0af9..2acaf4fda 100644 --- a/src/main/java/appeng/services/version/VersionParser.java +++ b/src/main/java/appeng/services/version/VersionParser.java @@ -15,10 +15,10 @@ import java.util.regex.Pattern; import javax.annotation.Nonnull; -import appeng.services.version.exceptions.*; - import com.google.common.base.Preconditions; +import appeng.services.version.exceptions.*; + /** * can parse a version in form of rv2-beta-8 or rv2.beta.8 */ diff --git a/src/main/java/appeng/services/version/github/ReleaseFetcher.java b/src/main/java/appeng/services/version/github/ReleaseFetcher.java index 487ee38e1..4f77298fd 100644 --- a/src/main/java/appeng/services/version/github/ReleaseFetcher.java +++ b/src/main/java/appeng/services/version/github/ReleaseFetcher.java @@ -20,6 +20,9 @@ import javax.annotation.Nonnull; import org.apache.commons.io.IOUtils; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + import appeng.core.AELog; import appeng.services.version.Channel; import appeng.services.version.Version; @@ -27,9 +30,6 @@ import appeng.services.version.VersionCheckerConfig; import appeng.services.version.VersionParser; import appeng.services.version.exceptions.VersionCheckerException; -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; - public final class ReleaseFetcher { private static final String GITHUB_RELEASES_URL = "https://api.github.com/repos/xsun2001/Applied-Energistics-2-Unofficial/releases"; diff --git a/src/main/java/appeng/tile/misc/TileInscriber.java b/src/main/java/appeng/tile/misc/TileInscriber.java index ea71127c3..04854a31a 100644 --- a/src/main/java/appeng/tile/misc/TileInscriber.java +++ b/src/main/java/appeng/tile/misc/TileInscriber.java @@ -22,6 +22,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.Lists; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.PowerMultiplier; @@ -56,8 +58,6 @@ import appeng.util.InventoryAdaptor; import appeng.util.Platform; import appeng.util.inv.WrapperInventoryRange; import appeng.util.item.AEItemStack; - -import com.google.common.collect.Lists; import io.netty.buffer.ByteBuf; /** diff --git a/src/main/java/appeng/tile/misc/TileInterface.java b/src/main/java/appeng/tile/misc/TileInterface.java index 0b6c5d9c9..8409a7a6f 100644 --- a/src/main/java/appeng/tile/misc/TileInterface.java +++ b/src/main/java/appeng/tile/misc/TileInterface.java @@ -21,6 +21,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.ImmutableSet; + import appeng.api.config.Actionable; import appeng.api.config.Upgrades; import appeng.api.implementations.IPowerChannelState; @@ -53,8 +55,6 @@ import appeng.tile.grid.AENetworkInvTile; import appeng.tile.inventory.InvOperation; import appeng.util.Platform; import appeng.util.inv.IInventoryDestination; - -import com.google.common.collect.ImmutableSet; import io.netty.buffer.ByteBuf; public class TileInterface extends AENetworkInvTile implements IGridTickable, ITileStorageMonitorable, diff --git a/src/main/java/appeng/tile/misc/TilePaint.java b/src/main/java/appeng/tile/misc/TilePaint.java index 618998a62..df04e1018 100644 --- a/src/main/java/appeng/tile/misc/TilePaint.java +++ b/src/main/java/appeng/tile/misc/TilePaint.java @@ -23,15 +23,14 @@ import net.minecraft.util.Vec3; import net.minecraft.world.EnumSkyBlock; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.ImmutableList; + import appeng.api.util.AEColor; import appeng.helpers.Splotch; import appeng.items.misc.ItemPaintBall; import appeng.tile.AEBaseTile; import appeng.tile.TileEvent; import appeng.tile.events.TileEventType; - -import com.google.common.collect.ImmutableList; - import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java index 3fbd07750..93cbbcae5 100644 --- a/src/main/java/appeng/tile/qnb/TileQuantumBridge.java +++ b/src/main/java/appeng/tile/qnb/TileQuantumBridge.java @@ -19,6 +19,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.base.Optional; + import appeng.api.AEApi; import appeng.api.definitions.IBlockDefinition; import appeng.api.networking.GridFlags; @@ -39,8 +41,6 @@ import appeng.tile.grid.AENetworkInvTile; import appeng.tile.inventory.AppEngInternalInventory; import appeng.tile.inventory.InvOperation; import appeng.util.Platform; - -import com.google.common.base.Optional; import io.netty.buffer.ByteBuf; public class TileQuantumBridge extends AENetworkInvTile implements IAEMultiBlock { diff --git a/src/main/java/appeng/transformer/AppEngCore.java b/src/main/java/appeng/transformer/AppEngCore.java index f48c36c36..c265a4a8f 100644 --- a/src/main/java/appeng/transformer/AppEngCore.java +++ b/src/main/java/appeng/transformer/AppEngCore.java @@ -14,10 +14,9 @@ import java.util.Map; import javax.annotation.Nullable; -import appeng.core.AEConfig; - import com.google.common.eventbus.EventBus; +import appeng.core.AEConfig; import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.Mod.EventHandler; diff --git a/src/main/java/appeng/transformer/asm/ASMTweaker.java b/src/main/java/appeng/transformer/asm/ASMTweaker.java index a4748f78f..5c9e0ac1e 100644 --- a/src/main/java/appeng/transformer/asm/ASMTweaker.java +++ b/src/main/java/appeng/transformer/asm/ASMTweaker.java @@ -22,10 +22,10 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.*; -import appeng.helpers.Reflected; - import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + +import appeng.helpers.Reflected; import cpw.mods.fml.relauncher.FMLRelaunchLog; @Reflected diff --git a/src/main/java/appeng/util/ClassInstantiation.java b/src/main/java/appeng/util/ClassInstantiation.java index 6a94e8728..1e0fc4adc 100644 --- a/src/main/java/appeng/util/ClassInstantiation.java +++ b/src/main/java/appeng/util/ClassInstantiation.java @@ -13,10 +13,10 @@ package appeng.util; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import appeng.core.AELog; - import com.google.common.base.Optional; +import appeng.core.AELog; + public class ClassInstantiation { private final Class template; diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 24f136452..98e39705b 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -50,6 +50,8 @@ import net.minecraftforge.common.util.FakePlayerFactory; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.oredict.OreDictionary; +import com.mojang.authlib.GameProfile; + import appeng.api.AEApi; import appeng.api.config.*; import appeng.api.definitions.IItemDefinition; @@ -92,9 +94,6 @@ import appeng.util.item.OreHelper; import appeng.util.item.OreReference; import appeng.util.prioitylist.IPartitionList; import buildcraft.api.tools.IToolWrench; - -import com.mojang.authlib.GameProfile; - import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; diff --git a/src/main/java/appeng/util/inv/IMEAdaptor.java b/src/main/java/appeng/util/inv/IMEAdaptor.java index 49a1145dc..60e37bcae 100644 --- a/src/main/java/appeng/util/inv/IMEAdaptor.java +++ b/src/main/java/appeng/util/inv/IMEAdaptor.java @@ -14,6 +14,8 @@ import java.util.Iterator; import net.minecraft.item.ItemStack; +import com.google.common.collect.ImmutableList; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.config.FuzzyMode; @@ -24,8 +26,6 @@ import appeng.api.storage.data.IItemList; import appeng.util.InventoryAdaptor; import appeng.util.item.AEItemStack; -import com.google.common.collect.ImmutableList; - public class IMEAdaptor extends InventoryAdaptor { private final IMEInventory target; diff --git a/src/main/java/appeng/util/item/OreHelper.java b/src/main/java/appeng/util/item/OreHelper.java index 6e3305228..44bd68dd9 100644 --- a/src/main/java/appeng/util/item/OreHelper.java +++ b/src/main/java/appeng/util/item/OreHelper.java @@ -16,13 +16,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import appeng.api.storage.data.IAEItemStack; - import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.Sets; +import appeng.api.storage.data.IAEItemStack; + public class OreHelper { public static final OreHelper INSTANCE = new OreHelper(); diff --git a/src/main/java/appeng/util/item/OreListMultiMap.java b/src/main/java/appeng/util/item/OreListMultiMap.java index ad1d87401..963b5a075 100644 --- a/src/main/java/appeng/util/item/OreListMultiMap.java +++ b/src/main/java/appeng/util/item/OreListMultiMap.java @@ -3,13 +3,13 @@ package appeng.util.item; import java.util.*; import java.util.Map.Entry; -import appeng.api.networking.crafting.ICraftingPatternDetails; -import appeng.api.storage.data.IAEItemStack; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.ImmutableListMultimap.Builder; +import appeng.api.networking.crafting.ICraftingPatternDetails; +import appeng.api.storage.data.IAEItemStack; + public class OreListMultiMap { private ImmutableListMultimap map;