diff --git a/.gitignore b/.gitignore index 558ad12..40fb5e4 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ whitelist.json *.ipr *.iws src/main/resources/mixins.*.json +*.bat diff --git a/build.gradle b/build.gradle index acc75f9..e8241ee 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1675859611 +//version: 1683373797 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,31 +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 cpw.mods.fml.relauncher.Side -import org.gradle.api.tasks.options.Option; import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory -import org.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 -import javax.inject.Inject buildscript { repositories { - mavenLocal() mavenCentral() maven { @@ -51,6 +48,8 @@ buildscript { name 'Scala CI dependencies' url 'https://repo1.maven.org/maven2/' } + + mavenLocal() } } plugins { @@ -62,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.5' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.7' } + +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' } @@ -126,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') @@ -147,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 { @@ -187,6 +201,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -200,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) { 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 } @@ -216,7 +240,7 @@ if (enableModernJavaSyntax.toBoolean()) { javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) }) } } @@ -248,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) { @@ -381,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", @@ -415,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 @@ -444,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 @@ -490,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()) { @@ -529,29 +567,49 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.6" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" + 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.12: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.12') + 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.12: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' @@ -656,17 +714,22 @@ ext.java17Toolchain = (JavaToolchainSpec spec) -> { spec.vendor.set(JvmVendorSpec.matching("jetbrains")) } -ext.java17DependenciesCfg = configurations.create("java17Dependencies") -ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") +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.1.21' + 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.0.31') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -677,14 +740,14 @@ dependencies { 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") + java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} } ext.java17JvmArgs = [ // Java 9+ support "--illegal-access=warn", - "-Dfile.encoding=UTF-8", "-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", @@ -695,6 +758,7 @@ ext.java17JvmArgs = [ "--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", @@ -739,8 +803,8 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } @Inject - public RunHotswappableMinecraftTask(Side side, String superTask) { - super(side) + 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) @@ -748,7 +812,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) this.classpath(project.java17PatchDependenciesCfg) - if (side == Side.CLIENT) { + if (side == Distribution.CLIENT) { this.classpath(project.minecraftTasks.lwjgl3Configuration) } // Use a raw provider instead of map to not create a dependency on the task @@ -757,23 +821,21 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 } this.classpath(project.java17DependenciesCfg) - - if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) { - this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") - } } } -def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient") +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") runClient17Task.configure { setup(project) group = "Modded Minecraft" 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, Side.SERVER, "runServer") +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") runServer17Task.configure { setup(project) group = "Modded Minecraft" @@ -814,11 +876,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()) @@ -833,8 +890,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() @@ -894,6 +952,19 @@ idea { } 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"] @@ -932,7 +1003,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(' ') @@ -943,7 +1014,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(' ') @@ -955,11 +1026,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 = """ + + + + + +""" + } + } + } } } } @@ -1029,7 +1146,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) @@ -1073,7 +1190,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) @@ -1107,10 +1224,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 @@ -1123,6 +1251,22 @@ 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.") } } @@ -1263,7 +1407,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 { @@ -1305,11 +1449,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. @@ -1317,34 +1457,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 @@ -1352,50 +1465,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 2a5bd0f..2dc8061 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.48-GTNH:dev') shadowImplementation('au.com.bytecode:opencsv:2.4') } 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/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index 61c3abf..15e9db5 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -2,18 +2,6 @@ package mcp.mobius.waila; import java.lang.reflect.Field; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.client.KeyEvent; -import mcp.mobius.waila.commands.CommandDumpHandlers; -import mcp.mobius.waila.network.NetworkHandler; -import mcp.mobius.waila.network.WailaPacketHandler; -import mcp.mobius.waila.overlay.DecoratorRenderer; -import mcp.mobius.waila.overlay.OverlayConfig; -import mcp.mobius.waila.overlay.WailaTickHandler; -import mcp.mobius.waila.server.ProxyServer; -import mcp.mobius.waila.utils.ModIdentification; - import net.minecraftforge.common.MinecraftForge; import org.apache.logging.log4j.LogManager; @@ -36,6 +24,17 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.relauncher.Side; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.client.KeyEvent; +import mcp.mobius.waila.commands.CommandDumpHandlers; +import mcp.mobius.waila.network.NetworkHandler; +import mcp.mobius.waila.network.WailaPacketHandler; +import mcp.mobius.waila.overlay.DecoratorRenderer; +import mcp.mobius.waila.overlay.OverlayConfig; +import mcp.mobius.waila.overlay.WailaTickHandler; +import mcp.mobius.waila.server.ProxyServer; +import mcp.mobius.waila.utils.ModIdentification; @Mod( modid = "Waila", diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java index 237d99e..b0ae7eb 100644 --- a/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/AgricultureModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.agriculture; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class AgricultureModule { public static Class BlockCrop = null; diff --git a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java index 74061ac..b8bdb1d 100644 --- a/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java +++ b/src/main/java/mcp/mobius/waila/addons/agriculture/HUDHandlerCrop.java @@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.agriculture; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerCrop implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java index 7b0cffc..8fb07fb 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/BCModule.java @@ -2,13 +2,13 @@ package mcp.mobius.waila.addons.buildcraft; import java.lang.reflect.Method; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - import net.minecraftforge.common.util.ForgeDirection; import org.apache.logging.log4j.Level; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + public class BCModule { public static Class TileTank = null; diff --git a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java index 0108052..ea6bbc3 100644 --- a/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java +++ b/src/main/java/mcp/mobius/waila/addons/buildcraft/HUDHandlerBCTanks.java @@ -2,13 +2,6 @@ package mcp.mobius.waila.addons.buildcraft; import java.util.List; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.cbcore.LangUtil; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,6 +13,13 @@ import net.minecraftforge.fluids.FluidTankInfo; import org.apache.logging.log4j.Level; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerBCTanks implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java index cfec4a0..f573d03 100644 --- a/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java +++ b/src/main/java/mcp/mobius/waila/addons/carpenters/HUDCarpentersBlocksTE.java @@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.carpenters; 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; + public class HUDCarpentersBlocksTE implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java index 6c6ef70..1205210 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/EnderIOModule.java @@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.enderio; import java.lang.reflect.Method; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class EnderIOModule { public static Class TileCapacitorBank = null; diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java index 3f74e31..7f44627 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerCapacitor.java @@ -4,18 +4,18 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - 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 mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerCapacitor implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java index 8ca60ed..86d567c 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/enderio/HUDHandlerTesseract.java @@ -4,17 +4,17 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerTesseract implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java index b9ac7d0..2ff623f 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/EnderStorageModule.java @@ -3,11 +3,11 @@ package mcp.mobius.waila.addons.enderstorage; import java.lang.reflect.Field; import java.lang.reflect.Method; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class EnderStorageModule { public static Class TileFrequencyOwner = null; diff --git a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java index e6df47b..aa2cb0e 100644 --- a/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java +++ b/src/main/java/mcp/mobius/waila/addons/enderstorage/HUDHandlerStorage.java @@ -2,18 +2,18 @@ package mcp.mobius.waila.addons.enderstorage; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - 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 mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerStorage implements IWailaDataProvider { private static String[] colors = { LangUtil.translateG("hud.msg.white"), LangUtil.translateG("hud.msg.orange"), diff --git a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java index b67bbd9..183ad01 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/ETBModule.java @@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.etb; import java.lang.reflect.Field; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class ETBModule { public static Class TileSocket = null; diff --git a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java index a859cbe..326475a 100644 --- a/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java +++ b/src/main/java/mcp/mobius/waila/addons/etb/HUDHandlerSocket.java @@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.etb; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -15,6 +10,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerSocket implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java index e25e56f..0fcb97a 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/ExtraUtilitiesModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.exu; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class ExtraUtilitiesModule { public static Class ModExtraUtilities = null; diff --git a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java index 8938cca..b18bfad 100644 --- a/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java +++ b/src/main/java/mcp/mobius/waila/addons/exu/HUDHandlerDrum.java @@ -2,10 +2,6 @@ package mcp.mobius.waila.addons.exu; 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; @@ -15,6 +11,10 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + public class HUDHandlerDrum implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java index 0639557..5cf5b3a 100644 --- a/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/GravestoneModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.gravestone; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class GravestoneModule { public static Class BlockGraveStone = null; diff --git a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java index e721872..675db28 100644 --- a/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java +++ b/src/main/java/mcp/mobius/waila/addons/gravestone/HUDHandlerGravestone.java @@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.gravestone; 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; + public class HUDHandlerGravestone implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java index 306ba7f..3effc14 100644 --- a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HUDHandlerPamCrop.java @@ -2,18 +2,18 @@ package mcp.mobius.waila.addons.harvestcraft; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.NBTUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.NBTUtil; + public class HUDHandlerPamCrop implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java index 06f0fc3..03647c6 100644 --- a/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/harvestcraft/HarvestcraftModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.harvestcraft; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class HarvestcraftModule { public static Class TileEntityPamCrop = null; diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java index 3b63253..a6e06f7 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/HUDHandlerTEGenerator.java @@ -4,13 +4,6 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -18,6 +11,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerTEGenerator implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java index 79bb37f..1ff574f 100644 --- a/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java +++ b/src/main/java/mcp/mobius/waila/addons/ic2/IC2Module.java @@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.ic2; import java.lang.reflect.Field; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class IC2Module { public static Class TileBaseGenerator = null; diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java index a1372a8..07490fa 100644 --- a/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/HUDHandlerMagicalCrops.java @@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.magicalcrops; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerMagicalCrops implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java index 0584269..b61058a 100644 --- a/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/magicalcrops/MagicalCropsModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.magicalcrops; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class MagicalCropsModule { public static Class BlockMagicalCrops = null; diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java index 4c29b90..8d39d0b 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/HUDHandlerTank.java @@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.openblocks; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -17,6 +12,11 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerTank implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java index 2a09db8..05309ef 100644 --- a/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java +++ b/src/main/java/mcp/mobius/waila/addons/openblocks/OpenBlocksModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.openblocks; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class OpenBlocksModule { public static Class ModOpenBlocks = null; diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java index e6e88b7..d626d1b 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDDecoratorRsGateLogic.java @@ -1,14 +1,14 @@ package mcp.mobius.waila.addons.projectred; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.util.ForgeDirection; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaFMPAccessor; import mcp.mobius.waila.api.IWailaFMPDecorator; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.utils.NBTUtil; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.util.ForgeDirection; - public class HUDDecoratorRsGateLogic implements IWailaFMPDecorator { static byte[][] IOARRAY = { { 1, 1, 2, 1 } /* OR */, { 1, 1, 2, 1 } /* NOR */, { 1, 2, 2, 2 } /* NOT */, diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java index 52c5de2..1b8fedc 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/HUDFMPGateLogic.java @@ -4,13 +4,13 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; +import net.minecraft.item.ItemStack; + import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaFMPAccessor; import mcp.mobius.waila.api.IWailaFMPProvider; import mcp.mobius.waila.utils.NBTUtil; -import net.minecraft.item.ItemStack; - public class HUDFMPGateLogic implements IWailaFMPProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java index 7b1c85d..7de9140 100644 --- a/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java +++ b/src/main/java/mcp/mobius/waila/addons/projectred/ProjectRedModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.projectred; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class ProjectRedModule { public static void register() { diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java index 3994ee0..9b7fb4b 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/HUDHandlerTank.java @@ -2,12 +2,6 @@ package mcp.mobius.waila.addons.railcraft; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -16,6 +10,12 @@ import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidTank; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerTank implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java index 9469be9..689371a 100644 --- a/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/railcraft/RailcraftModule.java @@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.railcraft; import java.lang.reflect.Method; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class RailcraftModule { public static Class TileTankBase = null; diff --git a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java index 51ec81f..c63d5b7 100644 --- a/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java +++ b/src/main/java/mcp/mobius/waila/addons/secretrooms/HUDTileEntityCamo.java @@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.secretrooms; 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; + public class HUDTileEntityCamo implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java index 5ae1a11..0185a19 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/HUDHandlerStatues.java @@ -4,17 +4,17 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; - 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 mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerStatues implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java index d0728b5..9ecfc25 100644 --- a/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java +++ b/src/main/java/mcp/mobius/waila/addons/statues/StatuesModule.java @@ -2,11 +2,11 @@ package mcp.mobius.waila.addons.statues; import java.lang.reflect.Field; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class StatuesModule { public static Class TileEntityStatue = null; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java index 0a80659..c6870be 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCargoManager.java @@ -5,17 +5,17 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.ArrayList; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; - 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 mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDCargoManager implements IWailaDataProvider { private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java index 42a57f5..3ab5b32 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDCartAssembler.java @@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.stevescarts; 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; + public class HUDCartAssembler implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java index d65b7ab..e3fb034 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDLiquidManager.java @@ -4,16 +4,16 @@ import static mcp.mobius.waila.api.SpecialChars.*; 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; + public class HUDLiquidManager implements IWailaDataProvider { private static String colors[] = { "NA", "Red", "Blue", "Yellow", "Green", "Dis." }; diff --git a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java index 8afb306..3f89f38 100644 --- a/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java +++ b/src/main/java/mcp/mobius/waila/addons/stevescarts/HUDMinecartModular.java @@ -4,11 +4,6 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaEntityAccessor; -import mcp.mobius.waila.api.IWailaEntityProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -16,6 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDMinecartModular implements IWailaEntityProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java index cd2a449..b4fa6a9 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/HUDHandlerIAspectContainer.java @@ -7,10 +7,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -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; @@ -18,6 +14,10 @@ import net.minecraft.nbt.NBTTagList; 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; + public class HUDHandlerIAspectContainer implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java index 5e7ebde..14134a8 100644 --- a/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thaumcraft/ThaumcraftModule.java @@ -3,13 +3,13 @@ package mcp.mobius.waila.addons.thaumcraft; import java.lang.reflect.Field; import java.lang.reflect.Method; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - import net.minecraft.nbt.NBTTagCompound; import org.apache.logging.log4j.Level; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + public class ThaumcraftModule { public static Class Thaumcraft = null; diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java index 3066943..8979870 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/HUDHandlerDuct.java @@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.thermaldynamics; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -14,6 +9,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; + /** * Created by Lordmau5 on 28.02.2015. */ diff --git a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java index 1e23e10..087a09f 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermaldynamics/ThermalDynamicsModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.thermaldynamics; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class ThermalDynamicsModule { public static Class TileFluidDuct = null; diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java index e594855..9a3ef87 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerCache.java @@ -3,12 +3,6 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.lang.reflect.InvocationTargetException; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; -import mcp.mobius.waila.cbcore.LangUtil; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -17,6 +11,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameData; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; +import mcp.mobius.waila.cbcore.LangUtil; public class HUDHandlerCache implements IWailaDataProvider { diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java index 27ba42e..13b54f3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerEnergyCell.java @@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerEnergyCell implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java index e42b020..1c12ba8 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIBlockInfo.java @@ -3,10 +3,6 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.ArrayList; 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.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -15,6 +11,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + public class HUDHandlerIBlockInfo implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java index e077a5e..4a6d6eb 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerIEnergyHandler.java @@ -2,12 +2,6 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; -import mcp.mobius.waila.api.ITaggedList; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +9,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import mcp.mobius.waila.api.ITaggedList; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerIEnergyHandler implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java index 4970505..2fdb067 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerISecureTile.java @@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerISecureTile implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java index 57d2925..82920d3 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTank.java @@ -2,12 +2,6 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +9,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidStack; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class HUDHandlerTank implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java index 9efead2..736f121 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/HUDHandlerTesseract.java @@ -2,17 +2,17 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.cbcore.LangUtil; - 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 mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerTesseract implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java index 85f598b..19e854a 100644 --- a/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java +++ b/src/main/java/mcp/mobius/waila/addons/thermalexpansion/ThermalExpansionModule.java @@ -3,13 +3,13 @@ package mcp.mobius.waila.addons.thermalexpansion; import java.lang.reflect.Field; import java.lang.reflect.Method; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - import net.minecraftforge.common.util.ForgeDirection; import org.apache.logging.log4j.Level; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + public class ThermalExpansionModule { public static Class IEnergyProvider = null; diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java index 8012c30..58eb906 100644 --- a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestGenericOverride.java @@ -2,16 +2,16 @@ package mcp.mobius.waila.addons.twilightforest; 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; + public class TwilightForestGenericOverride implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java index eace995..89e742b 100644 --- a/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java +++ b/src/main/java/mcp/mobius/waila/addons/twilightforest/TwilightForestModule.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.addons.twilightforest; +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import org.apache.logging.log4j.Level; - public class TwilightForestModule { public static Class BlockTFRoots = null; diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java index dbabfeb..087a7f9 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDDecoratorVanilla.java @@ -1,13 +1,13 @@ package mcp.mobius.waila.addons.vanillamc; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.item.ItemStack; + import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.gui.helpers.UIHelper; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.item.ItemStack; - public class HUDDecoratorVanilla implements IWailaBlockDecorator { @Override diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java index ab8b6c3..165e9e1 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java @@ -2,11 +2,6 @@ package mcp.mobius.waila.addons.vanillamc; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +10,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameData; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; public class HUDHandlerFurnace implements IWailaDataProvider { diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java index 81d54bf..ced2db3 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java +++ b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerVanilla.java @@ -2,13 +2,6 @@ package mcp.mobius.waila.addons.vanillamc; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.SpecialChars; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.cbcore.LangUtil; - import net.minecraft.block.Block; import net.minecraft.block.BlockRedstoneOre; import net.minecraft.entity.player.EntityPlayerMP; @@ -20,6 +13,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.SpecialChars; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.cbcore.LangUtil; + public class HUDHandlerVanilla implements IWailaDataProvider { static Block mobSpawner = Blocks.mob_spawner; diff --git a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java index 973781f..be1710b 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ConfigHandler.java @@ -5,17 +5,16 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Set; +import net.minecraftforge.common.config.Configuration; +import net.minecraftforge.common.config.Property; + +import cpw.mods.fml.common.event.FMLPreInitializationEvent; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.handlers.HUDHandlerEntities; import mcp.mobius.waila.overlay.OverlayConfig; import mcp.mobius.waila.utils.Constants; -import net.minecraftforge.common.config.Configuration; -import net.minecraftforge.common.config.Property; - -import cpw.mods.fml.common.event.FMLPreInitializationEvent; - public class ConfigHandler implements IWailaConfigHandler { /* SINGLETON */ diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java index 47939a4..efa00e8 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorCommon.java @@ -1,10 +1,5 @@ package mcp.mobius.waila.api.impl; -import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaEntityAccessor; -import mcp.mobius.waila.utils.NBTUtil; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -19,6 +14,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.registry.GameData; +import mcp.mobius.waila.api.IWailaCommonAccessor; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.utils.NBTUtil; public class DataAccessorCommon implements IWailaCommonAccessor, IWailaDataAccessor, IWailaEntityAccessor { diff --git a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java index 0529e22..9e71b15 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java +++ b/src/main/java/mcp/mobius/waila/api/impl/DataAccessorFMP.java @@ -1,8 +1,5 @@ package mcp.mobius.waila.api.impl; -import mcp.mobius.waila.api.IWailaFMPAccessor; -import mcp.mobius.waila.utils.NBTUtil; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -10,6 +7,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import mcp.mobius.waila.api.IWailaFMPAccessor; +import mcp.mobius.waila.utils.NBTUtil; + public class DataAccessorFMP implements IWailaFMPAccessor { String id; diff --git a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java index 7a0e059..a492277 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java +++ b/src/main/java/mcp/mobius/waila/api/impl/MetaDataProvider.java @@ -5,6 +5,15 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaBlock; import mcp.mobius.waila.api.IWailaDataProvider; @@ -15,15 +24,6 @@ import mcp.mobius.waila.network.Message0x03EntRequest; import mcp.mobius.waila.network.WailaPacketHandler; import mcp.mobius.waila.utils.WailaExceptionHandler; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - public class MetaDataProvider { private Map> headBlockProviders = new TreeMap>(); diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java index 72b7648..efa1f83 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -12,6 +12,7 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; +import au.com.bytecode.opencsv.CSVReader; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaDataProvider; @@ -23,7 +24,6 @@ import mcp.mobius.waila.api.IWailaSummaryProvider; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.utils.Constants; -import au.com.bytecode.opencsv.CSVReader; public class ModuleRegistrar implements IWailaRegistrar { diff --git a/src/main/java/mcp/mobius/waila/client/KeyEvent.java b/src/main/java/mcp/mobius/waila/client/KeyEvent.java index a3480da..cec2e61 100644 --- a/src/main/java/mcp/mobius/waila/client/KeyEvent.java +++ b/src/main/java/mcp/mobius/waila/client/KeyEvent.java @@ -1,9 +1,5 @@ package mcp.mobius.waila.client; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.gui.screens.config.ScreenConfig; -import mcp.mobius.waila.utils.Constants; - import net.minecraft.client.Minecraft; import net.minecraft.client.settings.KeyBinding; import net.minecraftforge.common.config.Configuration; @@ -14,6 +10,9 @@ import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent.KeyInputEvent; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.gui.screens.config.ScreenConfig; +import mcp.mobius.waila.utils.Constants; public class KeyEvent { diff --git a/src/main/java/mcp/mobius/waila/client/ProxyClient.java b/src/main/java/mcp/mobius/waila/client/ProxyClient.java index 9cbc793..302c6f8 100644 --- a/src/main/java/mcp/mobius/waila/client/ProxyClient.java +++ b/src/main/java/mcp/mobius/waila/client/ProxyClient.java @@ -1,5 +1,11 @@ package mcp.mobius.waila.client; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.MinecraftForge; + +import cpw.mods.fml.common.Loader; import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.cbcore.LangUtil; @@ -13,13 +19,6 @@ import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar; import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack; import mcp.mobius.waila.server.ProxyServer; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.Loader; - public class ProxyClient extends ProxyServer { TrueTypeFont minecraftiaFont; diff --git a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java index e5dca1e..7f0a38c 100644 --- a/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java +++ b/src/main/java/mcp/mobius/waila/commands/CommandDumpHandlers.java @@ -1,12 +1,12 @@ package mcp.mobius.waila.commands; +import net.minecraft.command.CommandBase; +import net.minecraft.command.ICommandSender; + import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.IWailaEntityProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import net.minecraft.command.CommandBase; -import net.minecraft.command.ICommandSender; - public class CommandDumpHandlers extends CommandBase { @Override diff --git a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java index d7312ec..69dd5ff 100644 --- a/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java +++ b/src/main/java/mcp/mobius/waila/gui/events/MouseEvent.java @@ -1,11 +1,11 @@ package mcp.mobius.waila.gui.events; -import mcp.mobius.waila.gui.interfaces.IWidget; - import net.minecraft.client.Minecraft; import org.lwjgl.input.Mouse; +import mcp.mobius.waila.gui.interfaces.IWidget; + public class MouseEvent { public enum EventType { diff --git a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java index c2d115a..d186eba 100644 --- a/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java +++ b/src/main/java/mcp/mobius/waila/gui/interfaces/IWidget.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.gui.interfaces; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import org.lwjgl.util.Point; - public interface IWidget { // Should all the coordinates, sizes, etc be % or absolute values ? // Should we allow 2 methods for an absolute referencing (screen pos) and relative one (parent pos) ? diff --git a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java index a29fb27..0457265 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/ScreenBase.java @@ -2,14 +2,14 @@ package mcp.mobius.waila.gui.screens; import java.util.HashMap; -import mcp.mobius.waila.gui.interfaces.IWidget; -import mcp.mobius.waila.gui.widgets.LayoutCanvas; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import org.lwjgl.input.Mouse; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.widgets.LayoutCanvas; + public abstract class ScreenBase extends GuiScreen { protected GuiScreen parent; // Return screen if available. diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java index 0754cfa..481e68b 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenConfig.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.screens.config; +import net.minecraft.client.gui.GuiScreen; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; @@ -8,8 +10,6 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer; import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; -import net.minecraft.client.gui.GuiScreen; - public class ScreenConfig extends ScreenBase { public ScreenConfig(GuiScreen parent) { diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java index ea761c4..6e411b4 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenHUDConfig.java @@ -1,5 +1,8 @@ package mcp.mobius.waila.gui.screens.config; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.Configuration; + import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.interfaces.CType; @@ -18,9 +21,6 @@ import mcp.mobius.waila.gui.widgets.movable.PictureMovableRC; import mcp.mobius.waila.overlay.OverlayConfig; import mcp.mobius.waila.utils.Constants; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.Configuration; - public class ScreenHUDConfig extends ScreenBase { private class EventCanvas extends LayoutBase { diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java index 64adf20..a568a6f 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleChoice.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.screens.config; +import net.minecraft.client.gui.GuiScreen; + import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; @@ -9,8 +11,6 @@ import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonContainer; import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; -import net.minecraft.client.gui.GuiScreen; - public class ScreenModuleChoice extends ScreenBase { public ScreenModuleChoice(GuiScreen parent) { diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java index c7560cd..b396d6a 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenModuleConfig.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.screens.config; +import net.minecraft.client.gui.GuiScreen; + import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; @@ -12,8 +14,6 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; import mcp.mobius.waila.utils.Constants; -import net.minecraft.client.gui.GuiScreen; - public class ScreenModuleConfig extends ScreenBase { private String modName; diff --git a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java index 3ec84a5..7ef6e0d 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/config/ScreenWailaConfig.java @@ -1,5 +1,8 @@ package mcp.mobius.waila.gui.screens.config; +import net.minecraft.client.gui.GuiScreen; +import net.minecraftforge.common.config.Configuration; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; @@ -10,9 +13,6 @@ import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; import mcp.mobius.waila.gui.widgets.buttons.ButtonScreenChange; import mcp.mobius.waila.utils.Constants; -import net.minecraft.client.gui.GuiScreen; -import net.minecraftforge.common.config.Configuration; - public class ScreenWailaConfig extends ScreenBase { public ScreenWailaConfig(GuiScreen parent) { diff --git a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java index 4aeef15..a4f6392 100644 --- a/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java +++ b/src/main/java/mcp/mobius/waila/gui/screens/info/ScreenEnchants.java @@ -1,5 +1,8 @@ package mcp.mobius.waila.gui.screens.info; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.item.ItemStack; + import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; @@ -10,9 +13,6 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.ViewTable; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.item.ItemStack; - public class ScreenEnchants extends ScreenBase { public ScreenEnchants(GuiScreen parent) { diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java index dfbc4c2..41c0289 100644 --- a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest.java @@ -1,13 +1,13 @@ package mcp.mobius.waila.gui.testing; +import net.minecraft.client.gui.GuiScreen; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; import mcp.mobius.waila.gui.widgets.ViewTable; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import net.minecraft.client.gui.GuiScreen; - public class ScreenTest extends ScreenBase { public ScreenTest(GuiScreen parent) { diff --git a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java index 56b61bf..83cf21e 100644 --- a/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java +++ b/src/main/java/mcp/mobius/waila/gui/testing/ScreenTest2.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.testing; +import net.minecraft.client.gui.GuiScreen; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.screens.ScreenBase; @@ -7,8 +9,6 @@ import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; import mcp.mobius.waila.gui.widgets.buttons.ButtonContainerLabel; -import net.minecraft.client.gui.GuiScreen; - public class ScreenTest2 extends ScreenBase { public ScreenTest2(GuiScreen parent) { diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java index d84a602..acabb04 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ItemStackDisplay.java @@ -1,14 +1,14 @@ package mcp.mobius.waila.gui.widgets; -import mcp.mobius.waila.gui.interfaces.IWidget; -import mcp.mobius.waila.overlay.DisplayUtil; - import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.overlay.DisplayUtil; + public class ItemStackDisplay extends WidgetBase { ItemStack stack = null; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java index 8c9acf0..01336dd 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LabelFixedFont.java @@ -1,11 +1,11 @@ package mcp.mobius.waila.gui.widgets; +import org.lwjgl.util.Point; + import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; -import org.lwjgl.util.Point; - public class LabelFixedFont extends WidgetBase { protected String text = ""; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java index e833f61..bd3044e 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutBase.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.gui.widgets; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; -import org.lwjgl.util.Point; - public class LayoutBase extends WidgetBase { protected int bgcolor1 = 0x00000000; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java index b74995c..586fe34 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCanvas.java @@ -1,16 +1,16 @@ package mcp.mobius.waila.gui.widgets; +import net.minecraft.client.gui.ScaledResolution; + +import org.lwjgl.input.Mouse; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.events.MouseEvent.EventType; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; -import net.minecraft.client.gui.ScaledResolution; - -import org.lwjgl.input.Mouse; -import org.lwjgl.util.Point; - public class LayoutCanvas extends LayoutBase { private MouseEvent lastMouseEvent; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java index 5c86c4f..b716c3c 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutCropping.java @@ -1,12 +1,12 @@ package mcp.mobius.waila.gui.widgets; -import mcp.mobius.waila.gui.interfaces.IWidget; - import net.minecraft.client.gui.ScaledResolution; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; +import mcp.mobius.waila.gui.interfaces.IWidget; + public class LayoutCropping extends LayoutBase { int xOffset = 0; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java index 42f0e8e..61a8431 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/LayoutMargin.java @@ -1,11 +1,11 @@ package mcp.mobius.waila.gui.widgets; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; -import org.lwjgl.util.Point; - public class LayoutMargin extends LayoutBase { int left = 0; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java index 4925a71..ba3ce7f 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureDisplay.java @@ -1,13 +1,13 @@ package mcp.mobius.waila.gui.widgets; -import mcp.mobius.waila.gui.helpers.UIHelper; -import mcp.mobius.waila.gui.interfaces.IWidget; - import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; + public class PictureDisplay extends WidgetBase { protected ResourceLocation texture; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java index ca6fb8b..6ad2158 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/PictureSwitch.java @@ -1,14 +1,14 @@ package mcp.mobius.waila.gui.widgets; -import mcp.mobius.waila.gui.events.MouseEvent; -import mcp.mobius.waila.gui.helpers.UIHelper; -import mcp.mobius.waila.gui.interfaces.IWidget; - import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.UIHelper; +import mcp.mobius.waila.gui.interfaces.IWidget; + public class PictureSwitch extends WidgetBase { private ResourceLocation texture1; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java index 2f83b37..8fd2b04 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewTable.java @@ -1,12 +1,12 @@ package mcp.mobius.waila.gui.widgets; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.helpers.UIException; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; -import org.lwjgl.util.Point; - public class ViewTable extends WidgetBase { public class Cell extends WidgetBase { diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java index cc3e4e2..3ff30a8 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/ViewportScrollable.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.widgets; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.CType; @@ -7,8 +9,6 @@ import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; import mcp.mobius.waila.gui.interfaces.WAlign; -import org.lwjgl.util.Point; - public class ViewportScrollable extends WidgetBase { public class Escalator extends WidgetBase { diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java index 746b237..44931c7 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetBase.java @@ -2,13 +2,6 @@ package mcp.mobius.waila.gui.widgets; import java.util.LinkedHashMap; -import mcp.mobius.waila.gui.events.MouseEvent; -import mcp.mobius.waila.gui.helpers.ReverseIterator; -import mcp.mobius.waila.gui.interfaces.CType; -import mcp.mobius.waila.gui.interfaces.IWidget; -import mcp.mobius.waila.gui.interfaces.RenderPriority; -import mcp.mobius.waila.gui.interfaces.Signal; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.texture.TextureManager; @@ -16,6 +9,13 @@ import net.minecraft.client.renderer.texture.TextureManager; import org.lwjgl.opengl.GL11; import org.lwjgl.util.Point; +import mcp.mobius.waila.gui.events.MouseEvent; +import mcp.mobius.waila.gui.helpers.ReverseIterator; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.RenderPriority; +import mcp.mobius.waila.gui.interfaces.Signal; + public abstract class WidgetBase implements IWidget { protected IWidget parent; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java index 1676b50..0d0710b 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/WidgetGeometry.java @@ -1,13 +1,13 @@ package mcp.mobius.waila.gui.widgets; -import mcp.mobius.waila.gui.interfaces.CType; -import mcp.mobius.waila.gui.interfaces.IWidget; -import mcp.mobius.waila.gui.interfaces.WAlign; - import net.minecraft.util.MathHelper; import org.lwjgl.util.Point; +import mcp.mobius.waila.gui.interfaces.CType; +import mcp.mobius.waila.gui.interfaces.IWidget; +import mcp.mobius.waila.gui.interfaces.WAlign; + // public class WidgetGeometry implements Cloneable{ public class WidgetGeometry { diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java index c25fd7b..782f2ae 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBase.java @@ -1,5 +1,11 @@ package mcp.mobius.waila.gui.widgets.buttons; +import net.minecraft.client.audio.PositionedSoundRecord; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; @@ -7,12 +13,6 @@ import mcp.mobius.waila.gui.interfaces.Signal; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetBase; -import net.minecraft.client.audio.PositionedSoundRecord; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.Point; - public abstract class ButtonBase extends WidgetBase { protected boolean mouseOver = false; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java index 56313f6..438a4de 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfig.java @@ -1,12 +1,12 @@ package mcp.mobius.waila.gui.widgets.buttons; +import org.lwjgl.util.Point; + import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; -import org.lwjgl.util.Point; - public class ButtonBooleanConfig extends ButtonBoolean { protected String category; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java index cbf7837..c896886 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonBooleanConfigRemote.java @@ -1,13 +1,13 @@ package mcp.mobius.waila.gui.widgets.buttons; +import org.lwjgl.util.Point; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; -import org.lwjgl.util.Point; - public class ButtonBooleanConfigRemote extends ButtonBooleanConfig { public ButtonBooleanConfigRemote(IWidget parent, String category, String configKey, String textFalse, diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java index f552528..bd14092 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainer.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.widgets.buttons; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; @@ -7,8 +9,6 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import org.lwjgl.util.Point; - public class ButtonContainer extends WidgetBase { private int nButtons = 0; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java index 6483bcf..8f9ec28 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonContainerLabel.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.widgets.buttons; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.WAlign; @@ -8,8 +10,6 @@ import mcp.mobius.waila.gui.widgets.LayoutBase; import mcp.mobius.waila.gui.widgets.WidgetBase; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import org.lwjgl.util.Point; - // TODO : THIS CLASS IS WIP AND CAN'T WORK RIGHT NOW public class ButtonContainerLabel extends WidgetBase { diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java index cc2ae97..2a92dac 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/buttons/ButtonScreenChange.java @@ -1,5 +1,7 @@ package mcp.mobius.waila.gui.widgets.buttons; +import net.minecraft.client.gui.GuiScreen; + import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.interfaces.CType; import mcp.mobius.waila.gui.interfaces.IWidget; @@ -7,8 +9,6 @@ import mcp.mobius.waila.gui.interfaces.WAlign; import mcp.mobius.waila.gui.widgets.LabelFixedFont; import mcp.mobius.waila.gui.widgets.WidgetGeometry; -import net.minecraft.client.gui.GuiScreen; - public class ButtonScreenChange extends ButtonBase { GuiScreen linkedScreen; diff --git a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java index d595828..05f4ea9 100644 --- a/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java +++ b/src/main/java/mcp/mobius/waila/gui/widgets/movable/PictureMovableRC.java @@ -1,16 +1,16 @@ package mcp.mobius.waila.gui.widgets.movable; +import net.minecraft.util.ResourceLocation; + +import org.lwjgl.opengl.GL11; +import org.lwjgl.util.Point; + import mcp.mobius.waila.gui.events.MouseEvent; import mcp.mobius.waila.gui.helpers.UIHelper; import mcp.mobius.waila.gui.interfaces.IWidget; import mcp.mobius.waila.gui.interfaces.Signal; import mcp.mobius.waila.gui.widgets.WidgetBase; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; -import org.lwjgl.util.Point; - // A movable picture setup especially for centered relative positions. public class PictureMovableRC extends WidgetBase { diff --git a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java index 953bb10..5ae4318 100644 --- a/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/DecoratorFMP.java @@ -2,6 +2,12 @@ package mcp.mobius.waila.handlers; import java.util.List; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; + +import org.apache.logging.log4j.Level; + import mcp.mobius.waila.Waila; import mcp.mobius.waila.api.IWailaBlockDecorator; import mcp.mobius.waila.api.IWailaConfigHandler; @@ -10,12 +16,6 @@ import mcp.mobius.waila.api.IWailaFMPDecorator; import mcp.mobius.waila.api.impl.DataAccessorFMP; import mcp.mobius.waila.api.impl.ModuleRegistrar; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; - -import org.apache.logging.log4j.Level; - public class DecoratorFMP implements IWailaBlockDecorator { @Override diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java index ae24a30..8a236f9 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerBlocks.java @@ -4,14 +4,6 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.overlay.DisplayUtil; -import mcp.mobius.waila.utils.Constants; -import mcp.mobius.waila.utils.ModIdentification; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; @@ -20,6 +12,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.overlay.DisplayUtil; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.ModIdentification; + public class HUDHandlerBlocks implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java index a4c36cf..f25bc50 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerEntities.java @@ -4,10 +4,6 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaEntityAccessor; -import mcp.mobius.waila.api.IWailaEntityProvider; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayerMP; @@ -17,6 +13,9 @@ import net.minecraft.world.World; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.registry.EntityRegistry; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.api.IWailaEntityProvider; public class HUDHandlerEntities implements IWailaEntityProvider { diff --git a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java index 832fdcf..c3b0cac 100644 --- a/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java +++ b/src/main/java/mcp/mobius/waila/handlers/HUDHandlerFMP.java @@ -2,14 +2,6 @@ package mcp.mobius.waila.handlers; import java.util.List; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaFMPProvider; -import mcp.mobius.waila.api.impl.DataAccessorFMP; -import mcp.mobius.waila.api.impl.ModuleRegistrar; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -20,6 +12,14 @@ import net.minecraftforge.common.util.Constants; import org.apache.logging.log4j.Level; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaFMPProvider; +import mcp.mobius.waila.api.impl.DataAccessorFMP; +import mcp.mobius.waila.api.impl.ModuleRegistrar; + public class HUDHandlerFMP implements IWailaDataProvider { @Override diff --git a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java index d84a979..dab5d19 100644 --- a/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/VanillaTooltipHandler.java @@ -1,12 +1,11 @@ package mcp.mobius.waila.handlers; -import mcp.mobius.waila.utils.ModIdentification; - import net.minecraftforge.event.entity.player.ItemTooltipEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.waila.utils.ModIdentification; public class VanillaTooltipHandler { diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java index d120f58..1d96d4a 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/HandlerEnchants.java @@ -2,10 +2,6 @@ package mcp.mobius.waila.handlers.nei; import java.util.Map; -import mcp.mobius.waila.gui.screens.info.ScreenEnchants; -import mcp.mobius.waila.utils.Constants; -import mcp.mobius.waila.utils.ModIdentification; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.enchantment.Enchantment; @@ -16,6 +12,9 @@ import net.minecraft.item.ItemStack; import codechicken.nei.NEIClientConfig; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.guihook.IContainerInputHandler; +import mcp.mobius.waila.gui.screens.info.ScreenEnchants; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.ModIdentification; public class HandlerEnchants implements IContainerInputHandler { diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java b/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java index ade49c5..d4b3978 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/ModNameFilter.java @@ -2,13 +2,12 @@ package mcp.mobius.waila.handlers.nei; import java.util.regex.Pattern; -import mcp.mobius.waila.utils.ModIdentification; - import net.minecraft.item.ItemStack; import codechicken.nei.SearchField; import codechicken.nei.SearchField.ISearchProvider; import codechicken.nei.api.ItemFilter; +import mcp.mobius.waila.utils.ModIdentification; public class ModNameFilter implements ISearchProvider { diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java b/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java index b9cd28e..fafc1b0 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/NEIHandler.java @@ -2,11 +2,6 @@ package mcp.mobius.waila.handlers.nei; import java.util.List; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.cbcore.LangUtil; -import mcp.mobius.waila.overlay.RayTracing; -import mcp.mobius.waila.utils.Constants; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.gui.inventory.GuiInventory; @@ -22,6 +17,10 @@ import codechicken.nei.api.API; import codechicken.nei.guihook.GuiContainerManager; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiUsageRecipe; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.cbcore.LangUtil; +import mcp.mobius.waila.overlay.RayTracing; +import mcp.mobius.waila.utils.Constants; public class NEIHandler { diff --git a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java index 2423096..a55074c 100644 --- a/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java +++ b/src/main/java/mcp/mobius/waila/handlers/nei/TooltipHandlerWaila.java @@ -2,12 +2,11 @@ package mcp.mobius.waila.handlers.nei; import java.util.List; -import mcp.mobius.waila.utils.ModIdentification; - import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.item.ItemStack; import codechicken.nei.guihook.IContainerTooltipHandler; +import mcp.mobius.waila.utils.ModIdentification; public class TooltipHandlerWaila implements IContainerTooltipHandler { diff --git a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java index f0bf262..1cfdf56 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x00ServerPing.java @@ -2,16 +2,15 @@ package mcp.mobius.waila.network; import java.util.HashMap; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.utils.Constants; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraftforge.common.config.ConfigCategory; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.utils.Constants; +import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x00ServerPing extends SimpleChannelInboundHandler implements IWailaMessage { diff --git a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java index 38d71e4..b58c6f1 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x01TERequest.java @@ -5,12 +5,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.AccessHelper; -import mcp.mobius.waila.utils.NBTUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -23,6 +17,11 @@ import cpw.mods.fml.common.network.NetworkRegistry; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.AccessHelper; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x01TERequest extends SimpleChannelInboundHandler implements IWailaMessage { diff --git a/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java index b8dd827..85604ae 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x02TENBTData.java @@ -1,13 +1,12 @@ package mcp.mobius.waila.network; -import mcp.mobius.waila.api.impl.DataAccessorCommon; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.nbt.NBTTagCompound; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import mcp.mobius.waila.api.impl.DataAccessorCommon; +import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x02TENBTData extends SimpleChannelInboundHandler implements IWailaMessage { diff --git a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java index 2cdf388..87a0744 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x03EntRequest.java @@ -3,12 +3,6 @@ package mcp.mobius.waila.network; import java.util.HashSet; import java.util.List; -import mcp.mobius.waila.api.IWailaEntityProvider; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.AccessHelper; -import mcp.mobius.waila.utils.NBTUtil; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; @@ -20,6 +14,11 @@ import cpw.mods.fml.common.network.NetworkRegistry; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.AccessHelper; +import mcp.mobius.waila.utils.NBTUtil; +import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x03EntRequest extends SimpleChannelInboundHandler implements IWailaMessage { diff --git a/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java index 08e2db1..212b4f7 100644 --- a/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java +++ b/src/main/java/mcp/mobius/waila/network/Message0x04EntNBTData.java @@ -1,13 +1,12 @@ package mcp.mobius.waila.network; -import mcp.mobius.waila.api.impl.DataAccessorCommon; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.nbt.NBTTagCompound; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; +import mcp.mobius.waila.api.impl.DataAccessorCommon; +import mcp.mobius.waila.utils.WailaExceptionHandler; public class Message0x04EntNBTData extends SimpleChannelInboundHandler implements IWailaMessage { diff --git a/src/main/java/mcp/mobius/waila/network/NetworkHandler.java b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java index 22f58f2..dbaf953 100644 --- a/src/main/java/mcp/mobius/waila/network/NetworkHandler.java +++ b/src/main/java/mcp/mobius/waila/network/NetworkHandler.java @@ -1,11 +1,10 @@ package mcp.mobius.waila.network; -import mcp.mobius.waila.Waila; - import net.minecraft.entity.player.EntityPlayerMP; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.PlayerLoggedInEvent; +import mcp.mobius.waila.Waila; public class NetworkHandler { diff --git a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java index 1163386..6df9116 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/DecoratorRenderer.java @@ -2,12 +2,6 @@ package mcp.mobius.waila.overlay; import java.util.List; -import mcp.mobius.waila.api.IWailaBlockDecorator; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.api.impl.DataAccessorCommon; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; @@ -20,6 +14,11 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.waila.api.IWailaBlockDecorator; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorCommon; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.WailaExceptionHandler; public class DecoratorRenderer { diff --git a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java index b976171..5cf3932 100644 --- a/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java +++ b/src/main/java/mcp/mobius/waila/overlay/DisplayUtil.java @@ -7,11 +7,6 @@ import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; -import mcp.mobius.waila.api.IWailaTooltipRenderer; -import mcp.mobius.waila.api.impl.DataAccessorCommon; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.WailaExceptionHandler; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; @@ -24,6 +19,11 @@ import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import mcp.mobius.waila.api.IWailaTooltipRenderer; +import mcp.mobius.waila.api.impl.DataAccessorCommon; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.WailaExceptionHandler; + public class DisplayUtil { private static FontRenderer fontRenderer = Minecraft.getMinecraft().fontRenderer; diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java index 1d1b978..4370ca7 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayConfig.java @@ -1,10 +1,10 @@ package mcp.mobius.waila.overlay; +import net.minecraftforge.common.config.Configuration; + import mcp.mobius.waila.api.impl.ConfigHandler; import mcp.mobius.waila.utils.Constants; -import net.minecraftforge.common.config.Configuration; - public class OverlayConfig { public static int posX; diff --git a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java index 8df3499..75bb5f3 100644 --- a/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java +++ b/src/main/java/mcp/mobius/waila/overlay/OverlayRenderer.java @@ -1,7 +1,5 @@ package mcp.mobius.waila.overlay; -import mcp.mobius.waila.api.impl.ConfigHandler; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.util.MovingObjectPosition; @@ -9,6 +7,8 @@ import net.minecraft.util.MovingObjectPosition; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import mcp.mobius.waila.api.impl.ConfigHandler; + public class OverlayRenderer { protected static boolean hasBlending; diff --git a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java index be58786..2b4374f 100644 --- a/src/main/java/mcp/mobius/waila/overlay/RayTracing.java +++ b/src/main/java/mcp/mobius/waila/overlay/RayTracing.java @@ -5,13 +5,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaEntityProvider; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.api.impl.DataAccessorCommon; -import mcp.mobius.waila.api.impl.ModuleRegistrar; -import mcp.mobius.waila.utils.Constants; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -26,6 +19,13 @@ import net.minecraft.world.World; import net.minecraftforge.common.IShearable; import net.minecraftforge.common.config.Configuration; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaEntityProvider; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorCommon; +import mcp.mobius.waila.api.impl.ModuleRegistrar; +import mcp.mobius.waila.utils.Constants; + public class RayTracing { private static RayTracing _instance; diff --git a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java index 87851b7..84858ab 100644 --- a/src/main/java/mcp/mobius/waila/overlay/Tooltip.java +++ b/src/main/java/mcp/mobius/waila/overlay/Tooltip.java @@ -9,6 +9,11 @@ import java.util.Arrays; import java.util.List; import java.util.regex.Matcher; +import net.minecraft.item.ItemStack; +import net.minecraftforge.common.config.Configuration; + +import org.lwjgl.opengl.GL11; + import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.api.impl.ConfigHandler; @@ -19,11 +24,6 @@ import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderString; import mcp.mobius.waila.utils.Constants; import mcp.mobius.waila.utils.WailaExceptionHandler; -import net.minecraft.item.ItemStack; -import net.minecraftforge.common.config.Configuration; - -import org.lwjgl.opengl.GL11; - public class Tooltip { public static int TabSpacing = 8; diff --git a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java index ef6cca8..35c7cfe 100644 --- a/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java +++ b/src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java @@ -4,14 +4,6 @@ import static mcp.mobius.waila.api.SpecialChars.*; import java.util.List; -import mcp.mobius.waila.api.impl.ConfigHandler; -import mcp.mobius.waila.api.impl.DataAccessorCommon; -import mcp.mobius.waila.api.impl.MetaDataProvider; -import mcp.mobius.waila.api.impl.TipList; -import mcp.mobius.waila.cbcore.Layout; -import mcp.mobius.waila.client.KeyEvent; -import mcp.mobius.waila.utils.Constants; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -27,6 +19,13 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import mcp.mobius.waila.api.impl.ConfigHandler; +import mcp.mobius.waila.api.impl.DataAccessorCommon; +import mcp.mobius.waila.api.impl.MetaDataProvider; +import mcp.mobius.waila.api.impl.TipList; +import mcp.mobius.waila.cbcore.Layout; +import mcp.mobius.waila.client.KeyEvent; +import mcp.mobius.waila.utils.Constants; public class WailaTickHandler { diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java index 5b770d7..81c4c49 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderHealth.java @@ -2,13 +2,13 @@ package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; +import net.minecraft.util.MathHelper; + import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.overlay.DisplayUtil; import mcp.mobius.waila.overlay.IconUI; -import net.minecraft.util.MathHelper; - /** * Custom renderer for health bars. Syntax : {waila.health, nheartperline, health, maxhealth} * diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java index fded166..24e3f4b 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderProgressBar.java @@ -2,13 +2,13 @@ package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ResourceLocation; + import mcp.mobius.waila.api.IWailaCommonAccessor; import mcp.mobius.waila.api.IWailaTooltipRenderer; import mcp.mobius.waila.overlay.DisplayUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.util.ResourceLocation; - public class TTRenderProgressBar implements IWailaTooltipRenderer { Minecraft mc = Minecraft.getMinecraft(); diff --git a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java index ca57c11..1831b0e 100644 --- a/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java +++ b/src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java @@ -2,15 +2,15 @@ package mcp.mobius.waila.overlay.tooltiprenderers; import java.awt.Dimension; -import mcp.mobius.waila.api.IWailaCommonAccessor; -import mcp.mobius.waila.api.IWailaTooltipRenderer; -import mcp.mobius.waila.overlay.DisplayUtil; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import mcp.mobius.waila.api.IWailaCommonAccessor; +import mcp.mobius.waila.api.IWailaTooltipRenderer; +import mcp.mobius.waila.overlay.DisplayUtil; + public class TTRenderStack implements IWailaTooltipRenderer { @Override diff --git a/src/main/java/mcp/mobius/waila/server/ProxyServer.java b/src/main/java/mcp/mobius/waila/server/ProxyServer.java index 125de5e..dccc60c 100644 --- a/src/main/java/mcp/mobius/waila/server/ProxyServer.java +++ b/src/main/java/mcp/mobius/waila/server/ProxyServer.java @@ -2,6 +2,7 @@ package mcp.mobius.waila.server; import java.lang.reflect.Method; +import cpw.mods.fml.common.Loader; import mcp.mobius.waila.Waila; import mcp.mobius.waila.addons.agriculture.AgricultureModule; import mcp.mobius.waila.addons.buildcraft.BCModule; @@ -28,7 +29,6 @@ import mcp.mobius.waila.api.IWailaRegistrar; import mcp.mobius.waila.api.impl.ModuleRegistrar; import mcp.mobius.waila.handlers.DecoratorFMP; import mcp.mobius.waila.handlers.HUDHandlerFMP; -import cpw.mods.fml.common.Loader; public class ProxyServer { diff --git a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java index 377c8ae..49367b6 100644 --- a/src/main/java/mcp/mobius/waila/utils/AccessHelper.java +++ b/src/main/java/mcp/mobius/waila/utils/AccessHelper.java @@ -5,10 +5,6 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.ArrayList; -import mcp.mobius.waila.Waila; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaEntityProvider; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.item.Item; @@ -19,6 +15,10 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import mcp.mobius.waila.Waila; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaEntityProvider; + public class AccessHelper { public static Field getDeclaredField(String classname, String fieldname) { diff --git a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java index 311b326..4902487 100644 --- a/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java +++ b/src/main/java/mcp/mobius/waila/utils/WailaExceptionHandler.java @@ -3,10 +3,10 @@ package mcp.mobius.waila.utils; import java.util.ArrayList; import java.util.List; -import mcp.mobius.waila.Waila; - import org.apache.logging.log4j.Level; +import mcp.mobius.waila.Waila; + public class WailaExceptionHandler { public WailaExceptionHandler() {}