diff --git a/build.gradle b/build.gradle index fe8a2e7..a8b7532 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1675110695 +//version: 1684218858 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,27 +6,28 @@ */ -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 org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory -import org.jetbrains.gradle.ext.* +import org.gradle.internal.xml.XmlTransformer +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 buildscript { repositories { - mavenLocal() mavenCentral() maven { @@ -47,6 +48,8 @@ buildscript { name 'Scala CI dependencies' url 'https://repo1.maven.org/maven2/' } + + mavenLocal() } } plugins { @@ -58,22 +61,26 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false 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 '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 '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.1.2' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.14' } + +print("You might want to check out './gradlew :faq' if your build fails.\n") + 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' } @@ -122,7 +129,10 @@ propertyDefaultIfUnset("gradleTokenGroupName", "") propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +// 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(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') @@ -143,13 +153,21 @@ java { } else { languageVersion.set(projectJavaVersion) } - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) } if (!noPublishedSources) { withSourcesJar() } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -183,14 +201,34 @@ 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()) { + repositories { + mavenCentral { + mavenContent { + includeGroup("me.eigenraven.java8unsupported") + } + } + } + dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } + // Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937. + patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0') } tasks.withType(JavaCompile).configureEach { @@ -202,7 +240,7 @@ if (enableModernJavaSyntax.toBoolean()) { javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) }) } } @@ -234,12 +272,14 @@ if (apiPackage) { } if (accessTransformersFile) { - String targetFile = "src/main/resources/META-INF/" + accessTransformersFile - if (!getFile(targetFile).exists()) { - throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + for (atFile in accessTransformersFile.split(",")) { + String targetFile = "src/main/resources/META-INF/" + atFile.trim() + if (!getFile(targetFile).exists()) { + throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + } + tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile) + tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile) } - tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile) - tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile) } else { boolean atsFound = false for (File at : sourceSets.getByName("main").resources.files) { @@ -367,12 +407,14 @@ minecraft { injectMissingGenerics.set(true) } + username = developmentEnvironmentUserName.toString() + + lwjgl3Version = "3.3.2" + // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") - if (usesMixinDebug.toBoolean()) { extraRunJvmArguments.addAll([ "-Dmixin.debug.countInjections=true", @@ -401,6 +443,16 @@ configurations.configureEach { } } } + def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE) + if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + // Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server + if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') { + details.useVersion '2388750' + details.because 'Pick obfuscated jar' + } + } + } } // Ensure tests have access to minecraft classes @@ -430,8 +482,9 @@ repositories.configureEach { repo -> apply from: 'repositories.gradle' configurations { + runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable) + testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable) for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) { - config.extendsFrom(runtimeOnlyNonPublishable) if (usesShadowedDependencies.toBoolean()) { config.extendsFrom(shadowImplementation) // TODO: remove Compile after all uses are refactored to Implementation @@ -476,12 +529,11 @@ repositories { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - if (usesMixinDebug.toBoolean()) { - maven { - name = "Fabric Maven" - url = "https://maven.fabricmc.net/" - } + maven { + name 'sonatype' + url 'https://oss.sonatype.org/content/repositories/snapshots/' + content { + includeGroup "org.lwjgl" } } if (includeWellKnownRepositories.toBoolean()) { @@ -515,29 +567,50 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.7.1" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor') + annotationProcessor(mixinProviderSpec) if (usesMixinDebug.toBoolean()) { runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16') } } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - implementation('com.gtnewhorizon:gtnhmixins:2.1.10') + if (usesMixins.toBoolean()) { + implementation(mixinProviderSpec) + } else if (forceEnableMixins.toBoolean()) { + runtimeOnlyNonPublishable(mixinProviderSpec) } } pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { if (usesMixins.toBoolean()) { dependencies { - kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor') + kapt(mixinProviderSpec) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -633,7 +706,156 @@ tasks.named("processResources", ProcessResources).configure { if (usesMixins.toBoolean()) { from refMap + dependsOn("compileJava", "compileScala") + } +} + +ext.java17Toolchain = (JavaToolchainSpec spec) -> { + spec.languageVersion.set(JavaLanguageVersion.of(17)) + spec.vendor.set(JvmVendorSpec.matching("jetbrains")) +} + +ext.java17DependenciesCfg = configurations.create("java17Dependencies") { + extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution + canBeConsumed = false +} +ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") { + canBeConsumed = false +} + +dependencies { + 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.13') + } + + java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} + java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") + java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') + java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") + java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} +} + +ext.java17JvmArgs = [ + // Java 9+ support + "--illegal-access=warn", + "-Djava.security.manager=allow", + "-Dfile.encoding=UTF-8", + "--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED", + "--add-opens", "java.base/java.net=ALL-UNNAMED", + "--add-opens", "java.base/java.nio=ALL-UNNAMED", + "--add-opens", "java.base/java.io=ALL-UNNAMED", + "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", + "--add-opens", "java.base/java.text=ALL-UNNAMED", + "--add-opens", "java.base/java.util=ALL-UNNAMED", + "--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED", + "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", + "--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming", + "--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED", + "--add-modules", "jdk.dynalink", + "--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED", + "--add-modules", "java.sql.rowset", + "--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED" +] + +ext.hotswapJvmArgs = [ + // DCEVM advanced hot reload + "-XX:+AllowEnhancedClassRedefinition", + "-XX:HotswapAgent=fatjar" +] + +ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") { + group = "GTNH Buildscript" + description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory" + def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar' + def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")} + def targetFilename = "hotswap-agent.jar" + onlyIf { + !targetFolderProvider.get().file(targetFilename).asFile.exists() } + doLast { + def targetFolder = targetFolderProvider.get() + targetFolder.asFile.mkdirs() + download.run { + src hsaUrl + dest targetFolder.file(targetFilename).asFile + overwrite false + tempAndMove true + } + } +} + +public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { + // IntelliJ doesn't seem to allow commandline arguments so we also support an env variable + private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP")); + + @Input + public boolean getEnableHotswap() { return enableHotswap } + @Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger") + public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } + + @Inject + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { + super(side, gradle) + + this.lwjglVersion = 3 + this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain) + this.extraJvmArgs.addAll(project.java17JvmArgs) + this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) + + this.classpath(project.java17PatchDependenciesCfg) + if (side == Distribution.CLIENT) { + this.classpath(project.minecraftTasks.lwjgl3Configuration) + } + // Use a raw provider instead of map to not create a dependency on the task + this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath)) + this.classpath.filter { file -> + !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 + } + this.classpath(project.java17DependenciesCfg) + } + + public void setup(Project project) { + super.setup(project) + if (project.usesMixins.toBoolean()) { + this.extraJvmArgs.addAll(project.provider(() -> { + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + mixinCfg.canBeConsumed = false + mixinCfg.transitive = false + enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : [] + })) + } + } +} + +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") +runClient17Task.configure { + setup(project) + group = "Modded Minecraft" + description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge" + dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar') + mainClass = "GradleStart" + username = minecraft.username + userUUID = minecraft.userUUID +} + +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") +runServer17Task.configure { + setup(project) + group = "Modded Minecraft" + description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge" + dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar') + mainClass = "GradleStartServer" + extraArgs.add("nogui") } def getManifestAttributes() { @@ -667,11 +889,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = minimizeShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -686,8 +903,9 @@ if (usesShadowedDependencies.toBoolean()) { project.configurations.shadeCompile ] archiveClassifier.set('dev') - if (minimizeShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + if (relocateShadowedDependencies.toBoolean()) { + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -705,7 +923,7 @@ if (usesShadowedDependencies.toBoolean()) { javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) { skip() } - for (runTask in ["runClient", "runServer"]) { + for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) { tasks.named(runTask).configure { dependsOn("shadowJar") } @@ -743,9 +961,23 @@ idea { module { downloadJavadoc = true downloadSources = true + inheritOutputDirs = true } project { settings { + if (ideaOverrideBuildType != "") { + delegateActions { + if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) { + delegateBuildRunToGradle = true + testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE + } else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) { + delegateBuildRunToGradle = false + testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM + } else { + throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.') + } + } + } runConfigurations { "1. Run Client"(Gradle) { taskNames = ["runClient"] @@ -753,6 +985,20 @@ idea { "2. Run Server"(Gradle) { taskNames = ["runServer"] } + "1a. Run Client (Java 17)"(Gradle) { + taskNames = ["runClient17"] + } + "2a. Run Server (Java 17)"(Gradle) { + taskNames = ["runServer17"] + } + "1b. Run Client (Java 17, Hotswap)"(Gradle) { + taskNames = ["runClient17"] + envs = ["HOTSWAP": "true"] + } + "2b. Run Server (Java 17, Hotswap)"(Gradle) { + taskNames = ["runServer17"] + envs = ["HOTSWAP": "true"] + } "3. Run Obfuscated Client"(Gradle) { taskNames = ["runObfClient"] } @@ -770,7 +1016,7 @@ idea { } "Run Client (IJ Native)"(Application) { mainClass = "GradleStart" - moduleName = project.name + ".main" + moduleName = project.name + ".ideVirtualMain" afterEvaluate { workingDirectory = tasks.runClient.workingDir.absolutePath programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ') @@ -781,7 +1027,7 @@ idea { } "Run Server (IJ Native)"(Application) { mainClass = "GradleStartServer" - moduleName = project.name + ".main" + moduleName = project.name + ".ideVirtualMain" afterEvaluate { workingDirectory = tasks.runServer.workingDir.absolutePath programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ') @@ -793,11 +1039,57 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] } } + withIDEADir { File ideaDir -> + if (!ideaDir.path.contains(".idea")) { + // If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory + ideaDir = new File(ideaDir, ".idea") + } + if (ideaDir.isDirectory()) { + def miscFile = new File(ideaDir, "misc.xml") + if (miscFile.isFile()) { + boolean dirty = false + def miscTransformer = new XmlTransformer() + miscTransformer.addAction { root -> + Node rootNode = root.asNode() + def rootManager = rootNode + .component.find { it.@name == 'ProjectRootManager' } + if (!rootManager) { + rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2']) + dirty = true + } + def output = rootManager.output + if (!output) { + output = rootManager.appendNode('output') + dirty = true + } + if (!output.@url) { + // Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow. + // This is a sensible default for most setups + output.@url = 'file://$PROJECT_DIR$/build/ideaBuild' + dirty = true + } + } + def result = miscTransformer.transform(miscFile.text) + if (dirty) { + miscFile.write(result) + } + } else { + miscFile.text = """ + + + + + +""" + } + } + } } } } @@ -867,7 +1159,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -911,7 +1203,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) @@ -945,10 +1237,21 @@ def addCurseForgeRelation(String type, String name) { } // Updating + +def buildscriptGradleVersion = "8.1.1" + +tasks.named('wrapper', Wrapper).configure { + gradleVersion = buildscriptGradleVersion +} + tasks.register('updateBuildScript') { group = 'GTNH Buildscript' description = 'Updates the build script to the latest version' + if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) { + dependsOn('wrapper') + } + doLast { if (performBuildScriptUpdate()) return @@ -961,6 +1264,24 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA performBuildScriptUpdate() } else { out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'") + if (gradle.gradleVersion != buildscriptGradleVersion) { + out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n") + } + } +} + +// If you want to add more cases to this task, implement them as arguments if total amount to print gets too large +tasks.register('faq') { + group = 'GTNH Buildscript' + description = 'Prints frequently asked questions about building a project' + + doLast { + print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + + "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + + "The links can be found in repositories.gradle and build.gradle:repositories, " + + "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") } } @@ -1101,7 +1422,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 { @@ -1143,11 +1464,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. @@ -1155,34 +1472,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 @@ -1190,50 +1480,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 2b20ed6..0b4732a 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,28 +1,25 @@ // Add your dependencies here dependencies { - compile("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") + api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-70-GTNH:dev") { + compileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-213-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:waila:1.5.18:dev") { + compileOnly("com.github.GTNewHorizons:waila:1.6.0:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.1.22-GTNH:dev") { + compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.53-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:OpenComputers:1.7.5.20-GTNH:dev") { + compileOnly("com.github.GTNewHorizons:OpenComputers:1.9.5-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev") { - transitive = false - } - compileOnly("com.github.GTNewHorizons:DeveloperCapes:master-SNAPSHOT:dev") { + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.43.39:dev") { transitive = false } - compileOnly("com.mod-buildcraft:buildcraft:7.1.23:dev") { + compileOnly("com.github.GTNewHorizons:BuildCraft:7.1.33:dev") { transitive = false } compileOnly("curse.maven:bigreactors-241994:2282591") { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ccebba7..943f0cb 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f398c33..37aef8d 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-7.6-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/gradlew b/gradlew index 79a61d4..65dcd68 100755 --- a/gradlew +++ b/gradlew @@ -144,7 +144,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +152,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java index 465111d..61dc3c2 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientProxy.java @@ -10,15 +10,15 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.registry.GameRegistry; import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.Subblock; import shedar.mods.ic2.nuclearcontrol.gui.GuiRemoteMonitor; import shedar.mods.ic2.nuclearcontrol.renderers.MainBlockRenderer; import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityIC2ThermoRenderer; import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityInfoPanelRenderer; import shedar.mods.ic2.nuclearcontrol.renderers.TileEntityRemoteThermoRenderer; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.registry.GameRegistry; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientTickHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientTickHandler.java index 5f56b5c..4a643ad 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientTickHandler.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ClientTickHandler.java @@ -24,6 +24,7 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ClientTickHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java index d6af16c..76eb837 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/CommonProxy.java @@ -9,12 +9,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.registry.GameRegistry; import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.Subblock; import shedar.mods.ic2.nuclearcontrol.containers.ContainerRemoteMonitor; import shedar.mods.ic2.nuclearcontrol.gui.GuiRemoteMonitor; import shedar.mods.ic2.nuclearcontrol.tileentities.*; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.registry.GameRegistry; public class CommonProxy implements IGuiHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java index 7fe4b09..9728d12 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/IC2NuclearControl.java @@ -8,6 +8,18 @@ import org.apache.logging.log4j.Logger; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Mod; +import cpw.mods.fml.common.Mod.EventHandler; +import cpw.mods.fml.common.Mod.Instance; +import cpw.mods.fml.common.SidedProxy; +import cpw.mods.fml.common.event.FMLInitializationEvent; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; +import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlLight; import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlMain; import shedar.mods.ic2.nuclearcontrol.crossmod.CrossModLoader; @@ -24,18 +36,6 @@ import shedar.mods.ic2.nuclearcontrol.panel.ScreenManager; import shedar.mods.ic2.nuclearcontrol.recipes.RecipesNew; import shedar.mods.ic2.nuclearcontrol.recipes.RecipesOld; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.Mod.Instance; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.registry.GameRegistry; -import cpw.mods.fml.relauncher.Side; @Mod( modid = "IC2NuclearControl", diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/ServerTickHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/ServerTickHandler.java index c4d7960..590faef 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/ServerTickHandler.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/ServerTickHandler.java @@ -8,10 +8,10 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraftforge.event.world.WorldEvent; -import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler; -import shedar.mods.ic2.nuclearcontrol.network.message.PacketAlarm; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler; +import shedar.mods.ic2.nuclearcontrol.network.message.PacketAlarm; public class ServerTickHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/StorageArrayRecipe.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/StorageArrayRecipe.java index 4387976..03575f9 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/StorageArrayRecipe.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/StorageArrayRecipe.java @@ -9,13 +9,13 @@ import net.minecraft.world.World; import net.minecraftforge.oredict.RecipeSorter; +import ic2.api.item.IC2Items; import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergyArrayLocation; import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation; import shedar.mods.ic2.nuclearcontrol.items.ItemCardLiquidArrayLocation; import shedar.mods.ic2.nuclearcontrol.items.ItemCardMultipleSensorLocation; import shedar.mods.ic2.nuclearcontrol.items.ItemKitMultipleSensor; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; -import ic2.api.item.IC2Items; public class StorageArrayRecipe implements IRecipe { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java index 361485d..19c29bd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/BlockNuclearControlMain.java @@ -32,6 +32,10 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.world.BlockEvent.PlaceEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.tile.IWrenchable; +import ic2.core.item.tool.ItemToolPainter; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.*; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; @@ -42,10 +46,6 @@ import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRemoteThermo; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; import shedar.mods.ic2.nuclearcontrol.utils.*; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.tile.IWrenchable; -import ic2.core.item.tool.ItemToolPainter; public class BlockNuclearControlMain extends BlockContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/subblocks/Subblock.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/subblocks/Subblock.java index bfadaeb..552b3c0 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/subblocks/Subblock.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/blocks/subblocks/Subblock.java @@ -8,8 +8,8 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; -import shedar.mods.ic2.nuclearcontrol.ITextureHelper; import ic2.api.tile.IWrenchable; +import shedar.mods.ic2.nuclearcontrol.ITextureHelper; public abstract class Subblock { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/CrossModLoader.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/CrossModLoader.java index 843d11a..a1b3047 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/CrossModLoader.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/CrossModLoader.java @@ -1,12 +1,12 @@ package shedar.mods.ic2.nuclearcontrol.crossmod; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.event.FMLInterModComms; import shedar.mods.ic2.nuclearcontrol.crossmod.RF.CrossTE; import shedar.mods.ic2.nuclearcontrol.crossmod.appeng.CrossAppeng; import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.CrossBigReactors; import shedar.mods.ic2.nuclearcontrol.crossmod.mekanism.CrossMekanism; import shedar.mods.ic2.nuclearcontrol.crossmod.vanilla.Vanilla; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInterModComms; public class CrossModLoader { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossRF.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossRF.java index da2454d..c7a804d 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossRF.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossRF.java @@ -2,12 +2,12 @@ import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; public class CrossRF { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java index 45a6fb4..620c6b5 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/CrossTE.java @@ -2,10 +2,10 @@ import net.minecraft.item.Item; -import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; -import shedar.mods.ic2.nuclearcontrol.utils.NCLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; +import shedar.mods.ic2.nuclearcontrol.utils.NCLog; public class CrossTE { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/ItemCardRFEnergyLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/ItemCardRFEnergyLocation.java index e2f311b..cd8fbeb 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/ItemCardRFEnergyLocation.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/ItemCardRFEnergyLocation.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cofh.api.energy.IEnergyHandler; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; @@ -17,7 +18,6 @@ import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import cofh.api.energy.IEnergyHandler; public class ItemCardRFEnergyLocation extends ItemCardEnergySensorLocation { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityAverageCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityAverageCounter.java index e4eccb3..fc45848 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityAverageCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityAverageCounter.java @@ -4,10 +4,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; public class RFTileEntityAverageCounter extends TileEntityAverageCounter implements IEnergyHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityEnergyCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityEnergyCounter.java index 37f35e3..1672b32 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityEnergyCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/RF/RFTileEntityEnergyCounter.java @@ -4,10 +4,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; import cofh.api.energy.EnergyStorage; import cofh.api.energy.IEnergyHandler; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; public class RFTileEntityEnergyCounter extends TileEntityEnergyCounter implements IEnergyHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/BlockNetworkLink.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/BlockNetworkLink.java index 5167a74..32a0b6b 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/BlockNetworkLink.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/BlockNetworkLink.java @@ -9,10 +9,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import appeng.tile.networking.TileCableBus; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class BlockNetworkLink extends BlockContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/CrossAppeng.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/CrossAppeng.java index 349231a..b76cbbe 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/CrossAppeng.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/CrossAppeng.java @@ -3,12 +3,12 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; -import shedar.mods.ic2.nuclearcontrol.utils.NCLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; +import shedar.mods.ic2.nuclearcontrol.utils.NCLog; public class CrossAppeng { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemCardAppeng.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemCardAppeng.java index 5172db1..ca974fb 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemCardAppeng.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemCardAppeng.java @@ -11,6 +11,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import appeng.tile.crafting.TileCraftingMonitorTile; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; @@ -18,7 +19,6 @@ import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import appeng.tile.crafting.TileCraftingMonitorTile; public class ItemCardAppeng extends ItemCardEnergySensorLocation { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemKitAppeng.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemKitAppeng.java index 855c9ee..cf2629c 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemKitAppeng.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/ItemKitAppeng.java @@ -7,10 +7,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import appeng.block.crafting.BlockCraftingMonitor; import shedar.mods.ic2.nuclearcontrol.items.ItemKitEnergySensor; import shedar.mods.ic2.nuclearcontrol.utils.ItemStackUtils; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import appeng.block.crafting.BlockCraftingMonitor; public class ItemKitAppeng extends ItemKitEnergySensor { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/TileEntityNetworkLink.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/TileEntityNetworkLink.java index 84c2ad3..68910a3 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/TileEntityNetworkLink.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/appeng/TileEntityNetworkLink.java @@ -12,7 +12,6 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.utils.NCLog; import appeng.api.AEApi; import appeng.api.implementations.tiles.IChestOrDrive; import appeng.api.networking.GridFlags; @@ -31,6 +30,7 @@ import appeng.tile.grid.AENetworkTile; import appeng.tile.storage.TileChest; import appeng.tile.storage.TileDrive; +import shedar.mods.ic2.nuclearcontrol.utils.NCLog; public class TileEntityNetworkLink extends AENetworkTile { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/BlockActiveReactorInfoFetch.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/BlockActiveReactorInfoFetch.java index 988e3cb..645174b 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/BlockActiveReactorInfoFetch.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/BlockActiveReactorInfoFetch.java @@ -9,10 +9,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import erogenousbeef.bigreactors.common.multiblock.MultiblockReactor; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class BlockActiveReactorInfoFetch extends BlockContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/CrossBigReactors.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/CrossBigReactors.java index dd1f6a7..c977ddd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/CrossBigReactors.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/CrossBigReactors.java @@ -3,14 +3,14 @@ import net.minecraft.block.Block; import net.minecraft.item.Item; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.registry.GameRegistry; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.recipes.BigReactorsRecipesGregtech; import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.recipes.BigReactorsRecipesNew; import shedar.mods.ic2.nuclearcontrol.utils.NCLog; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.registry.GameRegistry; public class CrossBigReactors { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/ItemCardRFSensor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/ItemCardRFSensor.java index 3e89305..5360010 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/ItemCardRFSensor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/ItemCardRFSensor.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import erogenousbeef.bigreactors.common.multiblock.MultiblockReactor; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; @@ -17,7 +18,6 @@ import shedar.mods.ic2.nuclearcontrol.items.ItemCardEnergySensorLocation; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import erogenousbeef.bigreactors.common.multiblock.MultiblockReactor; public class ItemCardRFSensor extends ItemCardEnergySensorLocation { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesGregtech.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesGregtech.java index 0012758..6e17047 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesGregtech.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesGregtech.java @@ -3,9 +3,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.CrossBigReactors; import ic2.api.item.IC2Items; import ic2.api.recipe.Recipes; +import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.CrossBigReactors; public class BigReactorsRecipesGregtech { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesNew.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesNew.java index b3791af..cb0261c 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesNew.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/bigreactors/recipes/BigReactorsRecipesNew.java @@ -3,9 +3,9 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.CrossBigReactors; import ic2.api.item.IC2Items; import ic2.api.recipe.Recipes; +import shedar.mods.ic2.nuclearcontrol.crossmod.bigreactors.CrossBigReactors; public class BigReactorsRecipesNew { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/CrossGregTech.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/CrossGregTech.java index 9ef1e1c..8522305 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/CrossGregTech.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/CrossGregTech.java @@ -2,12 +2,12 @@ import net.minecraft.item.ItemStack; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.items.GT_RadioactiveCellIC_Item; import gregtech.api.items.GT_RadioactiveCell_Item; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; public class CrossGregTech { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java index 60cf067..78cc821 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/gregtech/GregtechRecipes.java @@ -6,16 +6,16 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import cpw.mods.fml.common.registry.GameRegistry; +import ic2.api.item.IC2Items; +import ic2.api.recipe.Recipes; +import ic2.core.util.StackUtil; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.StorageArrayRecipe; import shedar.mods.ic2.nuclearcontrol.items.ItemKitMultipleSensor; import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; import shedar.mods.ic2.nuclearcontrol.utils.LightDamages; -import cpw.mods.fml.common.registry.GameRegistry; -import ic2.api.item.IC2Items; -import ic2.api.recipe.Recipes; -import ic2.core.util.StackUtil; public class GregtechRecipes { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2Cross.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2Cross.java index eb8047e..c617e0c 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2Cross.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2Cross.java @@ -3,8 +3,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; import cpw.mods.fml.common.Loader; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; /** * diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2ExpCross.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2ExpCross.java index bfee29a..32771b0 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2ExpCross.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/ic2/IC2ExpCross.java @@ -3,7 +3,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; import ic2.api.tile.IEnergyStorage; import ic2.core.block.reactor.tileentity.TileEntityNuclearReactorElectric; import ic2.core.block.reactor.tileentity.TileEntityReactorAccessHatch; @@ -12,6 +11,7 @@ import ic2.core.item.reactor.ItemReactorMOX; import ic2.core.item.reactor.ItemReactorUranium; import ic2.core.item.tool.ItemToolWrench; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; /** * diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/mekanism/CrossMekanism.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/mekanism/CrossMekanism.java index c0ea568..300756d 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/mekanism/CrossMekanism.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/mekanism/CrossMekanism.java @@ -2,9 +2,9 @@ import net.minecraft.item.Item; -import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; +import shedar.mods.ic2.nuclearcontrol.crossmod.ModLib; public class CrossMekanism { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/CrossOpenComputers.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/CrossOpenComputers.java index e9aa17f..5ffac54 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/CrossOpenComputers.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/CrossOpenComputers.java @@ -1,7 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; -import li.cil.oc.api.Driver; import cpw.mods.fml.common.Loader; +import li.cil.oc.api.Driver; public class CrossOpenComputers { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAdvancedInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAdvancedInfoPanel.java index fba2fb9..7ccbbbd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAdvancedInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAdvancedInfoPanel.java @@ -1,5 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; +import net.minecraft.world.World; + import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; @@ -7,9 +9,6 @@ import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; - -import net.minecraft.world.World; - import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; /** diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAverageCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAverageCounter.java index c44b155..ee8cedd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAverageCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverAverageCounter.java @@ -1,5 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; +import net.minecraft.world.World; + import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; @@ -7,9 +9,6 @@ import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; - -import net.minecraft.world.World; - import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; /** diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverEnergyCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverEnergyCounter.java index d798ff8..4a7599a 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverEnergyCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverEnergyCounter.java @@ -1,5 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; +import net.minecraft.world.World; + import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; @@ -7,9 +9,6 @@ import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; - -import net.minecraft.world.World; - import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; public class DriverEnergyCounter extends DriverTileEntity { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverHowlerAlarm.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverHowlerAlarm.java index b93523c..4ebced6 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverHowlerAlarm.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverHowlerAlarm.java @@ -1,5 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; +import net.minecraft.world.World; + import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; @@ -7,9 +9,6 @@ import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; - -import net.minecraft.world.World; - import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; /** diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverInfoPanel.java index 1912787..542545e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverInfoPanel.java @@ -1,5 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; +import net.minecraft.world.World; + import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; @@ -7,9 +9,6 @@ import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; - -import net.minecraft.world.World; - import shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers.DriverAdvancedInfoPanel.Environment; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverThermalMonitor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverThermalMonitor.java index 3c388d7..6e31fbc 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverThermalMonitor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/opencomputers/DriverThermalMonitor.java @@ -1,5 +1,7 @@ package shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers; +import net.minecraft.world.World; + import li.cil.oc.api.driver.NamedBlock; import li.cil.oc.api.machine.Arguments; import li.cil.oc.api.machine.Callback; @@ -7,9 +9,6 @@ import li.cil.oc.api.network.ManagedEnvironment; import li.cil.oc.api.prefab.DriverTileEntity; import li.cil.oc.integration.ManagedTileEntityEnvironment; - -import net.minecraft.world.World; - import shedar.mods.ic2.nuclearcontrol.crossmod.opencomputers.DriverInfoPanel.Environment; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/AverageCounterProvider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/AverageCounterProvider.java index c05aac6..1774f3b 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/AverageCounterProvider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/AverageCounterProvider.java @@ -2,16 +2,15 @@ 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; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/EnergyCounterProvider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/EnergyCounterProvider.java index cc9e289..0662171 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/EnergyCounterProvider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/EnergyCounterProvider.java @@ -2,16 +2,15 @@ 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; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/HowlerAlarmProvider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/HowlerAlarmProvider.java index af57be0..dfb386f 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/HowlerAlarmProvider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/HowlerAlarmProvider.java @@ -2,16 +2,15 @@ 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; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityIndustrialAlarm; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/InfoPanelProvider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/InfoPanelProvider.java index 1f38b64..1ec27bd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/InfoPanelProvider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/InfoPanelProvider.java @@ -2,16 +2,15 @@ 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; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/ThermoProvider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/ThermoProvider.java index 96015a0..ecf02ed 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/ThermoProvider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/crossmod/waila/ThermoProvider.java @@ -2,16 +2,15 @@ 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; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/ConfigGui.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/ConfigGui.java index 83ebdbc..1fc16cb 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/ConfigGui.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/ConfigGui.java @@ -4,8 +4,8 @@ import net.minecraftforge.common.config.ConfigElement; import net.minecraftforge.common.config.Configuration; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import cpw.mods.fml.client.config.GuiConfig; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class ConfigGui extends GuiConfig { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAdvancedInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAdvancedInfoPanel.java index 1ddda0c..aa03432 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAdvancedInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAdvancedInfoPanel.java @@ -12,6 +12,10 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.core.IC2; +import ic2.core.network.NetworkManager; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.api.IAdvancedCardSettings; import shedar.mods.ic2.nuclearcontrol.api.ICardGui; @@ -25,10 +29,6 @@ import shedar.mods.ic2.nuclearcontrol.panel.CardSettingsWrapperImpl; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.core.IC2; -import ic2.core.network.NetworkManager; @SideOnly(Side.CLIENT) public class GuiAdvancedInfoPanel extends GuiInfoPanel { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAverageCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAverageCounter.java index 0cd0904..bac045c 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAverageCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiAverageCounter.java @@ -8,13 +8,13 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerAverageCounter; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; -import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerAverageCounter; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; +import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; @SideOnly(Side.CLIENT) public class GuiAverageCounter extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiEnergyCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiEnergyCounter.java index 04bce12..0cb1789 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiEnergyCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiEnergyCounter.java @@ -8,12 +8,12 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerEnergyCounter; -import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerEnergyCounter; +import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; @SideOnly(Side.CLIENT) public class GuiEnergyCounter extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiHowlerAlarm.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiHowlerAlarm.java index f182c64..75d9bd2 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiHowlerAlarm.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiHowlerAlarm.java @@ -9,13 +9,13 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.containers.ContainerEmpty; import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiHowlerAlarmListBox; import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiHowlerAlarmSlider; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiHowlerAlarm extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIC2Thermo.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIC2Thermo.java index 6a6c8cb..2ea92a1 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIC2Thermo.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIC2Thermo.java @@ -8,14 +8,14 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerEmpty; -import shedar.mods.ic2.nuclearcontrol.gui.controls.CompactButton; -import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiThermoInvertRedstone; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerEmpty; +import shedar.mods.ic2.nuclearcontrol.gui.controls.CompactButton; +import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiThermoInvertRedstone; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; @SideOnly(Side.CLIENT) public class GuiIC2Thermo extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIndustrialAlarm.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIndustrialAlarm.java index d0847e5..459ebea 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIndustrialAlarm.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiIndustrialAlarm.java @@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.containers.ContainerEmpty; import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiHowlerAlarmSlider; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiIndustrialAlarm extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiInfoPanel.java index 332dc0d..5b2c6db 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiInfoPanel.java @@ -17,6 +17,8 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.api.IAdvancedCardSettings; import shedar.mods.ic2.nuclearcontrol.api.ICardGui; @@ -32,8 +34,6 @@ import shedar.mods.ic2.nuclearcontrol.panel.CardSettingsWrapperImpl; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiInfoPanel extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiPanelSlope.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiPanelSlope.java index 5f3efe9..855aded 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiPanelSlope.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiPanelSlope.java @@ -5,10 +5,10 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; import cpw.mods.fml.client.FMLClientHandler; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; public class GuiPanelSlope extends GuiScreen { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRangeTrigger.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRangeTrigger.java index bb8e8ac..bc717f5 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRangeTrigger.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRangeTrigger.java @@ -9,13 +9,13 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.containers.ContainerRangeTrigger; import shedar.mods.ic2.nuclearcontrol.gui.controls.CompactButton; import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiRangeTriggerInvertRedstone; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiRangeTrigger extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRemoteThermo.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRemoteThermo.java index af3fcbb..1b4704e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRemoteThermo.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiRemoteThermo.java @@ -9,13 +9,13 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerRemoteThermo; -import shedar.mods.ic2.nuclearcontrol.gui.controls.CompactButton; -import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiThermoInvertRedstone; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerRemoteThermo; +import shedar.mods.ic2.nuclearcontrol.gui.controls.CompactButton; +import shedar.mods.ic2.nuclearcontrol.gui.controls.GuiThermoInvertRedstone; @SideOnly(Side.CLIENT) public class GuiRemoteThermo extends GuiContainer { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiScreenColor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiScreenColor.java index f93964d..a9c5324 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiScreenColor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/GuiScreenColor.java @@ -5,10 +5,10 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.FMLClientHandler; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.client.FMLClientHandler; public class GuiScreenColor extends GuiScreen { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmListBox.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmListBox.java index c8c6da4..6a9300e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmListBox.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmListBox.java @@ -11,11 +11,11 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; @SideOnly(Side.CLIENT) public class GuiHowlerAlarmListBox extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmSlider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmSlider.java index 0f40984..e7d596d 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmSlider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiHowlerAlarmSlider.java @@ -6,12 +6,12 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; @SideOnly(Side.CLIENT) public class GuiHowlerAlarmSlider extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelCheckBox.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelCheckBox.java index 3e32ae2..086fa75 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelCheckBox.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelCheckBox.java @@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class GuiInfoPanelCheckBox extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelShowLabels.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelShowLabels.java index dfcbeda..58e797d 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelShowLabels.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiInfoPanelShowLabels.java @@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; @SideOnly(Side.CLIENT) public class GuiInfoPanelShowLabels extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRangeTriggerInvertRedstone.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRangeTriggerInvertRedstone.java index 595db09..5f46529 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRangeTriggerInvertRedstone.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRangeTriggerInvertRedstone.java @@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger; @SideOnly(Side.CLIENT) public class GuiRangeTriggerInvertRedstone extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRemoteThermoSlider.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRemoteThermoSlider.java index 6f191a6..c925a8b 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRemoteThermoSlider.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiRemoteThermoSlider.java @@ -8,11 +8,11 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; @SideOnly(Side.CLIENT) public class GuiRemoteThermoSlider extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiThermoInvertRedstone.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiThermoInvertRedstone.java index 3646a68..43b29a9 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiThermoInvertRedstone.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/gui/controls/GuiThermoInvertRedstone.java @@ -6,11 +6,11 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityThermo; @SideOnly(Side.CLIENT) public class GuiThermoInvertRedstone extends GuiButton { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCard55Reactor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCard55Reactor.java index 52e846d..78692a6 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCard55Reactor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCard55Reactor.java @@ -10,6 +10,9 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import ic2.api.item.IC2Items; +import ic2.api.reactor.IReactor; +import ic2.api.reactor.IReactorChamber; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; @@ -19,9 +22,6 @@ import shedar.mods.ic2.nuclearcontrol.crossmod.ic2.IC2Cross.ReactorInfo; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import ic2.api.item.IC2Items; -import ic2.api.reactor.IReactor; -import ic2.api.reactor.IReactorChamber; public class ItemCard55Reactor extends ItemCardEnergySensorLocation implements IRemoteSensor { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergyArrayLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergyArrayLocation.java index ccafba1..9025c9e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergyArrayLocation.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergyArrayLocation.java @@ -12,6 +12,8 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; @@ -21,8 +23,6 @@ import shedar.mods.ic2.nuclearcontrol.utils.EnergyStorageHelper; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCardEnergyArrayLocation extends ItemCardBase { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergySensorLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergySensorLocation.java index 7c05d25..00fc3a7 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergySensorLocation.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardEnergySensorLocation.java @@ -11,14 +11,14 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.api.*; import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; import shedar.mods.ic2.nuclearcontrol.utils.EnergyStorageHelper; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCardEnergySensorLocation extends ItemCardBase implements IRemoteSensor, IRangeTriggerable { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardLiquidArrayLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardLiquidArrayLocation.java index ab69295..9f215f9 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardLiquidArrayLocation.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardLiquidArrayLocation.java @@ -14,6 +14,8 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidTankInfo; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; @@ -22,8 +24,6 @@ import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.LiquidStorageHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCardLiquidArrayLocation extends ItemCardBase { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardMultipleSensorLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardMultipleSensorLocation.java index 432e425..7a5ffd7 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardMultipleSensorLocation.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardMultipleSensorLocation.java @@ -18,6 +18,10 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidTankInfo; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.energy.EnergyNet; +import ic2.core.block.generator.tileentity.TileEntityBaseGenerator; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.IPanelMultiCard; @@ -33,10 +37,6 @@ import shedar.mods.ic2.nuclearcontrol.utils.LiquidStorageHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; import shedar.mods.ic2.nuclearcontrol.utils.TextureResolver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.energy.EnergyNet; -import ic2.core.block.generator.tileentity.TileEntityBaseGenerator; public class ItemCardMultipleSensorLocation extends ItemCardBase implements IRemoteSensor, IPanelMultiCard, IRangeTriggerable { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardReactorSensorLocation.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardReactorSensorLocation.java index a8508bf..1fc1cbb 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardReactorSensorLocation.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardReactorSensorLocation.java @@ -12,6 +12,9 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import ic2.api.reactor.IReactor; import shedar.mods.ic2.nuclearcontrol.api.CardHelper; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; @@ -21,9 +24,6 @@ import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import ic2.api.reactor.IReactor; public class ItemCardReactorSensorLocation extends ItemCardBase implements IRemoteSensor { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardText.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardText.java index 55e697f..b19e37c 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardText.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemCardText.java @@ -9,6 +9,8 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.api.CardHelper; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.IAdvancedCardSettings; @@ -17,8 +19,6 @@ import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; import shedar.mods.ic2.nuclearcontrol.api.PanelString; import shedar.mods.ic2.nuclearcontrol.gui.GuiCardText; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemCardText extends ItemCardBase implements IAdvancedCardSettings { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitMultipleSensor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitMultipleSensor.java index f598ae1..66f5de5 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitMultipleSensor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitMultipleSensor.java @@ -12,12 +12,12 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidTankInfo; +import ic2.core.block.generator.tileentity.TileEntityBaseGenerator; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; import shedar.mods.ic2.nuclearcontrol.utils.LiquidStorageHelper; import shedar.mods.ic2.nuclearcontrol.utils.TextureResolver; -import ic2.core.block.generator.tileentity.TileEntityBaseGenerator; public class ItemKitMultipleSensor extends ItemSensorKitBase { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitReactorSensor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitReactorSensor.java index 7014178..ee4d026 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitReactorSensor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemKitReactorSensor.java @@ -8,14 +8,14 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.utils.ItemStackUtils; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import ic2.api.item.IC2Items; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorChamber; import ic2.core.Ic2Items; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.utils.ItemStackUtils; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; public class ItemKitReactorSensor extends ItemSensorKitBase { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemNuclearControlMain.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemNuclearControlMain.java index a0459ee..68bee03 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemNuclearControlMain.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemNuclearControlMain.java @@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlMain; import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.Subblock; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemNuclearControlMain extends ItemBlock { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemPanelMemoryCard.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemPanelMemoryCard.java index ee0a0b8..b733838 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemPanelMemoryCard.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemPanelMemoryCard.java @@ -12,11 +12,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.TextureResolver; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemPanelMemoryCard extends Item { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemRemoteMonitor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemRemoteMonitor.java index 8e1d404..74ff1d2 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemRemoteMonitor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemRemoteMonitor.java @@ -9,11 +9,11 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.InventoryItem; import shedar.mods.ic2.nuclearcontrol.gui.GuiRemoteMonitor; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemRemoteMonitor extends Item { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemTimeCard.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemTimeCard.java index b3cac4d..ac1b754 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemTimeCard.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemTimeCard.java @@ -7,13 +7,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.client.FMLClientHandler; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.ICardWrapper; import shedar.mods.ic2.nuclearcontrol.api.PanelSetting; import shedar.mods.ic2.nuclearcontrol.api.PanelString; import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import shedar.mods.ic2.nuclearcontrol.utils.StringUtils; -import cpw.mods.fml.client.FMLClientHandler; public class ItemTimeCard extends ItemCardBase { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolDigitalThermometer.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolDigitalThermometer.java index f446f77..e295726 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolDigitalThermometer.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolDigitalThermometer.java @@ -7,13 +7,13 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import shedar.mods.ic2.nuclearcontrol.utils.TextureResolver; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; import ic2.api.reactor.IReactor; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; +import shedar.mods.ic2.nuclearcontrol.utils.TextureResolver; public class ItemToolDigitalThermometer extends ItemToolThermometer implements IElectricItem { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolThermometer.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolThermometer.java index 2816dee..b66ac90 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolThermometer.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/items/ItemToolThermometer.java @@ -6,12 +6,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import ic2.api.reactor.IReactor; +import ic2.api.reactor.IReactorChamber; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import shedar.mods.ic2.nuclearcontrol.utils.TextureResolver; -import ic2.api.reactor.IReactor; -import ic2.api.reactor.IReactorChamber; public class ItemToolThermometer extends Item { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/ChannelHandler.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/ChannelHandler.java index 7c71292..512e1eb 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/ChannelHandler.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/ChannelHandler.java @@ -1,9 +1,9 @@ package shedar.mods.ic2.nuclearcontrol.network; -import shedar.mods.ic2.nuclearcontrol.network.message.*; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import shedar.mods.ic2.nuclearcontrol.network.message.*; public class ChannelHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAcounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAcounter.java index 8e77f42..348ec4c 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAcounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAcounter.java @@ -2,12 +2,12 @@ import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; public class PacketAcounter implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAlarm.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAlarm.java index 6824a8b..e95d1eb 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAlarm.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketAlarm.java @@ -3,12 +3,12 @@ import java.util.ArrayList; import java.util.Arrays; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class PacketAlarm implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketChat.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketChat.java index 817c421..324d1bf 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketChat.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketChat.java @@ -6,13 +6,13 @@ import net.minecraft.util.ChatComponentText; -import shedar.mods.ic2.nuclearcontrol.ClientProxy; -import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.ClientProxy; +import shedar.mods.ic2.nuclearcontrol.utils.LangHelper; public class PacketChat implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientColor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientColor.java index 4928a59..1e2252e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientColor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientColor.java @@ -3,12 +3,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerInfoPanel; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerInfoPanel; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; public class PacketClientColor implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientDisplaySettings.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientDisplaySettings.java index c0c4091..afae6cc 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientDisplaySettings.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientDisplaySettings.java @@ -3,12 +3,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerInfoPanel; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerInfoPanel; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; public class PacketClientDisplaySettings implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRangeTrigger.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRangeTrigger.java index 5e97744..95abe3a 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRangeTrigger.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRangeTrigger.java @@ -3,12 +3,12 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import shedar.mods.ic2.nuclearcontrol.containers.ContainerRangeTrigger; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.containers.ContainerRangeTrigger; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityRangeTrigger; public class PacketClientRangeTrigger implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRemoteMonitor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRemoteMonitor.java index d8495f6..37b8a45 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRemoteMonitor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRemoteMonitor.java @@ -10,11 +10,6 @@ import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.InventoryItem; -import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; -import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; @@ -22,6 +17,11 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.InventoryItem; +import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; +import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; public class PacketClientRemoteMonitor implements IMessage { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRequest.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRequest.java index 5156681..3426a1b 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRequest.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientRequest.java @@ -1,10 +1,10 @@ package shedar.mods.ic2.nuclearcontrol.network.message; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; public class PacketClientRequest implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSensor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSensor.java index 9d9d810..399a06d 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSensor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSensor.java @@ -7,17 +7,17 @@ import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; import shedar.mods.ic2.nuclearcontrol.containers.ContainerInfoPanel; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; public class PacketClientSensor implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSound.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSound.java index 7d81128..6203988 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSound.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketClientSound.java @@ -5,6 +5,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; import shedar.mods.ic2.nuclearcontrol.containers.ContainerEmpty; import shedar.mods.ic2.nuclearcontrol.containers.ContainerInfoPanel; @@ -12,11 +17,6 @@ import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityHowlerAlarm; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; public class PacketClientSound implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsAll.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsAll.java index b3802f7..3f179ad 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsAll.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsAll.java @@ -6,12 +6,12 @@ import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; public class PacketDispSettingsAll implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsUpdate.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsUpdate.java index 73ec48e..57e40d9 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsUpdate.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketDispSettingsUpdate.java @@ -4,12 +4,12 @@ import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; public class PacketDispSettingsUpdate implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketEncounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketEncounter.java index 3188282..cb71f1d 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketEncounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketEncounter.java @@ -2,12 +2,12 @@ import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; public class PacketEncounter implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensor.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensor.java index 188c5c6..1446d64 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensor.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensor.java @@ -14,17 +14,17 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; -import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; +import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; public class PacketSensor implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensorTitle.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensorTitle.java index dc37696..e90df15 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensorTitle.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketSensorTitle.java @@ -3,15 +3,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; -import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; +import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; public class PacketSensorTitle implements IMessage, IMessageHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketServerUpdate.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketServerUpdate.java index 023fdcc..4307171 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketServerUpdate.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/network/message/PacketServerUpdate.java @@ -6,17 +6,17 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.util.ChunkCoordinates; +import cpw.mods.fml.common.network.ByteBufUtils; +import cpw.mods.fml.common.network.simpleimpl.IMessage; +import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import io.netty.buffer.ByteBuf; import shedar.mods.ic2.nuclearcontrol.api.CardState; import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; import shedar.mods.ic2.nuclearcontrol.api.IRemoteSensor; import shedar.mods.ic2.nuclearcontrol.containers.ContainerRemoteMonitor; import shedar.mods.ic2.nuclearcontrol.items.ItemCardBase; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; -import cpw.mods.fml.common.network.ByteBufUtils; -import cpw.mods.fml.common.network.simpleimpl.IMessage; -import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; -import cpw.mods.fml.common.network.simpleimpl.MessageContext; -import io.netty.buffer.ByteBuf; public class PacketServerUpdate implements IMessage { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/CardSettingsWrapperImpl.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/CardSettingsWrapperImpl.java index fb7956b..0c65bed 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/CardSettingsWrapperImpl.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/CardSettingsWrapperImpl.java @@ -6,12 +6,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import cpw.mods.fml.client.FMLClientHandler; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.api.ICardSettingsWrapper; import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; import shedar.mods.ic2.nuclearcontrol.gui.GuiInfoPanel; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; -import cpw.mods.fml.client.FMLClientHandler; public class CardSettingsWrapperImpl implements ICardSettingsWrapper { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/ScreenManager.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/ScreenManager.java index 7eb559e..44496d6 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/ScreenManager.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/ScreenManager.java @@ -10,13 +10,13 @@ import net.minecraft.util.Facing; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.IScreenPart; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanelExtender; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanelExtender; -import cpw.mods.fml.common.FMLCommonHandler; public class ScreenManager { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/HttpCardSender.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/HttpCardSender.java index c28d6c8..89e17e6 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/HttpCardSender.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/HttpCardSender.java @@ -15,10 +15,10 @@ import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import argo.jdom.JsonNodeBuilder; import argo.jdom.JsonNodeBuilders; import argo.jdom.JsonObjectNodeBuilder; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class HttpCardSender { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/Request.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/Request.java index da8bfd3..77503fd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/Request.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/panel/http/Request.java @@ -10,13 +10,13 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import argo.format.CompactJsonFormatter; import argo.format.JsonFormatter; import argo.jdom.JsonArrayNodeBuilder; import argo.jdom.JsonNodeBuilder; import argo.jdom.JsonNodeBuilders; import argo.jdom.JsonObjectNodeBuilder; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class Request implements Runnable { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesNew.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesNew.java index e8473e7..d2d8e72 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesNew.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesNew.java @@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import ic2.api.item.IC2Items; +import ic2.api.recipe.Recipes; +import ic2.core.util.StackUtil; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.StorageArrayRecipe; import shedar.mods.ic2.nuclearcontrol.items.ItemKitMultipleSensor; import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; import shedar.mods.ic2.nuclearcontrol.utils.LightDamages; -import ic2.api.item.IC2Items; -import ic2.api.recipe.Recipes; -import ic2.core.util.StackUtil; public class RecipesNew { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesOld.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesOld.java index aaa1a54..d363abd 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesOld.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/recipes/RecipesOld.java @@ -5,15 +5,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; +import ic2.api.item.IC2Items; +import ic2.api.recipe.Recipes; +import ic2.core.util.StackUtil; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.StorageArrayRecipe; import shedar.mods.ic2.nuclearcontrol.items.ItemKitMultipleSensor; import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; import shedar.mods.ic2.nuclearcontrol.utils.LightDamages; -import ic2.api.item.IC2Items; -import ic2.api.recipe.Recipes; -import ic2.core.util.StackUtil; public class RecipesOld { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/MainBlockRenderer.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/MainBlockRenderer.java index 74bfc51..6abdc38 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/MainBlockRenderer.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/MainBlockRenderer.java @@ -8,6 +8,9 @@ import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.IRotation; import shedar.mods.ic2.nuclearcontrol.blocks.BlockNuclearControlMain; @@ -15,9 +18,6 @@ import shedar.mods.ic2.nuclearcontrol.renderers.model.ModelInfoPanel; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanelExtender; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) public class MainBlockRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/model/ModelInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/model/ModelInfoPanel.java index e0ec3b9..fa842a3 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/model/ModelInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/renderers/model/ModelInfoPanel.java @@ -10,10 +10,10 @@ import org.lwjgl.opengl.GL11; -import shedar.mods.ic2.nuclearcontrol.panel.Screen; -import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import shedar.mods.ic2.nuclearcontrol.panel.Screen; +import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAdvancedInfoPanel; @SideOnly(Side.CLIENT) public class ModelInfoPanel { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAdvancedInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAdvancedInfoPanel.java index 5d3b6ff..ce6b4ba 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAdvancedInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAdvancedInfoPanel.java @@ -7,11 +7,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import ic2.core.IC2; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.api.IPanelDataSource; import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; -import ic2.core.IC2; public class TileEntityAdvancedInfoPanel extends TileEntityInfoPanel { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAverageCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAverageCounter.java index 21b9678..7bba423 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAverageCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityAverageCounter.java @@ -15,11 +15,6 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; -import shedar.mods.ic2.nuclearcontrol.crossmod.ic2.IC2Type; -import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; import cpw.mods.fml.common.FMLCommonHandler; import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; @@ -32,6 +27,11 @@ import ic2.api.tile.IWrenchable; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; +import shedar.mods.ic2.nuclearcontrol.crossmod.ic2.IC2Type; +import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; public class TileEntityAverageCounter extends TileEntity implements IEnergyConductor, IWrenchable, INetworkClientTileEntityEventListener, IInventory, ISlotItemFilter, diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityEnergyCounter.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityEnergyCounter.java index 177ec8e..3b6fcb6 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityEnergyCounter.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityEnergyCounter.java @@ -15,10 +15,6 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter; -import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; -import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; import cpw.mods.fml.common.FMLCommonHandler; import ic2.api.energy.EnergyNet; import ic2.api.energy.event.EnergyTileLoadEvent; @@ -31,6 +27,10 @@ import ic2.api.tile.IWrenchable; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter; +import shedar.mods.ic2.nuclearcontrol.crossmod.EnergyStorageData; +import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; public class TileEntityEnergyCounter extends TileEntity implements IEnergyConductor, IWrenchable, INetworkClientTileEntityEventListener, IInventory, ISlotItemFilter, diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityHowlerAlarm.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityHowlerAlarm.java index 96cb052..bd47dba 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityHowlerAlarm.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityHowlerAlarm.java @@ -11,10 +11,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Facing; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.IRedstoneConsumer; -import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; -import shedar.mods.ic2.nuclearcontrol.utils.RedstoneHelper; import cpw.mods.fml.common.FMLCommonHandler; import ic2.api.network.INetworkClientTileEntityEventListener; import ic2.api.network.INetworkDataProvider; @@ -23,6 +19,10 @@ import ic2.core.IC2; import ic2.core.network.ClientModifiable; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.IRedstoneConsumer; +import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; +import shedar.mods.ic2.nuclearcontrol.utils.RedstoneHelper; public class TileEntityHowlerAlarm extends TileEntity implements INetworkDataProvider, INetworkUpdateListener, IWrenchable, IRedstoneConsumer, INetworkClientTileEntityEventListener { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanel.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanel.java index 9fa2527..fc70525 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanel.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanel.java @@ -17,6 +17,13 @@ import net.minecraft.util.Facing; import net.minecraftforge.common.util.Constants; +import cpw.mods.fml.common.FMLCommonHandler; +import ic2.api.network.INetworkClientTileEntityEventListener; +import ic2.api.network.INetworkDataProvider; +import ic2.api.network.INetworkUpdateListener; +import ic2.api.tile.IWrenchable; +import ic2.core.IC2; +import ic2.core.network.NetworkManager; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.IRedstoneConsumer; import shedar.mods.ic2.nuclearcontrol.IRotation; @@ -37,13 +44,6 @@ import shedar.mods.ic2.nuclearcontrol.utils.ColorUtil; import shedar.mods.ic2.nuclearcontrol.utils.NuclearNetworkHelper; import shedar.mods.ic2.nuclearcontrol.utils.RedstoneHelper; -import cpw.mods.fml.common.FMLCommonHandler; -import ic2.api.network.INetworkClientTileEntityEventListener; -import ic2.api.network.INetworkDataProvider; -import ic2.api.network.INetworkUpdateListener; -import ic2.api.tile.IWrenchable; -import ic2.core.IC2; -import ic2.core.network.NetworkManager; public class TileEntityInfoPanel extends TileEntity implements ISlotItemFilter, INetworkDataProvider, INetworkUpdateListener, INetworkClientTileEntityEventListener, diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanelExtender.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanelExtender.java index 42b129d..f655be6 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanelExtender.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityInfoPanelExtender.java @@ -9,6 +9,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Facing; +import cpw.mods.fml.common.FMLCommonHandler; +import ic2.api.network.INetworkDataProvider; +import ic2.api.network.INetworkUpdateListener; +import ic2.api.tile.IWrenchable; +import ic2.core.IC2; +import ic2.core.network.NetworkManager; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.IRotation; import shedar.mods.ic2.nuclearcontrol.IScreenPart; @@ -16,12 +22,6 @@ import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.InfoPanel; import shedar.mods.ic2.nuclearcontrol.panel.Screen; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; -import cpw.mods.fml.common.FMLCommonHandler; -import ic2.api.network.INetworkDataProvider; -import ic2.api.network.INetworkUpdateListener; -import ic2.api.tile.IWrenchable; -import ic2.core.IC2; -import ic2.core.network.NetworkManager; public class TileEntityInfoPanelExtender extends TileEntity implements INetworkDataProvider, INetworkUpdateListener, IWrenchable, ITextureHelper, IScreenPart, IRotation { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRangeTrigger.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRangeTrigger.java index 95f23f9..77315f7 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRangeTrigger.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRangeTrigger.java @@ -14,6 +14,14 @@ import net.minecraft.util.Facing; import net.minecraftforge.common.util.Constants; +import cpw.mods.fml.common.FMLCommonHandler; +import ic2.api.network.INetworkClientTileEntityEventListener; +import ic2.api.network.INetworkDataProvider; +import ic2.api.network.INetworkUpdateListener; +import ic2.api.tile.IWrenchable; +import ic2.core.IC2; +import ic2.core.network.ClientModifiable; +import ic2.core.network.NetworkManager; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.IRotation; import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter; @@ -23,14 +31,6 @@ import shedar.mods.ic2.nuclearcontrol.items.ItemUpgrade; import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; -import cpw.mods.fml.common.FMLCommonHandler; -import ic2.api.network.INetworkClientTileEntityEventListener; -import ic2.api.network.INetworkDataProvider; -import ic2.api.network.INetworkUpdateListener; -import ic2.api.tile.IWrenchable; -import ic2.core.IC2; -import ic2.core.network.ClientModifiable; -import ic2.core.network.NetworkManager; public class TileEntityRangeTrigger extends TileEntity implements ISlotItemFilter, INetworkDataProvider, INetworkUpdateListener, IWrenchable, ITextureHelper, diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRemoteThermo.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRemoteThermo.java index bf26a78..5906520 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRemoteThermo.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityRemoteThermo.java @@ -14,6 +14,14 @@ import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; +import ic2.api.energy.event.EnergyTileLoadEvent; +import ic2.api.energy.event.EnergyTileUnloadEvent; +import ic2.api.energy.tile.IEnergySink; +import ic2.api.item.ElectricItem; +import ic2.api.item.IC2Items; +import ic2.api.item.IElectricItem; +import ic2.api.reactor.IReactor; +import ic2.core.IC2; import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import shedar.mods.ic2.nuclearcontrol.IRotation; import shedar.mods.ic2.nuclearcontrol.ISlotItemFilter; @@ -23,14 +31,6 @@ import shedar.mods.ic2.nuclearcontrol.panel.CardWrapperImpl; import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; -import ic2.api.energy.event.EnergyTileLoadEvent; -import ic2.api.energy.event.EnergyTileUnloadEvent; -import ic2.api.energy.tile.IEnergySink; -import ic2.api.item.ElectricItem; -import ic2.api.item.IC2Items; -import ic2.api.item.IElectricItem; -import ic2.api.reactor.IReactor; -import ic2.core.IC2; public class TileEntityRemoteThermo extends TileEntityThermo implements IEnergySink, ISlotItemFilter, IRotation, IInventory { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityThermo.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityThermo.java index 88d6bd1..0d5022e 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityThermo.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/tileentities/TileEntityThermo.java @@ -10,12 +10,6 @@ import net.minecraft.util.Facing; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.ITextureHelper; -import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.ThermalMonitor; -import shedar.mods.ic2.nuclearcontrol.items.ItemCard55Reactor; -import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; -import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; import ic2.api.network.INetworkClientTileEntityEventListener; import ic2.api.network.INetworkDataProvider; import ic2.api.network.INetworkUpdateListener; @@ -24,6 +18,12 @@ import ic2.api.tile.IWrenchable; import ic2.core.IC2; import ic2.core.network.NetworkManager; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.ITextureHelper; +import shedar.mods.ic2.nuclearcontrol.blocks.subblocks.ThermalMonitor; +import shedar.mods.ic2.nuclearcontrol.items.ItemCard55Reactor; +import shedar.mods.ic2.nuclearcontrol.utils.BlockDamages; +import shedar.mods.ic2.nuclearcontrol.utils.NuclearHelper; public class TileEntityThermo extends TileEntity implements INetworkDataProvider, INetworkUpdateListener, INetworkClientTileEntityEventListener, IWrenchable, ITextureHelper { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearHelper.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearHelper.java index aa9b3c7..c7bf9ba 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearHelper.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearHelper.java @@ -6,9 +6,9 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; import ic2.api.reactor.IReactor; import ic2.api.reactor.IReactorChamber; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; public class NuclearHelper { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearNetworkHelper.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearNetworkHelper.java index 79b0374..90e27ed 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearNetworkHelper.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/NuclearNetworkHelper.java @@ -11,13 +11,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.simpleimpl.IMessage; import shedar.mods.ic2.nuclearcontrol.network.ChannelHandler; import shedar.mods.ic2.nuclearcontrol.network.message.*; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityAverageCounter; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityEnergyCounter; import shedar.mods.ic2.nuclearcontrol.tileentities.TileEntityInfoPanel; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.simpleimpl.IMessage; public class NuclearNetworkHelper { diff --git a/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/WrenchHelper.java b/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/WrenchHelper.java index b9ce848..33558de 100644 --- a/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/WrenchHelper.java +++ b/src/main/java/shedar/mods/ic2/nuclearcontrol/utils/WrenchHelper.java @@ -4,10 +4,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; -import shedar.mods.ic2.nuclearcontrol.IRotation; import cpw.mods.fml.common.FMLCommonHandler; import ic2.api.tile.IWrenchable; +import shedar.mods.ic2.nuclearcontrol.IC2NuclearControl; +import shedar.mods.ic2.nuclearcontrol.IRotation; public class WrenchHelper {