diff --git a/build.gradle b/build.gradle index fe8a2e7..3fa171e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1675110695 +//version: 1683705740 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,27 +6,28 @@ */ -import com.diffplug.blowdryer.Blowdryer -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar +import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar +import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask +import com.gtnewhorizons.retrofuturagradle.util.Distribution import com.matthewprenger.cursegradle.CurseArtifact import com.matthewprenger.cursegradle.CurseRelation import com.modrinth.minotaur.dependencies.ModDependency import com.modrinth.minotaur.dependencies.VersionDependency import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory -import org.jetbrains.gradle.ext.* +import org.gradle.internal.xml.XmlTransformer +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import javax.inject.Inject import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream buildscript { repositories { - mavenLocal() mavenCentral() maven { @@ -47,6 +48,8 @@ buildscript { name 'Scala CI dependencies' url 'https://repo1.maven.org/maven2/' } + + mavenLocal() } } plugins { @@ -58,22 +61,26 @@ plugins { id 'org.jetbrains.kotlin.jvm' version '1.8.0' apply false id 'org.jetbrains.kotlin.kapt' version '1.8.0' apply false id 'com.google.devtools.ksp' version '1.8.0-1.0.9' apply false - id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version ,unused, available for addon.gradle - id 'com.github.johnrengelman.shadow' version '7.1.2' apply false - id 'com.palantir.git-version' version '0.13.0' apply false // 0.13.0 is the last jvm8 supporting version - id 'de.undercouch.download' version '5.3.0' + id 'org.ajoberstar.grgit' version '4.1.1' // 4.1.1 is the last jvm8 supporting version, unused, available for addon.gradle + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false + id 'com.palantir.git-version' version '3.0.0' apply false + id 'de.undercouch.download' version '5.4.0' id 'com.github.gmazzo.buildconfig' version '3.1.0' apply false // Unused, available for addon.gradle - id 'com.diffplug.spotless' version '6.7.2' apply false + id 'com.diffplug.spotless' version '6.13.0' apply false // 6.13.0 is the last jvm8 supporting version id 'com.modrinth.minotaur' version '2.+' apply false id 'com.matthewprenger.cursegradle' version '1.4.0' apply false - id 'com.gtnewhorizons.retrofuturagradle' version '1.1.2' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11' } + +print("You might want to check out './gradlew :faq' if your build fails.\n") + boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -122,7 +129,10 @@ propertyDefaultIfUnset("gradleTokenGroupName", "") propertyDefaultIfUnset("enableModernJavaSyntax", false) // On by default for new projects only propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new projects only -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +// this is meant to be set using the user wide property file. by default we do nothing. +propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea" + +project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts if (!disableSpotless) { apply plugin: 'com.diffplug.spotless' apply from: Blowdryer.file('spotless.gradle') @@ -143,13 +153,21 @@ java { } else { languageVersion.set(projectJavaVersion) } - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) } if (!noPublishedSources) { withSourcesJar() } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -183,14 +201,34 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { + repositories { + mavenCentral { + mavenContent { + includeGroup("me.eigenraven.java8unsupported") + } + } + } + dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } + // Allow using jdk.unsupported classes like sun.misc.Unsafe in the compiled code, working around JDK-8206937. + patchedMinecraft('me.eigenraven.java8unsupported:java-8-unsupported-shim:1.0.0') } tasks.withType(JavaCompile).configureEach { @@ -202,7 +240,7 @@ if (enableModernJavaSyntax.toBoolean()) { javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) }) } } @@ -234,12 +272,14 @@ if (apiPackage) { } if (accessTransformersFile) { - String targetFile = "src/main/resources/META-INF/" + accessTransformersFile - if (!getFile(targetFile).exists()) { - throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + for (atFile in accessTransformersFile.split(",")) { + String targetFile = "src/main/resources/META-INF/" + atFile.trim() + if (!getFile(targetFile).exists()) { + throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile) + } + tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile) + tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile) } - tasks.deobfuscateMergedJarToSrg.accessTransformerFiles.from(targetFile) - tasks.srgifyBinpatchedJar.accessTransformerFiles.from(targetFile) } else { boolean atsFound = false for (File at : sourceSets.getByName("main").resources.files) { @@ -367,12 +407,14 @@ minecraft { injectMissingGenerics.set(true) } + username = developmentEnvironmentUserName.toString() + + lwjgl3Version = "3.3.2" + // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - extraTweakClasses.add("org.spongepowered.asm.launch.MixinTweaker") - if (usesMixinDebug.toBoolean()) { extraRunJvmArguments.addAll([ "-Dmixin.debug.countInjections=true", @@ -401,6 +443,16 @@ configurations.configureEach { } } } + def obfuscationAttr = it.attributes.getAttribute(ObfuscationAttribute.OBFUSCATION_ATTRIBUTE) + if (obfuscationAttr != null && obfuscationAttr.name == ObfuscationAttribute.SRG) { + resolutionStrategy.eachDependency { DependencyResolveDetails details -> + // Remap CoFH core cursemaven dev jar to the obfuscated version for runObfClient/Server + if (details.requested.group == 'curse.maven' && details.requested.name.endsWith('-69162') && details.requested.version == '2388751') { + details.useVersion '2388750' + details.because 'Pick obfuscated jar' + } + } + } } // Ensure tests have access to minecraft classes @@ -430,8 +482,9 @@ repositories.configureEach { repo -> apply from: 'repositories.gradle' configurations { + runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable) + testRuntimeClasspath.extendsFrom(runtimeOnlyNonPublishable) for (config in [compileClasspath, runtimeClasspath, testCompileClasspath, testRuntimeClasspath]) { - config.extendsFrom(runtimeOnlyNonPublishable) if (usesShadowedDependencies.toBoolean()) { config.extendsFrom(shadowImplementation) // TODO: remove Compile after all uses are refactored to Implementation @@ -476,12 +529,11 @@ repositories { url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - if (usesMixinDebug.toBoolean()) { - maven { - name = "Fabric Maven" - url = "https://maven.fabricmc.net/" - } + maven { + name 'sonatype' + url 'https://oss.sonatype.org/content/repositories/snapshots/' + content { + includeGroup "org.lwjgl" } } if (includeWellKnownRepositories.toBoolean()) { @@ -515,29 +567,50 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.7.1" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.10:processor') + annotationProcessor(mixinProviderSpec) if (usesMixinDebug.toBoolean()) { runtimeOnlyNonPublishable('org.jetbrains:intellij-fernflower:1.2.1.16') } } - if (usesMixins.toBoolean() || forceEnableMixins.toBoolean()) { - implementation('com.gtnewhorizon:gtnhmixins:2.1.10') + if (usesMixins.toBoolean()) { + implementation(mixinProviderSpec) + } else if (forceEnableMixins.toBoolean()) { + runtimeOnlyNonPublishable(mixinProviderSpec) } } pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { if (usesMixins.toBoolean()) { dependencies { - kapt('com.gtnewhorizon:gtnhmixins:2.1.10:processor') + kapt(mixinProviderSpec) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -633,9 +706,158 @@ tasks.named("processResources", ProcessResources).configure { if (usesMixins.toBoolean()) { from refMap + dependsOn("compileJava", "compileScala") } } +ext.java17Toolchain = (JavaToolchainSpec spec) -> { + spec.languageVersion.set(JavaLanguageVersion.of(17)) + spec.vendor.set(JvmVendorSpec.matching("jetbrains")) +} + +ext.java17DependenciesCfg = configurations.create("java17Dependencies") { + extendsFrom(configurations.getByName("runtimeClasspath")) // Ensure consistent transitive dependency resolution + canBeConsumed = false +} +ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies") { + canBeConsumed = false +} + +dependencies { + def lwjgl3ifyVersion = '1.3.5' + def asmVersion = '9.4' + if (modId != 'lwjgl3ify') { + java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") + } + if (modId != 'hodgepodge') { + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') + } + + java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} + java17PatchDependencies("org.ow2.asm:asm:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-analysis:${asmVersion}") + java17PatchDependencies("org.ow2.asm:asm-util:${asmVersion}") + java17PatchDependencies('org.ow2.asm:asm-deprecated:7.1') + java17PatchDependencies("org.apache.commons:commons-lang3:3.12.0") + java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} +} + +ext.java17JvmArgs = [ + // Java 9+ support + "--illegal-access=warn", + "-Djava.security.manager=allow", + "-Dfile.encoding=UTF-8", + "--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED", + "--add-opens", "java.base/java.net=ALL-UNNAMED", + "--add-opens", "java.base/java.nio=ALL-UNNAMED", + "--add-opens", "java.base/java.io=ALL-UNNAMED", + "--add-opens", "java.base/java.lang=ALL-UNNAMED", + "--add-opens", "java.base/java.lang.reflect=ALL-UNNAMED", + "--add-opens", "java.base/java.text=ALL-UNNAMED", + "--add-opens", "java.base/java.util=ALL-UNNAMED", + "--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED", + "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", + "--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming", + "--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED", + "--add-modules", "jdk.dynalink", + "--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED", + "--add-modules", "java.sql.rowset", + "--add-opens", "java.sql.rowset/javax.sql.rowset.serial=ALL-UNNAMED" +] + +ext.hotswapJvmArgs = [ + // DCEVM advanced hot reload + "-XX:+AllowEnhancedClassRedefinition", + "-XX:HotswapAgent=fatjar" +] + +ext.setupHotswapAgentTask = tasks.register("setupHotswapAgent") { + group = "GTNH Buildscript" + description = "Installs a recent version of HotSwapAgent into the Java 17 JetBrains runtime directory" + def hsaUrl = 'https://github.com/HotswapProjects/HotswapAgent/releases/download/1.4.2-SNAPSHOT/hotswap-agent-1.4.2-SNAPSHOT.jar' + def targetFolderProvider = javaToolchains.launcherFor(java17Toolchain).map {it.metadata.installationPath.dir("lib/hotswap")} + def targetFilename = "hotswap-agent.jar" + onlyIf { + !targetFolderProvider.get().file(targetFilename).asFile.exists() + } + doLast { + def targetFolder = targetFolderProvider.get() + targetFolder.asFile.mkdirs() + download.run { + src hsaUrl + dest targetFolder.file(targetFilename).asFile + overwrite false + tempAndMove true + } + } +} + +public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { + // IntelliJ doesn't seem to allow commandline arguments so we also support an env variable + private boolean enableHotswap = Boolean.valueOf(System.getenv("HOTSWAP")); + + @Input + public boolean getEnableHotswap() { return enableHotswap } + @Option(option = "hotswap", description = "Enables HotSwapAgent for enhanced class reloading under a debugger") + public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } + + @Inject + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { + super(side, gradle) + + this.lwjglVersion = 3 + this.javaLauncher = project.javaToolchains.launcherFor(project.java17Toolchain) + this.extraJvmArgs.addAll(project.java17JvmArgs) + this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) + + this.classpath(project.java17PatchDependenciesCfg) + if (side == Distribution.CLIENT) { + this.classpath(project.minecraftTasks.lwjgl3Configuration) + } + // Use a raw provider instead of map to not create a dependency on the task + this.classpath(project.provider(() -> project.tasks.named(superTask, RunMinecraftTask).get().classpath)) + this.classpath.filter { file -> + !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 + } + this.classpath(project.java17DependenciesCfg) + } + + public void setup(Project project) { + super.setup(project) + if (project.usesMixins.toBoolean()) { + this.extraJvmArgs.addAll(project.provider(() -> { + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + mixinCfg.canBeConsumed = false + mixinCfg.transitive = false + enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : [] + })) + } + } +} + +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") +runClient17Task.configure { + setup(project) + group = "Modded Minecraft" + description = "Runs the modded client using Java 17, lwjgl3ify and Hodgepodge" + dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar') + mainClass = "GradleStart" + username = minecraft.username + userUUID = minecraft.userUUID +} + +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") +runServer17Task.configure { + setup(project) + group = "Modded Minecraft" + description = "Runs the modded server using Java 17, lwjgl3ify and Hodgepodge" + dependsOn(setupHotswapAgentTask, mcpTasks.launcherSources.classesTaskName, minecraftTasks.taskDownloadVanillaAssets, mcpTasks.taskPackagePatchedMc, 'jar') + mainClass = "GradleStartServer" + extraArgs.add("nogui") +} + def getManifestAttributes() { def manifestAttributes = [:] if (!containsMixinsAndOrCoreModOnly.toBoolean() && (usesMixins.toBoolean() || coreModClass)) { @@ -667,11 +889,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = minimizeShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -686,8 +903,9 @@ if (usesShadowedDependencies.toBoolean()) { project.configurations.shadeCompile ] archiveClassifier.set('dev') - if (minimizeShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + if (relocateShadowedDependencies.toBoolean()) { + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -705,7 +923,7 @@ if (usesShadowedDependencies.toBoolean()) { javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements) { skip() } - for (runTask in ["runClient", "runServer"]) { + for (runTask in ["runClient", "runServer", "runClient17", "runServer17"]) { tasks.named(runTask).configure { dependsOn("shadowJar") } @@ -743,9 +961,23 @@ idea { module { downloadJavadoc = true downloadSources = true + inheritOutputDirs = true } project { settings { + if (ideaOverrideBuildType != "") { + delegateActions { + if ("gradle".equalsIgnoreCase(ideaOverrideBuildType)) { + delegateBuildRunToGradle = true + testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.GRADLE + } else if ("idea".equalsIgnoreCase(ideaOverrideBuildType)) { + delegateBuildRunToGradle = false + testRunner = org.jetbrains.gradle.ext.ActionDelegationConfig.TestRunner.PLATFORM + } else { + throw GradleScriptException('Accepted value for ideaOverrideBuildType is one of gradle or idea.') + } + } + } runConfigurations { "1. Run Client"(Gradle) { taskNames = ["runClient"] @@ -753,6 +985,20 @@ idea { "2. Run Server"(Gradle) { taskNames = ["runServer"] } + "1a. Run Client (Java 17)"(Gradle) { + taskNames = ["runClient17"] + } + "2a. Run Server (Java 17)"(Gradle) { + taskNames = ["runServer17"] + } + "1b. Run Client (Java 17, Hotswap)"(Gradle) { + taskNames = ["runClient17"] + envs = ["HOTSWAP": "true"] + } + "2b. Run Server (Java 17, Hotswap)"(Gradle) { + taskNames = ["runServer17"] + envs = ["HOTSWAP": "true"] + } "3. Run Obfuscated Client"(Gradle) { taskNames = ["runObfClient"] } @@ -770,7 +1016,7 @@ idea { } "Run Client (IJ Native)"(Application) { mainClass = "GradleStart" - moduleName = project.name + ".main" + moduleName = project.name + ".ideVirtualMain" afterEvaluate { workingDirectory = tasks.runClient.workingDir.absolutePath programParameters = tasks.runClient.calculateArgs(project).collect { '"' + it + '"' }.join(' ') @@ -781,7 +1027,7 @@ idea { } "Run Server (IJ Native)"(Application) { mainClass = "GradleStartServer" - moduleName = project.name + ".main" + moduleName = project.name + ".ideVirtualMain" afterEvaluate { workingDirectory = tasks.runServer.workingDir.absolutePath programParameters = tasks.runServer.calculateArgs(project).collect { '"' + it + '"' }.join(' ') @@ -793,11 +1039,57 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] } } + withIDEADir { File ideaDir -> + if (!ideaDir.path.contains(".idea")) { + // If an .ipr file exists, the project root directory is passed here instead of the .idea subdirectory + ideaDir = new File(ideaDir, ".idea") + } + if (ideaDir.isDirectory()) { + def miscFile = new File(ideaDir, "misc.xml") + if (miscFile.isFile()) { + boolean dirty = false + def miscTransformer = new XmlTransformer() + miscTransformer.addAction { root -> + Node rootNode = root.asNode() + def rootManager = rootNode + .component.find { it.@name == 'ProjectRootManager' } + if (!rootManager) { + rootManager = rootNode.appendNode('component', ['name': 'ProjectRootManager', 'version': '2']) + dirty = true + } + def output = rootManager.output + if (!output) { + output = rootManager.appendNode('output') + dirty = true + } + if (!output.@url) { + // Only modify the output url if it doesn't yet have one, or if the existing one is blank somehow. + // This is a sensible default for most setups + output.@url = 'file://$PROJECT_DIR$/build/ideaBuild' + dirty = true + } + } + def result = miscTransformer.transform(miscFile.text) + if (dirty) { + miscFile.write(result) + } + } else { + miscFile.text = """ + + + + + +""" + } + } + } } } } @@ -867,7 +1159,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -911,7 +1203,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) @@ -945,10 +1237,21 @@ def addCurseForgeRelation(String type, String name) { } // Updating + +def buildscriptGradleVersion = "8.1.1" + +tasks.named('wrapper', Wrapper).configure { + gradleVersion = buildscriptGradleVersion +} + tasks.register('updateBuildScript') { group = 'GTNH Buildscript' description = 'Updates the build script to the latest version' + if (gradle.gradleVersion != buildscriptGradleVersion && !Boolean.getBoolean('DISABLE_BUILDSCRIPT_GRADLE_UPDATE')) { + dependsOn('wrapper') + } + doLast { if (performBuildScriptUpdate()) return @@ -961,6 +1264,24 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA performBuildScriptUpdate() } else { out.style(Style.SuccessHeader).println("Build script update available! Run 'gradle updateBuildScript'") + if (gradle.gradleVersion != buildscriptGradleVersion) { + out.style(Style.SuccessHeader).println("updateBuildScript can update gradle from ${gradle.gradleVersion} to ${buildscriptGradleVersion}\n") + } + } +} + +// If you want to add more cases to this task, implement them as arguments if total amount to print gets too large +tasks.register('faq') { + group = 'GTNH Buildscript' + description = 'Prints frequently asked questions about building a project' + + doLast { + print("If your build fails to fetch dependencies, they might have been deleted and replaced by newer " + + "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + + "The links can be found in repositories.gradle and build.gradle:repositories, " + + "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") } } @@ -1101,7 +1422,7 @@ static int replaceParams(File file, Map params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1143,11 +1464,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1155,34 +1472,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1190,50 +1480,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) + return dependencies.rfg.deobf(files(obfFile)) } - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() -} - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/dependencies.gradle b/dependencies.gradle index 61a7e9d..a11d72b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,6 +2,7 @@ dependencies { compile('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') + compile('com.github.GTNewHorizons:NotEnoughItems:2.3.50-GTNH:dev') compile('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') diff --git a/src/main/java/makeo/gadomancy/api/GadomancyApi.java b/src/main/java/makeo/gadomancy/api/GadomancyApi.java index 7c61e0e..bcbf0e7 100644 --- a/src/main/java/makeo/gadomancy/api/GadomancyApi.java +++ b/src/main/java/makeo/gadomancy/api/GadomancyApi.java @@ -2,12 +2,11 @@ package makeo.gadomancy.api; import java.util.List; +import net.minecraft.item.ItemStack; + import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import makeo.gadomancy.api.internal.IApiHandler; - -import net.minecraft.item.ItemStack; - import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.EnumGolemType; diff --git a/src/main/java/makeo/gadomancy/api/golems/events/GolemDropPlacerEvent.java b/src/main/java/makeo/gadomancy/api/golems/events/GolemDropPlacerEvent.java index e496649..1db36a0 100644 --- a/src/main/java/makeo/gadomancy/api/golems/events/GolemDropPlacerEvent.java +++ b/src/main/java/makeo/gadomancy/api/golems/events/GolemDropPlacerEvent.java @@ -3,8 +3,8 @@ package makeo.gadomancy.api.golems.events; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; -import thaumcraft.common.entities.golems.EntityGolemBase; import cpw.mods.fml.common.eventhandler.Event; +import thaumcraft.common.entities.golems.EntityGolemBase; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/api/golems/events/PlacerCreateGolemEvent.java b/src/main/java/makeo/gadomancy/api/golems/events/PlacerCreateGolemEvent.java index 7dc9010..1ac12ec 100644 --- a/src/main/java/makeo/gadomancy/api/golems/events/PlacerCreateGolemEvent.java +++ b/src/main/java/makeo/gadomancy/api/golems/events/PlacerCreateGolemEvent.java @@ -3,8 +3,8 @@ package makeo.gadomancy.api.golems.events; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import thaumcraft.common.entities.golems.EntityGolemBase; import cpw.mods.fml.common.eventhandler.Event; +import thaumcraft.common.entities.golems.EntityGolemBase; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java b/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java index e8cb6be..7902bbc 100644 --- a/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java +++ b/src/main/java/makeo/gadomancy/api/internal/IApiHandler.java @@ -2,13 +2,12 @@ package makeo.gadomancy.api.internal; import java.util.List; +import net.minecraft.item.ItemStack; + import makeo.gadomancy.api.AuraEffect; import makeo.gadomancy.api.ClickBehavior; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; - -import net.minecraft.item.ItemStack; - import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/client/ClientProxy.java b/src/main/java/makeo/gadomancy/client/ClientProxy.java index 4fdcfc5..e33f921 100644 --- a/src/main/java/makeo/gadomancy/client/ClientProxy.java +++ b/src/main/java/makeo/gadomancy/client/ClientProxy.java @@ -4,6 +4,24 @@ import java.util.ArrayDeque; import java.util.List; import java.util.Queue; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.SimpleReloadableResourceManager; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.world.World; +import net.minecraftforge.client.MinecraftForgeClient; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.common.util.ForgeDirection; + +import cpw.mods.fml.client.registry.ClientRegistry; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import cpw.mods.fml.client.registry.RenderingRegistry; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.FMLLog; import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.events.ClientHandler; import makeo.gadomancy.client.events.RenderEventHandler; @@ -25,20 +43,6 @@ import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.SimpleReloadableResourceManager; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.Item; -import net.minecraft.world.World; -import net.minecraftforge.client.MinecraftForgeClient; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.util.ForgeDirection; - import thaumcraft.client.gui.GuiGolem; import thaumcraft.client.renderers.entity.RenderGolemBase; import thaumcraft.client.renderers.entity.RenderSpecialItem; @@ -48,11 +52,6 @@ import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.tiles.TileEldritchAltar; import thaumcraft.common.tiles.TileEldritchCap; import thaumcraft.common.tiles.TileEldritchObelisk; -import cpw.mods.fml.client.registry.ClientRegistry; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.FMLLog; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java b/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java index 43e28b8..6843922 100644 --- a/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java +++ b/src/main/java/makeo/gadomancy/client/effect/EffectHandler.java @@ -1,15 +1,14 @@ package makeo.gadomancy.client.effect; -import makeo.gadomancy.client.effect.fx.FXFlow; -import makeo.gadomancy.client.effect.fx.FXVortex; -import makeo.gadomancy.client.effect.fx.Orbital; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.client.renderer.Tessellator; import net.minecraft.world.World; import net.minecraftforge.client.event.RenderWorldLastEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import makeo.gadomancy.client.effect.fx.FXFlow; +import makeo.gadomancy.client.effect.fx.FXVortex; +import makeo.gadomancy.client.effect.fx.Orbital; +import makeo.gadomancy.common.utils.Vector3; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java b/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java index 9f2aa42..edfa69f 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/EntityFXFlowPolicy.java @@ -3,11 +3,11 @@ package makeo.gadomancy.client.effect.fx; import java.awt.*; import java.util.Random; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.client.Minecraft; import net.minecraft.world.World; +import makeo.gadomancy.common.utils.Vector3; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java b/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java index 63ad8ea..4689d11 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/FXFlow.java @@ -5,12 +5,6 @@ import java.util.ArrayDeque; import java.util.Queue; import java.util.Random; -import makeo.gadomancy.client.effect.EffectHandler; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.SimpleResourceLocation; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntityFX; import net.minecraft.client.renderer.Tessellator; @@ -19,6 +13,12 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.effect.EffectHandler; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.SimpleResourceLocation; +import makeo.gadomancy.common.utils.Vector3; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java b/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java index d62bb7f..44166d6 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/FXVortex.java @@ -2,12 +2,6 @@ package makeo.gadomancy.client.effect.fx; import java.util.Random; -import makeo.gadomancy.client.effect.EffectHandler; -import makeo.gadomancy.client.events.ClientHandler; -import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; @@ -16,6 +10,11 @@ import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.effect.EffectHandler; +import makeo.gadomancy.client.events.ClientHandler; +import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.client.lib.QuadHelper; import thaumcraft.client.lib.UtilsFX; diff --git a/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java b/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java index 2df7819..8bb3930 100644 --- a/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java +++ b/src/main/java/makeo/gadomancy/client/effect/fx/Orbital.java @@ -5,14 +5,14 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; +import net.minecraft.client.Minecraft; +import net.minecraft.world.World; + import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.utils.MiscUtils; import makeo.gadomancy.common.utils.Vector3; -import net.minecraft.client.Minecraft; -import net.minecraft.world.World; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/events/ClientHandler.java b/src/main/java/makeo/gadomancy/client/events/ClientHandler.java index 3d8e510..df5bec8 100644 --- a/src/main/java/makeo/gadomancy/client/events/ClientHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/ClientHandler.java @@ -2,17 +2,16 @@ package makeo.gadomancy.client.events; import java.util.Queue; -import makeo.gadomancy.client.ClientProxy; -import makeo.gadomancy.client.effect.EffectHandler; -import makeo.gadomancy.client.renderers.tile.RenderTileEssentiaCompressor; -import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.client.Minecraft; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.network.FMLNetworkEvent; +import makeo.gadomancy.client.ClientProxy; +import makeo.gadomancy.client.effect.EffectHandler; +import makeo.gadomancy.client.renderers.tile.RenderTileEssentiaCompressor; +import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.common.Gadomancy; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java index bbab23c..b219de0 100644 --- a/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java +++ b/src/main/java/makeo/gadomancy/client/events/RenderEventHandler.java @@ -4,24 +4,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.zip.GZIPInputStream; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; -import makeo.gadomancy.client.gui.GuiResearchRecipeAuraEffects; -import makeo.gadomancy.client.util.ExtendedTypeDisplayManager; -import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.client.util.MultiTickEffectDispatcher; -import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; -import makeo.gadomancy.common.data.DataAchromatic; -import makeo.gadomancy.common.data.SyncDataHolder; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.utils.Injector; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.NBTHelper; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GLAllocation; @@ -40,6 +22,25 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.client.gui.GuiResearchRecipeAuraEffects; +import makeo.gadomancy.client.util.ExtendedTypeDisplayManager; +import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.client.util.MultiTickEffectDispatcher; +import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.data.DataAchromatic; +import makeo.gadomancy.common.data.SyncDataHolder; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.Injector; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.NBTHelper; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.api.BlockCoordinates; import thaumcraft.api.IArchitect; import thaumcraft.api.research.ResearchItem; @@ -50,8 +51,6 @@ import thaumcraft.client.lib.REHWandHandler; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.items.relics.ItemThaumometer; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java index 1b4bd7d..29db776 100644 --- a/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java +++ b/src/main/java/makeo/gadomancy/client/events/ResourceReloadListener.java @@ -2,12 +2,6 @@ package makeo.gadomancy.client.events; import java.util.Map; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.client.textures.GolemGuiTexture; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; @@ -15,6 +9,12 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; import net.minecraft.util.StringTranslate; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.client.textures.GolemGuiTexture; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.utils.Injector; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java index 6539f9a..c1f3173 100644 --- a/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/ArcanePackagerGui.java @@ -2,11 +2,6 @@ package makeo.gadomancy.client.gui; import java.awt.*; -import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; -import makeo.gadomancy.common.containers.ContainerArcanePackager; -import makeo.gadomancy.common.utils.ColorHelper; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -16,6 +11,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; +import makeo.gadomancy.common.containers.ContainerArcanePackager; +import makeo.gadomancy.common.utils.ColorHelper; +import makeo.gadomancy.common.utils.SimpleResourceLocation; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java b/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java index 2049f70..a5fd4b5 100644 --- a/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java +++ b/src/main/java/makeo/gadomancy/client/gui/GuiResearchRecipeAuraEffects.java @@ -5,11 +5,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.aura.AuraResearchManager; -import makeo.gadomancy.common.aura.ResearchPageAuraAspects; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.item.ItemStack; @@ -18,6 +13,10 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.aura.AuraResearchManager; +import makeo.gadomancy.common.aura.ResearchPageAuraAspects; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java b/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java index 48d95d0..b83ba36 100644 --- a/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java +++ b/src/main/java/makeo/gadomancy/client/gui/InfusionClawGui.java @@ -2,11 +2,6 @@ package makeo.gadomancy.client.gui; import java.awt.*; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import makeo.gadomancy.common.containers.ContainerInfusionClaw; -import makeo.gadomancy.common.utils.ColorHelper; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.Minecraft; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.entity.player.InventoryPlayer; @@ -19,6 +14,10 @@ import org.lwjgl.opengl.GL11; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.containers.ContainerInfusionClaw; +import makeo.gadomancy.common.utils.ColorHelper; +import makeo.gadomancy.common.utils.SimpleResourceLocation; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java index 12ed58b..eecfbcb 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/BlockExtendedNodeJarRenderer.java @@ -1,7 +1,5 @@ package makeo.gadomancy.client.renderers.block; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; @@ -13,9 +11,10 @@ import net.minecraft.world.IBlockAccess; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.common.blocks.BlockJar; import thaumcraft.common.config.ConfigBlocks; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; /** * This class is NOT part of the Gadomancy Mod This file is copied from Azanors diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java index 551f2d0..fb85fd6 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockStoneMachine.java @@ -1,15 +1,14 @@ package makeo.gadomancy.client.renderers.block; -import makeo.gadomancy.common.blocks.BlockStoneMachine; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; +import makeo.gadomancy.common.blocks.BlockStoneMachine; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.client.renderers.block.BlockStoneDeviceRenderer; import thaumcraft.common.blocks.BlockStoneDevice; -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java index 7769ba1..ddd7d4d 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java +++ b/src/main/java/makeo/gadomancy/client/renderers/block/RenderBlockTransparent.java @@ -1,12 +1,12 @@ package makeo.gadomancy.client.renderers.block; -import makeo.gadomancy.common.blocks.IBlockTransparent; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.world.IBlockAccess; +import makeo.gadomancy.common.blocks.IBlockTransparent; +import makeo.gadomancy.common.registration.RegisteredBlocks; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java index aef7355..cc84bc1 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderAdditionalGolemBase.java @@ -1,14 +1,13 @@ package makeo.gadomancy.client.renderers.entity; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import thaumcraft.client.renderers.entity.RenderGolemBase; import thaumcraft.client.renderers.models.entities.ModelGolem; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityAuraCore.java b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityAuraCore.java index 34b3688..4fe2833 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityAuraCore.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderEntityAuraCore.java @@ -1,10 +1,10 @@ package makeo.gadomancy.client.renderers.entity; +import net.minecraft.entity.Entity; + import makeo.gadomancy.common.entities.EntityAuraCore; import makeo.gadomancy.common.utils.MiscUtils; -import net.minecraft.entity.Entity; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java index e8f2453..6030a63 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java +++ b/src/main/java/makeo/gadomancy/client/renderers/entity/RenderGolemHelper.java @@ -2,8 +2,6 @@ package makeo.gadomancy.client.renderers.entity; import java.awt.*; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; @@ -20,6 +18,7 @@ import net.minecraft.util.IIcon; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; import thaumcraft.client.renderers.models.entities.ModelGolem; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java index ac32797..8945922 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemCreativeNodeRenderer.java @@ -1,9 +1,8 @@ package makeo.gadomancy.client.renderers.item; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.NodeType; diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java index 5cfa558..dd456aa 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemExNodeRenderer.java @@ -1,10 +1,9 @@ package makeo.gadomancy.client.renderers.item; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.client.renderers.tile.ItemNodeRenderer; /** diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java index 44bd4e7..910cec1 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemJarExtendedNodeRenderer.java @@ -1,9 +1,5 @@ package makeo.gadomancy.client.renderers.item; -import makeo.gadomancy.common.items.ItemExtendedNodeJar; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.texture.TextureMap; @@ -14,6 +10,9 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.items.ItemExtendedNodeJar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.tiles.TileJar; diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java index ea86263..df9c74c 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderFamiliar.java @@ -3,11 +3,6 @@ package makeo.gadomancy.client.renderers.item; import java.awt.*; import java.util.Random; -import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.world.fake.FakeWorld; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.ActiveRenderInfo; import net.minecraft.client.renderer.Tessellator; @@ -19,6 +14,10 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.world.fake.FakeWorld; import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.lib.UtilsFX; diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java index 2c0eb2e..3004df7 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderRemoteJar.java @@ -1,20 +1,19 @@ package makeo.gadomancy.client.renderers.item; -import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.client.registry.RenderingRegistry; +import makeo.gadomancy.client.renderers.tile.RenderTileRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.blocks.ItemJarFilled; import thaumcraft.common.config.ConfigItems; -import cpw.mods.fml.client.registry.RenderingRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTEKnowledgeBook.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTEKnowledgeBook.java index 5309653..64b30d4 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTEKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTEKnowledgeBook.java @@ -1,12 +1,12 @@ package makeo.gadomancy.client.renderers.item; -import makeo.gadomancy.client.renderers.tile.RenderTileKnowledgeBook; -import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; - import net.minecraft.item.ItemStack; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.renderers.tile.RenderTileKnowledgeBook; +import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; + /** * HellFirePvP@Admin Date: 19.04.2016 / 16:02 on Gadomancy ItemRenderTEKnowledgeBook */ diff --git a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java index 6f86654..33e9d54 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java +++ b/src/main/java/makeo/gadomancy/client/renderers/item/ItemRenderTileEntity.java @@ -1,8 +1,5 @@ package makeo.gadomancy.client.renderers.item; -import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; -import makeo.gadomancy.common.utils.world.fake.FakeWorld; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -11,6 +8,9 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; +import makeo.gadomancy.common.utils.world.fake.FakeWorld; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java index 57c281a..03bf034 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAIShutdown.java @@ -2,15 +2,14 @@ package makeo.gadomancy.client.renderers.tile; import java.util.Random; -import makeo.gadomancy.client.effect.EffectHandler; -import makeo.gadomancy.client.effect.fx.Orbital; -import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import makeo.gadomancy.client.effect.EffectHandler; +import makeo.gadomancy.client.effect.fx.Orbital; +import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXWisp; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java index bdcf579..8790c2d 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcaneDropper.java @@ -1,8 +1,5 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.client.models.ModelArcaneDropper; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -11,6 +8,8 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelArcaneDropper; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.client.renderers.tile.TileBellowsRenderer; import thaumcraft.common.tiles.TileBellows; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java index b841d73..3da76b4 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileArcanePackager.java @@ -1,16 +1,15 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.client.models.ModelArcanePackager; -import makeo.gadomancy.client.models.ModelPackagerPiston; -import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelArcanePackager; +import makeo.gadomancy.client.models.ModelPackagerPiston; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.common.tiles.TileJarFillable; /** diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java index fffe180..dd9df3d 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileAuraPylon.java @@ -3,6 +3,14 @@ package makeo.gadomancy.client.renderers.tile; import java.awt.*; import java.util.Random; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ResourceLocation; +import net.minecraft.world.World; + +import org.lwjgl.opengl.GL11; + import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.effect.fx.Orbital; import makeo.gadomancy.client.models.ModelAuraPylon; @@ -12,15 +20,6 @@ import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; import makeo.gadomancy.common.blocks.tiles.TileAuraPylonTop; import makeo.gadomancy.common.utils.SimpleResourceLocation; import makeo.gadomancy.common.utils.Vector3; - -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.ParticleEngine; import thaumcraft.client.fx.particles.FXWisp; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java index c5fbdc7..58f52d9 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileBlockProtector.java @@ -1,14 +1,13 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.client.models.ModelBlockProtector; -import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelBlockProtector; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.client.renderers.models.ModelJar; import thaumcraft.client.renderers.tile.TileJarRenderer; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileCapEldritch.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileCapEldritch.java index bcc97c3..9f1be73 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileCapEldritch.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileCapEldritch.java @@ -1,9 +1,8 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.tileentity.TileEntity; +import makeo.gadomancy.common.data.config.ModConfig; import thaumcraft.client.renderers.tile.TileEldritchCapRenderer; import thaumcraft.common.config.Config; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java index 19bd155..73b08ba 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileEssentiaCompressor.java @@ -3,6 +3,13 @@ package makeo.gadomancy.client.renderers.tile; import java.util.HashMap; import java.util.Map; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChunkCoordinates; + +import org.lwjgl.opengl.GL11; + import makeo.gadomancy.client.effect.EffectHandler; import makeo.gadomancy.client.effect.fx.FXVortex; import makeo.gadomancy.client.models.ModelEssentiaCompressor; @@ -11,13 +18,6 @@ import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; import makeo.gadomancy.common.utils.SimpleResourceLocation; import makeo.gadomancy.common.utils.world.fake.FakeWorld; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChunkCoordinates; - -import org.lwjgl.opengl.GL11; - /** * HellFirePvP@Admin Date: 22.04.2016 / 21:39 on Gadomancy RenderTileEssentiaCompressor */ diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java index f8b60ba..144f498 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileExtendedNode.java @@ -1,11 +1,11 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.node.ExtendedNodeType; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.node.ExtendedNodeType; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java index d642789..d14a1f4 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileInfusionClaw.java @@ -2,12 +2,6 @@ package makeo.gadomancy.client.renderers.tile; import java.util.Random; -import makeo.gadomancy.client.models.ModelInfusionClawPart; -import makeo.gadomancy.client.models.ModelWandPart; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import makeo.gadomancy.common.utils.Injector; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; @@ -21,6 +15,11 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelInfusionClawPart; +import makeo.gadomancy.client.models.ModelWandPart; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.utils.Injector; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.client.renderers.entity.RenderPrimalOrb; import thaumcraft.client.renderers.item.ItemWandRenderer; import thaumcraft.common.Thaumcraft; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java index b34930e..dd35839 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileKnowledgeBook.java @@ -1,7 +1,5 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; - import net.minecraft.client.model.ModelBook; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; @@ -10,6 +8,8 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; + /** * HellFirePvP@Admin Date: 19.04.2016 / 14:57 on Gadomancy RenderTileKnowledgeBook */ diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java index be0054f..18ece65 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulationFocus.java @@ -1,15 +1,15 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.client.models.ModelFocusPortalPart; -import makeo.gadomancy.client.models.ModelManipulatorPart; -import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.tileentity.TileEntity; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelFocusPortalPart; +import makeo.gadomancy.client.models.ModelManipulatorPart; +import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; +import makeo.gadomancy.common.utils.SimpleResourceLocation; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java index 0e24f2f..28a0065 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileManipulatorPillar.java @@ -2,12 +2,11 @@ package makeo.gadomancy.client.renderers.tile; import java.util.Map; -import makeo.gadomancy.common.utils.Injector; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.common.utils.Injector; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.client.lib.UtilsFX; import thaumcraft.client.renderers.tile.TileInfusionPillarRenderer; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java index 1001726..ca5da79 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeBasic.java @@ -1,7 +1,5 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.events.EventHandlerRedirect; - import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -14,6 +12,7 @@ import net.minecraft.util.Vec3; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.events.EventHandlerRedirect; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java index 0d90f95..2e346f5 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileNodeManipulator.java @@ -1,14 +1,13 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.client.models.ModelSmallCube; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelSmallCube; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.client.renderers.tile.TileWandPedestalRenderer; /** diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileObelisk.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileObelisk.java index f7b698e..91c7297 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileObelisk.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileObelisk.java @@ -1,9 +1,8 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.tileentity.TileEntity; +import makeo.gadomancy.common.data.config.ModConfig; import thaumcraft.client.renderers.tile.TileEldritchObeliskRenderer; import thaumcraft.common.config.Config; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java index d8e348f..0e0db1b 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileRemoteJar.java @@ -1,10 +1,5 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.client.models.ModelJarPot; -import makeo.gadomancy.common.blocks.BlockRemoteJar; -import makeo.gadomancy.common.utils.SimpleResourceLocation; -import makeo.gadomancy.common.utils.world.fake.FakeWorld; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; @@ -12,6 +7,10 @@ import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.client.models.ModelJarPot; +import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.utils.SimpleResourceLocation; +import makeo.gadomancy.common.utils.world.fake.FakeWorld; import thaumcraft.client.renderers.tile.TileJarRenderer; import thaumcraft.client.renderers.tile.TileMirrorRenderer; import thaumcraft.common.tiles.TileMirrorEssentia; diff --git a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java index 2e8411c..552a7ce 100644 --- a/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java +++ b/src/main/java/makeo/gadomancy/client/renderers/tile/RenderTileStickyJar.java @@ -1,7 +1,5 @@ package makeo.gadomancy.client.renderers.tile; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; - import net.minecraft.block.Block; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; @@ -14,6 +12,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import thaumcraft.common.tiles.TileJarFillable; /** diff --git a/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java b/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java index d5020c8..8202852 100644 --- a/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java +++ b/src/main/java/makeo/gadomancy/client/textures/GolemGuiTexture.java @@ -8,9 +8,6 @@ import java.util.List; import javax.imageio.ImageIO; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; - import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.IResource; import net.minecraft.client.resources.IResourceManager; @@ -20,6 +17,8 @@ import net.minecraft.util.ResourceLocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; import thaumcraft.common.entities.golems.EnumGolemType; /** diff --git a/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java b/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java index 3ef8ca8..fa60199 100644 --- a/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java +++ b/src/main/java/makeo/gadomancy/client/transformation/TransformationHelper.java @@ -4,19 +4,18 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.client.renderers.entity.PlayerCameraRenderer; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketAbortTransform; -import makeo.gadomancy.common.registration.RegisteredIntegrations; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.EntityRenderer; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; -import thaumcraft.common.entities.golems.EntityGolemBase; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.client.renderers.entity.PlayerCameraRenderer; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketAbortTransform; +import makeo.gadomancy.common.registration.RegisteredIntegrations; +import thaumcraft.common.entities.golems.EntityGolemBase; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java b/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java index 2798404..fda6e6f 100644 --- a/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java +++ b/src/main/java/makeo/gadomancy/client/util/ExtendedTypeDisplayManager.java @@ -1,10 +1,9 @@ package makeo.gadomancy.client.util; -import makeo.gadomancy.client.events.ResourceReloadListener; -import makeo.gadomancy.common.node.ExtendedNodeType; - import net.minecraft.util.StatCollector; +import makeo.gadomancy.client.events.ResourceReloadListener; +import makeo.gadomancy.common.node.ExtendedNodeType; import thaumcraft.api.nodes.NodeType; /** diff --git a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java index 3e55248..82369a5 100644 --- a/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java +++ b/src/main/java/makeo/gadomancy/client/util/FamiliarHandlerClient.java @@ -5,11 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.client.renderers.item.ItemRenderFamiliar; -import makeo.gadomancy.common.data.DataFamiliar; -import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; -import makeo.gadomancy.common.utils.world.fake.FakeWorld; - import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.Entity; @@ -20,12 +15,16 @@ import net.minecraft.world.World; import org.lwjgl.opengl.GL11; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.client.renderers.item.ItemRenderFamiliar; +import makeo.gadomancy.common.data.DataFamiliar; +import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; +import makeo.gadomancy.common.utils.world.fake.FakeWorld; import thaumcraft.api.aspects.Aspect; import thaumcraft.client.fx.bolt.FXLightningBolt; import thaumcraft.client.renderers.entity.RenderWisp; import thaumcraft.common.entities.monster.EntityWisp; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java index f7e6260..65eb5c6 100644 --- a/src/main/java/makeo/gadomancy/client/util/UtilsFX.java +++ b/src/main/java/makeo/gadomancy/client/util/UtilsFX.java @@ -3,13 +3,12 @@ package makeo.gadomancy.client.util; import java.awt.*; import java.util.Random; -import makeo.gadomancy.common.utils.MiscUtils; - import net.minecraft.client.Minecraft; import net.minecraft.client.particle.EntitySmokeFX; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import makeo.gadomancy.common.utils.MiscUtils; import thaumcraft.common.Thaumcraft; /** diff --git a/src/main/java/makeo/gadomancy/common/CommonProxy.java b/src/main/java/makeo/gadomancy/common/CommonProxy.java index fbf0c4e..61b550b 100644 --- a/src/main/java/makeo/gadomancy/common/CommonProxy.java +++ b/src/main/java/makeo/gadomancy/common/CommonProxy.java @@ -4,6 +4,17 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.world.World; +import net.minecraftforge.common.DimensionManager; +import net.minecraftforge.common.MinecraftForge; + +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.IGuiHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; import makeo.gadomancy.client.ClientProxy; import makeo.gadomancy.common.aura.AuraEffects; import makeo.gadomancy.common.containers.ContainerArcanePackager; @@ -19,21 +30,9 @@ import makeo.gadomancy.common.network.packets.PacketStartAnimation; import makeo.gadomancy.common.registration.*; import makeo.gadomancy.common.utils.Injector; import makeo.gadomancy.common.utils.world.WorldProviderTCEldrich; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.world.World; -import net.minecraftforge.common.DimensionManager; -import net.minecraftforge.common.MinecraftForge; - import thaumcraft.api.wands.WandTriggerRegistry; import thaumcraft.common.entities.golems.ContainerGolem; import thaumcraft.common.entities.golems.EntityGolemBase; -import cpw.mods.fml.common.FMLCommonHandler; -import cpw.mods.fml.common.network.IGuiHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/Gadomancy.java b/src/main/java/makeo/gadomancy/common/Gadomancy.java index 6d3d304..d5ee64f 100644 --- a/src/main/java/makeo/gadomancy/common/Gadomancy.java +++ b/src/main/java/makeo/gadomancy/common/Gadomancy.java @@ -1,17 +1,16 @@ package makeo.gadomancy.common; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.common.api.DefaultApiHandler; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.data.config.ModData; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import thaumcraft.common.Thaumcraft; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.*; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.common.api.DefaultApiHandler; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.data.config.ModData; +import thaumcraft.common.Thaumcraft; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java index 5760fda..ee15f6e 100644 --- a/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java +++ b/src/main/java/makeo/gadomancy/common/api/DefaultApiHandler.java @@ -5,6 +5,13 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.AuraEffect; import makeo.gadomancy.api.ClickBehavior; import makeo.gadomancy.api.golems.AdditionalGolemType; @@ -19,16 +26,8 @@ import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.utils.GolemEnumHelper; import makeo.gadomancy.common.utils.NBTHelper; import makeo.gadomancy.common.utils.StringHelper; - -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.golems.EntityGolemBase; -import cpw.mods.fml.common.registry.GameRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java index 6e60fae..ddd47bf 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffectHandler.java @@ -2,14 +2,13 @@ package makeo.gadomancy.common.aura; import java.util.*; -import makeo.gadomancy.api.AuraEffect; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import makeo.gadomancy.api.AuraEffect; import thaumcraft.api.aspects.Aspect; /** diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java index dbba419..61f0844 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraEffects.java @@ -5,13 +5,6 @@ import static makeo.gadomancy.common.utils.MiscUtils.ticksForSeconds; import java.util.Random; -import makeo.gadomancy.api.AuraEffect; -import makeo.gadomancy.common.events.EventHandlerEntity; -import makeo.gadomancy.common.integration.IntegrationThaumicTinkerer; -import makeo.gadomancy.common.registration.RegisteredIntegrations; -import makeo.gadomancy.common.registration.RegisteredPotions; -import makeo.gadomancy.common.utils.MiscUtils; - import net.minecraft.block.Block; import net.minecraft.entity.*; import net.minecraft.entity.effect.EntityLightningBolt; @@ -35,6 +28,12 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.EnumDifficulty; import net.minecraft.world.World; +import makeo.gadomancy.api.AuraEffect; +import makeo.gadomancy.common.events.EventHandlerEntity; +import makeo.gadomancy.common.integration.IntegrationThaumicTinkerer; +import makeo.gadomancy.common.registration.RegisteredIntegrations; +import makeo.gadomancy.common.registration.RegisteredPotions; +import makeo.gadomancy.common.utils.MiscUtils; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.Thaumcraft; diff --git a/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java b/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java index f3948b1..1c8eeae 100644 --- a/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java +++ b/src/main/java/makeo/gadomancy/common/aura/AuraResearchManager.java @@ -3,15 +3,14 @@ package makeo.gadomancy.common.aura; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketTCNotificationText; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.util.StatCollector; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketTCNotificationText; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.research.ResearchItem; import thaumcraft.common.Thaumcraft; diff --git a/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java b/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java index dc83d43..6a3f9be 100644 --- a/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java +++ b/src/main/java/makeo/gadomancy/common/aura/ResearchPageAuraAspects.java @@ -4,12 +4,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; +import makeo.gadomancy.common.utils.SimpleResourceLocation; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchPage; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java index 2bdcf15..86598f9 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockAdditionalEldritchPortal.java @@ -1,12 +1,11 @@ package makeo.gadomancy.common.blocks; -import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.blocks.BlockEldritchPortal; import thaumcraft.common.config.ConfigBlocks; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java b/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java index d96ed45..4c78a2f 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockArcaneDropper.java @@ -2,9 +2,6 @@ package makeo.gadomancy.common.blocks; import java.util.List; -import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -17,6 +14,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.blocks.tiles.TileArcaneDropper; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java b/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java index b80a2eb..77511da 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockAuraPylon.java @@ -2,17 +2,6 @@ package makeo.gadomancy.common.blocks; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; -import makeo.gadomancy.common.blocks.tiles.TileAuraPylonTop; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.registration.RegisteredMultiblocks; -import makeo.gadomancy.common.registration.RegisteredRecipes; -import makeo.gadomancy.common.utils.MultiblockHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -26,10 +15,20 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileAuraPylon; +import makeo.gadomancy.common.blocks.tiles.TileAuraPylonTop; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.registration.RegisteredMultiblocks; +import makeo.gadomancy.common.registration.RegisteredRecipes; +import makeo.gadomancy.common.utils.MultiblockHelper; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java index d9726bf..ccb1c4f 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockEssentiaCompressor.java @@ -1,15 +1,5 @@ package makeo.gadomancy.common.blocks; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.registration.RegisteredRecipes; -import makeo.gadomancy.common.research.SimpleResearchItem; -import makeo.gadomancy.common.utils.ExplosionHelper; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -22,11 +12,20 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileEssentiaCompressor; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.registration.RegisteredRecipes; +import makeo.gadomancy.common.research.SimpleResearchItem; +import makeo.gadomancy.common.utils.ExplosionHelper; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.common.network.NetworkRegistry; /** * HellFirePvP@Admin Date: 22.04.2016 / 21:42 on Gadomancy BlockEssentiaCompressor diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java index 74c6aab..e28ecf0 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockExtendedNodeJar.java @@ -3,11 +3,6 @@ package makeo.gadomancy.common.blocks; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; -import makeo.gadomancy.common.items.ItemExtendedNodeJar; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.particle.EffectRenderer; @@ -21,11 +16,15 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.items.ItemExtendedNodeJar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.blocks.BlockJar; import thaumcraft.common.blocks.CustomStepSound; import thaumcraft.common.config.ConfigBlocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java b/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java index 39b356a..e2ee31e 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockInfusionClaw.java @@ -1,12 +1,5 @@ package makeo.gadomancy.common.blocks; -import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.ItemUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.EntityLivingBase; @@ -17,6 +10,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentTranslation; import net.minecraft.world.World; +import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.ItemUtils; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java index b1aa19b..f039951 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockKnowledgeBook.java @@ -2,11 +2,6 @@ package makeo.gadomancy.common.blocks; import java.util.ArrayList; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -19,6 +14,10 @@ import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java index beb2aa3..2b022fe 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNode.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.blocks; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java index 8578fb7..85edba1 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockNodeManipulator.java @@ -2,10 +2,6 @@ package makeo.gadomancy.common.blocks; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +10,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.common.blocks.BlockStoneDevice; import thaumcraft.common.items.wands.ItemWandCasting; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java index b5409cc..4e8b530 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockRemoteJar.java @@ -3,12 +3,6 @@ package makeo.gadomancy.common.blocks; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +11,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.common.blocks.BlockJar; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.tiles.TileJarFillable; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java index e10cbdf..ce43217 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStickyJar.java @@ -3,13 +3,6 @@ package makeo.gadomancy.common.blocks; import java.util.ArrayList; import java.util.Map; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.registration.StickyJarInfo; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -24,6 +17,12 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.registration.StickyJarInfo; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IEssentiaContainerItem; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java index 6405e1c..6b1560c 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockStoneMachine.java @@ -3,15 +3,6 @@ package makeo.gadomancy.common.blocks; import java.util.List; import java.util.Random; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; -import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; -import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; -import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.ItemUtils; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; @@ -30,6 +21,14 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.blocks.tiles.TileManipulationFocus; +import makeo.gadomancy.common.blocks.tiles.TileManipulatorPillar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.ItemUtils; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.utils.InventoryUtils; import thaumcraft.common.tiles.TileJarFillable; diff --git a/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java b/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java index f8c2de7..67e33d0 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java +++ b/src/main/java/makeo/gadomancy/common/blocks/BlockTransparent.java @@ -1,13 +1,13 @@ package makeo.gadomancy.common.blocks; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.util.IIcon; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.registration.RegisteredBlocks; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java index 56fec94..c4491ae 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAIShutdown.java @@ -2,10 +2,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.*; -import makeo.gadomancy.client.effect.fx.Orbital; -import makeo.gadomancy.common.registration.AIShutdownWhitelist; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; @@ -17,15 +13,18 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; + +import makeo.gadomancy.client.effect.fx.Orbital; +import makeo.gadomancy.common.registration.AIShutdownWhitelist; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; import thaumcraft.api.aspects.IEssentiaTransport; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java index 9876f01..ad4dd0d 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAdditionalEldritchPortal.java @@ -4,9 +4,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.utils.world.TCMazeHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; @@ -14,6 +11,8 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.WorldServer; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.utils.world.TCMazeHandler; import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.tiles.TileEldritchPortal; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java index 5d0b819..e76883d 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneDropper.java @@ -3,8 +3,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; @@ -15,6 +13,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.common.lib.utils.InventoryUtils; /** diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java index 962324c..1cb3d59 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcaneHand.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.UUID; -import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.inventory.ISidedInventory; @@ -21,6 +19,7 @@ import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java index 22fd2d3..3028b36 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileArcanePackager.java @@ -3,9 +3,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.ItemUtils; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -15,6 +12,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.ItemUtils; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.tiles.TileJarFillable; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java index ebab5b2..5d9aa08 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylon.java @@ -3,10 +3,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.aura.AuraEffectHandler; -import makeo.gadomancy.common.entities.EntityPermNoClipItem; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.block.Block; import net.minecraft.command.IEntitySelector; import net.minecraft.entity.Entity; @@ -18,6 +14,11 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.aura.AuraEffectHandler; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -28,8 +29,6 @@ import thaumcraft.client.fx.particles.FXEssentiaTrail; import thaumcraft.common.entities.EntityPermanentItem; import thaumcraft.common.entities.EntitySpecialItem; import thaumcraft.common.items.ItemCrystalEssence; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java index 5eb4eb3..c95db84 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileAuraPylonTop.java @@ -2,15 +2,14 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.ArrayList; -import makeo.gadomancy.client.effect.EffectHandler; -import makeo.gadomancy.client.effect.fx.Orbital; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import makeo.gadomancy.client.effect.EffectHandler; +import makeo.gadomancy.client.effect.fx.Orbital; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java index c91515c..7f02701 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileEssentiaCompressor.java @@ -4,14 +4,6 @@ import java.awt.*; import java.util.*; import java.util.List; -import makeo.gadomancy.client.events.ClientHandler; -import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.ExplosionHelper; -import makeo.gadomancy.common.utils.Injector; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -25,6 +17,17 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.client.events.ClientHandler; +import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.ExplosionHelper; +import makeo.gadomancy.common.utils.Injector; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.WorldCoordinates; import thaumcraft.api.aspects.Aspect; @@ -42,10 +45,6 @@ import thaumcraft.common.lib.network.fx.PacketFXEssentiaSource; import thaumcraft.common.tiles.TilePedestal; import tuhljin.automagy.api.essentia.IAspectContainerWithMax; import tuhljin.automagy.api.essentia.IEssentiaLocusReadable; -import cpw.mods.fml.common.Optional; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java index d0522f5..cd4f137 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNode.java @@ -2,14 +2,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; -import makeo.gadomancy.common.node.ExtendedNodeType; -import makeo.gadomancy.common.node.GrowingNodeBehavior; -import makeo.gadomancy.common.utils.ExplosionHelper; -import makeo.gadomancy.common.utils.ResearchHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -20,6 +12,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; import net.minecraft.world.EnumDifficulty; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; +import makeo.gadomancy.common.node.ExtendedNodeType; +import makeo.gadomancy.common.node.GrowingNodeBehavior; +import makeo.gadomancy.common.utils.ExplosionHelper; +import makeo.gadomancy.common.utils.ResearchHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.IEssentiaContainerItem; import thaumcraft.common.entities.EntityAspectOrb; @@ -28,7 +28,6 @@ import thaumcraft.common.items.ItemCrystalEssence; import thaumcraft.common.items.ItemManaBean; import thaumcraft.common.items.ItemWispEssence; import thaumcraft.common.tiles.TileNode; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java index 728f68a..442e6bb 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileExtendedNodeJar.java @@ -1,8 +1,5 @@ package makeo.gadomancy.common.blocks.tiles; -import makeo.gadomancy.common.node.ExtendedNodeType; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -11,6 +8,8 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import makeo.gadomancy.common.node.ExtendedNodeType; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.NodeModifier; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java index c5cde93..7bcec66 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileInfusionClaw.java @@ -2,17 +2,8 @@ package makeo.gadomancy.common.blocks.tiles; import java.io.File; import java.util.ArrayList; -import java.util.Random; import java.util.UUID; -import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -27,17 +18,25 @@ import net.minecraft.world.storage.IPlayerFileData; import net.minecraft.world.storage.SaveHandler; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; +import thaumcraft.api.visnet.VisNetHandler; import thaumcraft.common.Thaumcraft; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.items.wands.foci.ItemFocusPrimal; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.common.ObfuscationReflectionHelper; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC @@ -48,7 +47,8 @@ import cpw.mods.fml.relauncher.SideOnly; public class TileInfusionClaw extends SynchronizedTileEntity implements ISidedInventory { private static final UUID FAKE_UUID = UUID.fromString("b23c8c3f-d7bd-49b3-970a-8e86728bab82"); - private static final Random RANDOM = new Random(); + + private final AspectList aspects = new AspectList(); private static final ItemWandCasting WAND_ITEM = (ItemWandCasting) ConfigItems.itemWandCasting; private static final ItemFocusPrimal WAND_FOCUS = (ItemFocusPrimal) ConfigItems.itemFocusPrimal; @@ -106,11 +106,41 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements ISidedIn // Comparator... world.notifyBlockChange(this.xCoord, this.yCoord, this.zCoord, this.getBlockType()); } + this.consumeVisFromNetwork(); + this.chargeWand(); } this.count++; } } + private void consumeVisFromNetwork() { + for (Aspect aspect : Aspect.getPrimalAspects()) { + if (aspects.getAmount(aspect) < 1000) { + int drain = VisNetHandler.drainVis(this.worldObj, this.xCoord, this.yCoord, this.zCoord, aspect, 50); + if (drain > 0) { + this.aspects.add(aspect, drain * 20); + } + } + } + } + + private void chargeWand() { + if (this.wandStack != null && wandStack.getItem() instanceof ItemWandCasting) { + int wandMaxVis = TileInfusionClaw.WAND_ITEM.getMaxVis(wandStack); + + for (Aspect aspect : Aspect.getPrimalAspects()) { + int wandAspectAmount = TileInfusionClaw.WAND_ITEM.getVis(wandStack, aspect); + int replenishAmount = Math.min(100, wandMaxVis - wandAspectAmount); + int clawAspectAmount = aspects.getAmount(aspect); + + if (replenishAmount > 0 && clawAspectAmount >= replenishAmount) { + TileInfusionClaw.WAND_ITEM.storeVis(this.wandStack, aspect, wandAspectAmount + replenishAmount); + aspects.reduce(aspect, replenishAmount); + } + } + } + } + @Override public void readCustomNBT(NBTTagCompound compound) { if (compound.hasKey("player")) { @@ -118,6 +148,7 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements ISidedIn } this.wandStack = NBTHelper.getStack(compound, "wandStack"); this.isLocked = compound.getBoolean("isLocked"); + this.aspects.readFromNBT(compound); } @Override @@ -129,6 +160,7 @@ public class TileInfusionClaw extends SynchronizedTileEntity implements ISidedIn NBTHelper.setStack(compound, "wandStack", this.wandStack); } compound.setBoolean("isLocked", this.isLocked); + this.aspects.writeToNBT(compound); } private void markForUpdate() { diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java index adb30c3..a2dba8d 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileKnowledgeBook.java @@ -2,12 +2,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.*; -import makeo.gadomancy.client.util.UtilsFX; -import makeo.gadomancy.common.entities.EntityPermNoClipItem; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.command.IEntitySelector; @@ -22,6 +16,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.client.util.UtilsFX; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IAspectContainer; @@ -33,9 +35,6 @@ import thaumcraft.common.items.ItemResearchNotes; import thaumcraft.common.lib.events.EssentiaHandler; import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.lib.research.ResearchNoteData; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * HellFirePvP@Admin Date: 19.04.2016 / 14:53 on Gadomancy TileKnowledgeBook diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java index 673ea04..811a27a 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileNodeManipulator.java @@ -2,18 +2,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.*; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; -import makeo.gadomancy.common.network.packets.PacketTCWispyLine; -import makeo.gadomancy.common.node.NodeManipulatorResult; -import makeo.gadomancy.common.node.NodeManipulatorResultHandler; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredMultiblocks; -import makeo.gadomancy.common.registration.RegisteredRecipes; -import makeo.gadomancy.common.utils.MultiblockHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -24,6 +12,18 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; +import makeo.gadomancy.common.network.packets.PacketTCWispyLine; +import makeo.gadomancy.common.node.NodeManipulatorResult; +import makeo.gadomancy.common.node.NodeManipulatorResultHandler; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredMultiblocks; +import makeo.gadomancy.common.registration.RegisteredRecipes; +import makeo.gadomancy.common.utils.MultiblockHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; @@ -33,7 +33,6 @@ import thaumcraft.common.items.wands.ItemWandCasting; import thaumcraft.common.lib.utils.InventoryUtils; import thaumcraft.common.tiles.TilePedestal; import thaumcraft.common.tiles.TileWandPedestal; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java index bc60aa5..36cffda 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileOverrideEldritchLock.java @@ -2,11 +2,10 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.concurrent.ConcurrentHashMap; -import makeo.gadomancy.common.utils.world.TCMazeHandler; -import makeo.gadomancy.common.utils.world.TCMazeSession; - import net.minecraft.entity.Entity; +import makeo.gadomancy.common.utils.world.TCMazeHandler; +import makeo.gadomancy.common.utils.world.TCMazeSession; import thaumcraft.common.lib.world.dim.CellLoc; import thaumcraft.common.lib.world.dim.MazeHandler; import thaumcraft.common.tiles.TileEldritchLock; diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java index 46f7d27..c598efb 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileRemoteJar.java @@ -2,11 +2,10 @@ package makeo.gadomancy.common.blocks.tiles; import java.util.*; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.nbt.NBTTagCompound; import net.minecraft.server.MinecraftServer; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.common.tiles.TileJarFillable; /** diff --git a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java index 1bf6625..2206a6c 100644 --- a/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/blocks/tiles/TileStickyJar.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.blocks.tiles; import java.lang.reflect.Field; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; @@ -12,13 +10,14 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.GameData; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IEssentiaTransport; import thaumcraft.common.tiles.TileJarFillable; import thaumcraft.common.tiles.TileJarFillableVoid; -import cpw.mods.fml.common.registry.GameData; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java b/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java index 9456e79..078d05c 100644 --- a/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java +++ b/src/main/java/makeo/gadomancy/common/containers/ContainerArcanePackager.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.containers; -import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.init.Items; @@ -10,6 +8,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.blocks.tiles.TileArcanePackager; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java b/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java index 0b0701d..e2e3619 100644 --- a/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java +++ b/src/main/java/makeo/gadomancy/common/containers/ContainerInfusionClaw.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.containers; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; @@ -9,6 +7,8 @@ import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java b/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java index 3a7ed68..f49f9f7 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java +++ b/src/main/java/makeo/gadomancy/common/crafting/DeprecationItemPaybacks.java @@ -3,11 +3,10 @@ package makeo.gadomancy.common.crafting; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.ConfigBlocks; diff --git a/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java b/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java index 6c4f103..1b0a014 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java +++ b/src/main/java/makeo/gadomancy/common/crafting/EtherealFamiliarUpgradeRecipe.java @@ -2,13 +2,12 @@ package makeo.gadomancy.common.crafting; import java.util.ArrayList; -import makeo.gadomancy.common.familiar.FamiliarAugment; -import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import makeo.gadomancy.common.familiar.FamiliarAugment; +import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; diff --git a/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java b/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java index 21f378f..3aa8c78 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java +++ b/src/main/java/makeo/gadomancy/common/crafting/FamiliarUndoRecipe.java @@ -2,15 +2,15 @@ package makeo.gadomancy.common.crafting; import java.util.ArrayList; -import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.ShapelessRecipes; import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; +import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java b/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java index 8260a72..60e8854 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java +++ b/src/main/java/makeo/gadomancy/common/crafting/Familiar_Old_AugmentInfusion.java @@ -2,12 +2,11 @@ package makeo.gadomancy.common.crafting; import java.util.ArrayList; -import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; diff --git a/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java b/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java index 282bfd8..4108708 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java +++ b/src/main/java/makeo/gadomancy/common/crafting/InfusionDisguiseArmor.java @@ -5,9 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.common.research.SimpleResearchItem; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.entity.EntityLiving; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; @@ -17,6 +14,8 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import makeo.gadomancy.common.research.SimpleResearchItem; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; diff --git a/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java b/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java index 74a0ca5..74c96a5 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java +++ b/src/main/java/makeo/gadomancy/common/crafting/InfusionUpgradeRecipe.java @@ -2,16 +2,15 @@ package makeo.gadomancy.common.crafting; import java.util.ArrayList; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.common.entities.golems.upgrades.GolemUpgrade; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.entities.golems.upgrades.GolemUpgrade; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.common.config.ConfigItems; diff --git a/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java b/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java index ade73c7..441ffb9 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java +++ b/src/main/java/makeo/gadomancy/common/crafting/InfusionVisualDisguiseArmor.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLiving; import net.minecraft.init.Blocks; @@ -13,13 +11,14 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.Gadomancy; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.crafting.InfusionRecipe; import thaumcraft.api.internal.DummyInternalMethodHandler; import thaumcraft.api.internal.IInternalMethodHandler; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java b/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java index 0b1b229..bd3efb7 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/crafting/RecipeStickyJar.java @@ -1,15 +1,14 @@ package makeo.gadomancy.common.crafting; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.research.SimpleResearchItem; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.research.SimpleResearchItem; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java b/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java index 32c9fbc..1e5f208 100644 --- a/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java +++ b/src/main/java/makeo/gadomancy/common/crafting/RecipeVisualStickyJar.java @@ -2,19 +2,18 @@ package makeo.gadomancy.common.crafting; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.client.Minecraft; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.crafting.ShapedArcaneRecipe; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java b/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java index 2447edf..a9460d7 100644 --- a/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java +++ b/src/main/java/makeo/gadomancy/common/data/DataAchromatic.java @@ -3,14 +3,14 @@ package makeo.gadomancy.common.data; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredPotions; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagIntArray; +import makeo.gadomancy.common.registration.RegisteredPotions; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java b/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java index 3a77cbf..cfc427a 100644 --- a/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/data/DataFamiliar.java @@ -5,10 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.common.familiar.FamiliarController; -import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; @@ -16,8 +12,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.world.World; -import thaumcraft.api.aspects.Aspect; import baubles.api.BaublesApi; +import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.common.familiar.FamiliarController; +import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; +import thaumcraft.api.aspects.Aspect; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java b/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java index d600f5e..d3fcc8c 100644 --- a/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java +++ b/src/main/java/makeo/gadomancy/common/data/SyncDataHolder.java @@ -5,11 +5,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import net.minecraft.entity.player.EntityPlayer; + import makeo.gadomancy.common.network.PacketHandler; import makeo.gadomancy.common.network.packets.PacketSyncData; -import net.minecraft.entity.player.EntityPlayer; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java index 5cd0250..11d2ade 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModConfig.java @@ -4,12 +4,11 @@ import java.io.File; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredEnchantments; -import makeo.gadomancy.common.registration.RegisteredPotions; - import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; +import makeo.gadomancy.common.registration.RegisteredEnchantments; +import makeo.gadomancy.common.registration.RegisteredPotions; import thaumcraft.api.aspects.Aspect; /** diff --git a/src/main/java/makeo/gadomancy/common/data/config/ModData.java b/src/main/java/makeo/gadomancy/common/data/config/ModData.java index 8e56e44..98337e6 100644 --- a/src/main/java/makeo/gadomancy/common/data/config/ModData.java +++ b/src/main/java/makeo/gadomancy/common/data/config/ModData.java @@ -4,14 +4,14 @@ import java.io.*; import java.util.HashMap; import java.util.Map; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.server.MinecraftServer; import com.google.gson.Gson; import com.google.gson.JsonIOException; import com.google.gson.JsonSyntaxException; + import cpw.mods.fml.common.FMLLog; +import makeo.gadomancy.common.Gadomancy; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java index b3b590a..5d51221 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityAuraCore.java @@ -6,19 +6,6 @@ import java.util.Collections; import java.util.List; import java.util.Random; -import makeo.gadomancy.client.effect.EffectHandler; -import makeo.gadomancy.client.effect.fx.EntityFXFlowPolicy; -import makeo.gadomancy.client.effect.fx.FXFlow; -import makeo.gadomancy.client.effect.fx.Orbital; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.items.ItemAuraCore; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.PrimalAspectList; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.init.Blocks; @@ -33,13 +20,25 @@ import net.minecraft.util.WeightedRandom; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; +import io.netty.buffer.ByteBuf; +import makeo.gadomancy.client.effect.EffectHandler; +import makeo.gadomancy.client.effect.fx.EntityFXFlowPolicy; +import makeo.gadomancy.client.effect.fx.FXFlow; +import makeo.gadomancy.client.effect.fx.Orbital; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.items.ItemAuraCore; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.PrimalAspectList; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ScanResult; import thaumcraft.common.lib.research.ScanManager; import thaumcraft.common.lib.utils.BlockUtils; -import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData; -import io.netty.buffer.ByteBuf; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java b/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java index 4e72895..a84592a 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityItemElement.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.entities; import java.util.List; -import makeo.gadomancy.common.items.ItemElement; - import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -11,9 +9,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import thaumcraft.client.fx.bolt.FXLightningBolt; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.items.ItemElement; +import thaumcraft.client.fx.bolt.FXLightningBolt; /** * HellFirePvP@Admin Date: 23.04.2016 / 13:45 on Gadomancy EntityItemElement diff --git a/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java b/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java index c878aee..8829279 100644 --- a/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java +++ b/src/main/java/makeo/gadomancy/common/entities/EntityPermNoClipItem.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.entities; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -10,6 +8,7 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.DamageSource; import net.minecraft.world.World; +import makeo.gadomancy.common.data.config.ModConfig; import thaumcraft.common.entities.EntityPermanentItem; /** diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java index 36f0da5..7148054 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIBreakBlock.java @@ -5,9 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; -import makeo.gadomancy.common.entities.fake.GolemFakePlayer; - import net.minecraft.block.Block; import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.init.Blocks; @@ -20,6 +17,8 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.entities.fake.AdvancedFakePlayer; +import makeo.gadomancy.common.entities.fake.GolemFakePlayer; import thaumcraft.common.config.Config; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.Marker; diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java b/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java index c94c87e..7747304 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AISit.java @@ -1,10 +1,9 @@ package makeo.gadomancy.common.entities.ai; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; - import net.minecraft.entity.ai.EntityAIBase; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; import thaumcraft.common.entities.golems.EntityGolemBase; /** diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java index 921b7e8..617f687 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedAttackOnCollide.java @@ -1,10 +1,9 @@ package makeo.gadomancy.common.entities.ai; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.pathfinding.PathEntity; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.common.entities.ai.combat.AIGolemAttackOnCollide; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java index d299226..93e9d0c 100644 --- a/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java +++ b/src/main/java/makeo/gadomancy/common/entities/ai/AIUncheckedDartAttack.java @@ -1,9 +1,8 @@ package makeo.gadomancy.common.entities.ai; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.entity.EntityLivingBase; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.common.entities.ai.combat.AIDartAttack; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java b/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java index 9e550f6..6f247c8 100644 --- a/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java +++ b/src/main/java/makeo/gadomancy/common/entities/fake/AdvancedFakePlayer.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.entities.fake; import java.util.UUID; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -13,6 +11,8 @@ import net.minecraftforge.common.util.FakePlayer; import com.mojang.authlib.GameProfile; +import makeo.gadomancy.common.Gadomancy; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java b/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java index 59b8d8b..7000f4d 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/ItemAdditionalGolemPlacer.java @@ -2,9 +2,6 @@ package makeo.gadomancy.common.entities.golems; import java.util.List; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -13,9 +10,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import thaumcraft.common.entities.golems.ItemGolemPlacer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.registration.RegisteredItems; +import thaumcraft.common.entities.golems.ItemGolemPlacer; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java index 13c7584..3cddeda 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BodyguardGolemCore.java @@ -3,15 +3,6 @@ package makeo.gadomancy.common.entities.golems.cores; import java.util.ArrayList; import java.util.Random; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.entities.ai.AIFollowOwner; -import makeo.gadomancy.common.entities.ai.AISit; -import makeo.gadomancy.common.entities.ai.AIUncheckedAttackOnCollide; -import makeo.gadomancy.common.entities.ai.AIUncheckedDartAttack; -import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityAgeable; import net.minecraft.entity.EntityLivingBase; @@ -23,6 +14,14 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.pathfinding.PathNavigate; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.entities.ai.AIFollowOwner; +import makeo.gadomancy.common.entities.ai.AISit; +import makeo.gadomancy.common.entities.ai.AIUncheckedAttackOnCollide; +import makeo.gadomancy.common.entities.ai.AIUncheckedDartAttack; +import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.entities.ai.misc.AIOpenDoor; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.Marker; diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BreakGolemCore.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BreakGolemCore.java index 5d56bdf..35477bc 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/BreakGolemCore.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/BreakGolemCore.java @@ -1,14 +1,13 @@ package makeo.gadomancy.common.entities.golems.cores; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; -import makeo.gadomancy.common.entities.ai.AIBreakBlock; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.entity.ai.EntityAILookIdle; import net.minecraft.entity.ai.EntityAIWatchClosest; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.common.entities.ai.AIBreakBlock; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.entities.ai.misc.AIOpenDoor; import thaumcraft.common.entities.ai.misc.AIReturnHome; import thaumcraft.common.entities.golems.EntityGolemBase; diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java b/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java index bd99fb2..ec21570 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/cores/EntityAITasksWrapper.java @@ -3,13 +3,12 @@ package makeo.gadomancy.common.entities.golems.cores; import java.util.ArrayList; import java.util.Collection; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; - import net.minecraft.entity.ai.EntityAIBase; import net.minecraft.entity.ai.EntityAITasks; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; import thaumcraft.common.entities.golems.EntityGolemBase; /** diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java index 637a086..f7a48f7 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/nbt/ExtendedGolemProperties.java @@ -1,5 +1,10 @@ package makeo.gadomancy.common.entities.golems.nbt; +import net.minecraft.entity.Entity; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; +import net.minecraftforge.common.IExtendedEntityProperties; + import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; @@ -7,12 +12,6 @@ import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.entities.golems.cores.EntityAITasksWrapper; import makeo.gadomancy.common.utils.NBTHelper; - -import net.minecraft.entity.Entity; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.world.World; -import net.minecraftforge.common.IExtendedEntityProperties; - import thaumcraft.common.entities.golems.EntityGolemBase; /** diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java index 4a2b65c..d8f28c1 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/ObsidianGolemType.java @@ -1,14 +1,14 @@ package makeo.gadomancy.common.entities.golems.types; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.utils.SimpleResourceLocation; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java index 41c7436..2c90db5 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/RemovedGolemType.java @@ -1,12 +1,12 @@ package makeo.gadomancy.common.entities.golems.types; -import makeo.gadomancy.api.golems.AdditionalGolemType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.api.golems.AdditionalGolemType; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java index db29368..6b4e67a 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/types/SilverwoodGolemType.java @@ -1,14 +1,14 @@ package makeo.gadomancy.common.entities.golems.types; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.utils.SimpleResourceLocation; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.utils.SimpleResourceLocation; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java index 361d305..9a06189 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgrade.java @@ -1,13 +1,12 @@ package makeo.gadomancy.common.entities.golems.upgrades; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagByte; import net.minecraft.nbt.NBTTagCompound; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.common.entities.golems.EntityGolemBase; /** diff --git a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java index 05ae589..61444ab 100644 --- a/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java +++ b/src/main/java/makeo/gadomancy/common/entities/golems/upgrades/GolemUpgradeRunicShield.java @@ -1,16 +1,15 @@ package makeo.gadomancy.common.entities.golems.upgrades; -import makeo.gadomancy.common.registration.RegisteredGolemStuff; - import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.DamageSource; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.registration.RegisteredGolemStuff; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.EnumGolemType; import thaumcraft.common.lib.network.PacketHandler; import thaumcraft.common.lib.network.fx.PacketFXShield; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java b/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java index 8d422d7..fab83ae 100644 --- a/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java +++ b/src/main/java/makeo/gadomancy/common/entities/player/ExtendedPlayerProperties.java @@ -1,13 +1,13 @@ package makeo.gadomancy.common.entities.player; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; import net.minecraftforge.common.IExtendedEntityProperties; +import makeo.gadomancy.common.utils.NBTHelper; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java index 03781a3..1e68f09 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerEntity.java @@ -3,15 +3,6 @@ package makeo.gadomancy.common.events; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.aura.AuraEffects; -import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; -import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.entities.EntityPermNoClipItem; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.Vector3; -import makeo.gadomancy.common.utils.world.TCMazeHandler; - import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EnumCreatureType; import net.minecraft.entity.boss.IBossDisplayData; @@ -27,9 +18,17 @@ import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingSpawnEvent; import net.minecraftforge.event.entity.player.EntityItemPickupEvent; -import thaumcraft.common.items.armor.Hover; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import makeo.gadomancy.common.aura.AuraEffects; +import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.entities.EntityPermNoClipItem; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.Vector3; +import makeo.gadomancy.common.utils.world.TCMazeHandler; +import thaumcraft.common.items.armor.Hover; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java index 3e8546a..9512a41 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerGolem.java @@ -3,21 +3,6 @@ package makeo.gadomancy.common.events; import java.util.HashMap; import java.util.Map; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; -import makeo.gadomancy.api.golems.events.GolemDropPlacerEvent; -import makeo.gadomancy.api.golems.events.PlacerCreateGolemEvent; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.data.DataAchromatic; -import makeo.gadomancy.common.data.SyncDataHolder; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; -import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; -import makeo.gadomancy.common.registration.RegisteredGolemStuff; -import makeo.gadomancy.common.registration.RegisteredPotions; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; @@ -35,13 +20,27 @@ import net.minecraftforge.event.entity.player.EntityInteractEvent; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; +import cpw.mods.fml.common.eventhandler.EventPriority; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.api.golems.events.GolemDropPlacerEvent; +import makeo.gadomancy.api.golems.events.PlacerCreateGolemEvent; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.data.DataAchromatic; +import makeo.gadomancy.common.data.SyncDataHolder; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.entities.golems.ItemAdditionalGolemPlacer; +import makeo.gadomancy.common.entities.golems.nbt.ExtendedGolemProperties; +import makeo.gadomancy.common.registration.RegisteredGolemStuff; +import makeo.gadomancy.common.registration.RegisteredPotions; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.entities.golems.EntityGolemBase; import thaumcraft.common.entities.golems.EnumGolemType; import thaumcraft.common.entities.golems.ItemGolemPlacer; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.common.eventhandler.EventPriority; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java index 7c9ef95..afc6dc4 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerNetwork.java @@ -1,5 +1,11 @@ package makeo.gadomancy.common.events; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; + +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.PlayerEvent; import makeo.gadomancy.common.data.DataAchromatic; import makeo.gadomancy.common.data.DataFamiliar; import makeo.gadomancy.common.data.SyncDataHolder; @@ -10,13 +16,6 @@ import makeo.gadomancy.common.network.packets.PacketUpdateOnlineState; import makeo.gadomancy.common.utils.GolemEnumHelper; import makeo.gadomancy.common.utils.world.TCMazeHandler; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.server.MinecraftServer; - -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java index 8d028e6..acd4802 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerRedirect.java @@ -2,10 +2,6 @@ package makeo.gadomancy.common.events; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredEnchantments; -import makeo.gadomancy.common.registration.RegisteredPotions; -import makeo.gadomancy.common.utils.MiscUtils; - import net.minecraft.client.Minecraft; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; @@ -18,10 +14,13 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.client.event.DrawBlockHighlightEvent; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.config.ConfigItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.registration.RegisteredEnchantments; +import makeo.gadomancy.common.registration.RegisteredPotions; +import makeo.gadomancy.common.utils.MiscUtils; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.config.ConfigItems; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java index 58603a7..3b17412 100644 --- a/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java +++ b/src/main/java/makeo/gadomancy/common/events/EventHandlerWorld.java @@ -4,20 +4,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; -import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; -import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; -import makeo.gadomancy.common.blocks.tiles.TileStickyJar; -import makeo.gadomancy.common.data.SyncDataHolder; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.entities.EntityItemElement; -import makeo.gadomancy.common.items.ItemElement; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.*; -import makeo.gadomancy.common.utils.world.TCMazeHandler; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -40,12 +26,25 @@ import net.minecraftforge.event.world.BlockEvent; import net.minecraftforge.event.world.ExplosionEvent; import net.minecraftforge.event.world.WorldEvent; -import thaumcraft.common.config.ConfigBlocks; -import thaumcraft.common.items.wands.ItemWandCasting; -import thaumcraft.common.tiles.TileJarFillable; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileAIShutdown; +import makeo.gadomancy.common.blocks.tiles.TileBlockProtector; +import makeo.gadomancy.common.blocks.tiles.TileNodeManipulator; +import makeo.gadomancy.common.blocks.tiles.TileStickyJar; +import makeo.gadomancy.common.data.SyncDataHolder; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.entities.EntityItemElement; +import makeo.gadomancy.common.items.ItemElement; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.*; +import makeo.gadomancy.common.utils.world.TCMazeHandler; +import thaumcraft.common.config.ConfigBlocks; +import thaumcraft.common.items.wands.ItemWandCasting; +import thaumcraft.common.tiles.TileJarFillable; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java index 1051bd7..ab6296c 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarAIController_Old.java @@ -2,13 +2,12 @@ package makeo.gadomancy.common.familiar; import java.util.*; -import makeo.gadomancy.common.registration.RegisteredFamiliarAI_Old; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import baubles.api.BaublesApi; +import makeo.gadomancy.common.registration.RegisteredFamiliarAI_Old; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java b/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java index 0c728c2..44582ee 100644 --- a/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java +++ b/src/main/java/makeo/gadomancy/common/familiar/FamiliarController.java @@ -5,12 +5,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.monster.IMob; import net.minecraft.entity.player.EntityPlayer; @@ -21,12 +15,17 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.DamageSource; +import baubles.api.BaublesApi; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.config.Config; import thaumcraft.common.items.baubles.ItemAmuletVis; import thaumcraft.common.items.wands.ItemWandCasting; -import baubles.api.BaublesApi; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java index 884e0e8..56b75d2 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationAutomagy.java @@ -1,12 +1,5 @@ package makeo.gadomancy.common.integration; -import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -15,6 +8,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; +import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.blocks.tiles.TileKnowledgeBook; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java index 15fc523..b34b904 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationMorph.java @@ -2,13 +2,12 @@ package makeo.gadomancy.common.integration; import java.lang.reflect.Method; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.utils.Injector; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java index 8b4bfbb..73ecd63 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationNEI.java @@ -3,15 +3,15 @@ package makeo.gadomancy.common.integration; import java.util.ArrayList; import java.util.Iterator; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; + import makeo.gadomancy.common.items.ItemFakeGolemPlacer; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.registration.RegisteredItems; import makeo.gadomancy.common.utils.Injector; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicExploration.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicExploration.java index 97b5a73..349c211 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicExploration.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicExploration.java @@ -1,12 +1,12 @@ package makeo.gadomancy.common.integration; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java index 0052730..5cc8c9c 100644 --- a/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java +++ b/src/main/java/makeo/gadomancy/common/integration/IntegrationThaumicTinkerer.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.integration; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; +import makeo.gadomancy.common.Gadomancy; + /** * HellFirePvP@Admin Date: 20.04.2016 / 00:43 on Gadomancy IntegrationThaumicTinkerer */ diff --git a/src/main/java/makeo/gadomancy/common/integration/mystcraft/EventHandlerMystcraft.java b/src/main/java/makeo/gadomancy/common/integration/mystcraft/EventHandlerMystcraft.java index f6c982c..0a04542 100644 --- a/src/main/java/makeo/gadomancy/common/integration/mystcraft/EventHandlerMystcraft.java +++ b/src/main/java/makeo/gadomancy/common/integration/mystcraft/EventHandlerMystcraft.java @@ -1,9 +1,9 @@ package makeo.gadomancy.common.integration.mystcraft; -import makeo.gadomancy.common.data.config.ModConfig; - import com.xcompwiz.mystcraft.api.event.LinkEvent; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import makeo.gadomancy.common.data.config.ModConfig; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/mystcraft/IntegrationMystcraft.java b/src/main/java/makeo/gadomancy/common/integration/mystcraft/IntegrationMystcraft.java index d3d4812..0d1489f 100644 --- a/src/main/java/makeo/gadomancy/common/integration/mystcraft/IntegrationMystcraft.java +++ b/src/main/java/makeo/gadomancy/common/integration/mystcraft/IntegrationMystcraft.java @@ -1,10 +1,9 @@ package makeo.gadomancy.common.integration.mystcraft; -import makeo.gadomancy.common.integration.IntegrationMod; - import net.minecraftforge.common.MinecraftForge; import cpw.mods.fml.common.FMLCommonHandler; +import makeo.gadomancy.common.integration.IntegrationMod; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java index 5e8dbcc..8051181 100644 --- a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java +++ b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/IntegrationThaumicHorizions.java @@ -1,12 +1,5 @@ package makeo.gadomancy.common.integration.thaumichorizions; -import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.client.ClientProxy; -import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.integration.IntegrationMod; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.entity.player.EntityPlayer; @@ -24,6 +17,12 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; +import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.client.ClientProxy; +import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.integration.IntegrationMod; +import makeo.gadomancy.common.registration.RegisteredBlocks; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java index f0002c6..48beedd 100644 --- a/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java +++ b/src/main/java/makeo/gadomancy/common/integration/thaumichorizions/RenderAdditionalGolemTH.java @@ -1,22 +1,20 @@ package makeo.gadomancy.common.integration.thaumichorizions; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; -import makeo.gadomancy.client.renderers.entity.RenderGolemHelper; - import net.minecraft.client.model.ModelBase; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; -import thaumcraft.common.entities.golems.EntityGolemBase; - import com.kentington.thaumichorizons.client.renderer.entity.RenderGolemTH; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.api.golems.cores.AdditionalGolemCore; +import makeo.gadomancy.client.renderers.entity.RenderGolemHelper; +import thaumcraft.common.entities.golems.EntityGolemBase; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/AdvancedGolemProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/AdvancedGolemProvider.java index 7ecc664..6f4e3e0 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/AdvancedGolemProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/AdvancedGolemProvider.java @@ -2,21 +2,20 @@ package makeo.gadomancy.common.integration.waila; import java.util.List; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; -import makeo.gadomancy.common.utils.ColorHelper; -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.player.EntityPlayerMP; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import thaumcraft.common.entities.golems.EntityGolemBase; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import makeo.gadomancy.common.utils.ColorHelper; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaEntityAccessor; +import mcp.mobius.waila.api.IWailaEntityProvider; +import thaumcraft.common.entities.golems.EntityGolemBase; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java index 09cee92..c82d154 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/InfusionClawProvider.java @@ -2,11 +2,6 @@ package makeo.gadomancy.common.integration.waila; import java.util.List; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -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; @@ -14,6 +9,11 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java index 8630a0d..588a2c8 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/RemoteJarProvider.java @@ -2,13 +2,6 @@ package makeo.gadomancy.common.integration.waila; import java.util.List; -import makeo.gadomancy.common.blocks.BlockRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.items.ItemBlockRemoteJar; -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; @@ -16,6 +9,13 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.items.ItemBlockRemoteJar; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java index 5762a8b..ff2f3d0 100644 --- a/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java +++ b/src/main/java/makeo/gadomancy/common/integration/waila/StickyJarProvider.java @@ -5,6 +5,12 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +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 makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileStickyJar; import makeo.gadomancy.common.utils.ColorHelper; @@ -13,12 +19,6 @@ import mcp.mobius.waila.api.IWailaDataAccessor; import mcp.mobius.waila.api.IWailaDataProvider; import mcp.mobius.waila.api.impl.ModuleRegistrar; -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; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java b/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java index 4c26e75..a5f9336 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemArcanePackage.java @@ -6,10 +6,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryBasic; @@ -21,6 +17,9 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.NBTHelper; import thaumcraft.common.lib.utils.InventoryUtils; /** diff --git a/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java b/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java index bd487bb..e892003 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemAuraCore.java @@ -2,9 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -17,6 +14,8 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.blocks.BlockCustomOreItem; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java index 5bc07e2..9bd17cf 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockAdditionalEldritchPortal.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -13,6 +11,8 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import makeo.gadomancy.common.Gadomancy; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java index f50d2b4..156c60a 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockAuraPylon.java @@ -1,12 +1,12 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java index f416aec..5784f68 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockEssentiaCompressor.java @@ -1,12 +1,12 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.Block; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * HellFirePvP@Admin Date: 22.04.2016 / 21:58 on Gadomancy ItemBlockEssentiaCompressor */ diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java index bc831e4..f263189 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockKnowledgeBook.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -10,6 +8,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.config.ConfigBlocks; /** diff --git a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java index 1e03651..5d449e1 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemBlockRemoteJar.java @@ -5,13 +5,6 @@ import java.util.List; import java.util.Random; import java.util.UUID; -import makeo.gadomancy.client.events.ResourceReloadListener; -import makeo.gadomancy.common.blocks.BlockRemoteJar; -import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.utils.NBTHelper; -import makeo.gadomancy.common.utils.StringHelper; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -22,11 +15,17 @@ import net.minecraft.util.ChatComponentTranslation; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.client.events.ResourceReloadListener; +import makeo.gadomancy.common.blocks.BlockRemoteJar; +import makeo.gadomancy.common.blocks.tiles.TileRemoteJar; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.NBTHelper; +import makeo.gadomancy.common.utils.StringHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.blocks.ItemJarFilled; import thaumcraft.common.config.ConfigItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java b/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java index 5dd78fc..548c337 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemCreativeNode.java @@ -2,9 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -13,6 +10,8 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.NodeModifier; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemElement.java b/src/main/java/makeo/gadomancy/common/items/ItemElement.java index 58f0d4b..f2138ae 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemElement.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemElement.java @@ -2,10 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.entities.EntityItemElement; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -16,6 +12,10 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.entities.EntityItemElement; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * HellFirePvP@Admin Date: 23.04.2016 / 01:52 on Gadomancy ItemElementVoid */ diff --git a/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java b/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java index 3db4227..2fe456b 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemExtendedNodeJar.java @@ -2,10 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; -import makeo.gadomancy.common.node.ExtendedNodeType; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; @@ -20,6 +16,9 @@ import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.node.ExtendedNodeType; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.aspects.IEssentiaContainerItem; diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java index 027afc7..4a87351 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemPlacer.java @@ -2,19 +2,18 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.api.GadomancyApi; -import makeo.gadomancy.api.golems.AdditionalGolemType; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; -import thaumcraft.common.entities.golems.EnumGolemType; -import thaumcraft.common.entities.golems.ItemGolemPlacer; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.api.GadomancyApi; +import makeo.gadomancy.api.golems.AdditionalGolemType; +import thaumcraft.common.entities.golems.EnumGolemType; +import thaumcraft.common.entities.golems.ItemGolemPlacer; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java index 237dd96..4b690c8 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeGolemShield.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; @@ -12,6 +10,7 @@ import net.minecraft.util.IIcon; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.Gadomancy; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java index 6e2702c..7ff7c2d 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeLootbag.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -11,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.world.World; +import makeo.gadomancy.common.registration.RegisteredItems; import thaumcraft.common.items.ItemLootBag; /** diff --git a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java index 9c27b67..555dd99 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemFakeModIcon.java @@ -1,11 +1,11 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.Item; import net.minecraft.util.IIcon; +import makeo.gadomancy.common.Gadomancy; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java b/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java index ba4611b..234102a 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemGolemCoreBreak.java @@ -2,9 +2,6 @@ package makeo.gadomancy.common.items; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -14,6 +11,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraft.util.StatCollector; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.registration.RegisteredItems; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java b/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java index d2bb7b7..d441254 100644 --- a/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java +++ b/src/main/java/makeo/gadomancy/common/items/ItemTransformationFocus.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.items; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -10,12 +8,13 @@ import net.minecraft.util.IIcon; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.Gadomancy; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.wands.FocusUpgradeType; import thaumcraft.api.wands.ItemFocusBasic; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java index 6943f10..ad60f50 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemEtherealFamiliar.java @@ -4,14 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.data.DataFamiliar; -import makeo.gadomancy.common.data.SyncDataHolder; -import makeo.gadomancy.common.familiar.FamiliarAugment; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.MiscUtils; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -24,10 +16,17 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.common.lib.research.ResearchManager; import baubles.api.BaubleType; import baubles.api.IBauble; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.data.DataFamiliar; +import makeo.gadomancy.common.data.SyncDataHolder; +import makeo.gadomancy.common.familiar.FamiliarAugment; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.MiscUtils; +import makeo.gadomancy.common.utils.NBTHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.lib.research.ResearchManager; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java index dced901..4a43c7d 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar_Old.java @@ -3,11 +3,6 @@ package makeo.gadomancy.common.items.baubles; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.crafting.DeprecationItemPaybacks; -import makeo.gadomancy.common.registration.RegisteredItems; -import makeo.gadomancy.common.utils.NBTHelper; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -19,9 +14,13 @@ import net.minecraft.util.StatCollector; import org.lwjgl.input.Keyboard; -import thaumcraft.api.aspects.Aspect; import baubles.api.BaubleType; import baubles.api.IBauble; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.crafting.DeprecationItemPaybacks; +import makeo.gadomancy.common.registration.RegisteredItems; +import makeo.gadomancy.common.utils.NBTHelper; +import thaumcraft.api.aspects.Aspect; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java index 12f986c..7cedd06 100644 --- a/src/main/java/makeo/gadomancy/common/network/PacketHandler.java +++ b/src/main/java/makeo/gadomancy/common/network/PacketHandler.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.network; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.network.packets.*; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.network.packets.*; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java index fc4b146..f0b82fe 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketAbortTransform.java @@ -1,11 +1,11 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.client.transformation.TransformationHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.client.transformation.TransformationHelper; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java index bf61d50..421deb2 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketAnimationAbsorb.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.client.util.MultiTickEffectDispatcher; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -11,6 +9,7 @@ import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.client.util.MultiTickEffectDispatcher; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliarBolt.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliarBolt.java index f00af7a..c059d02 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliarBolt.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketFamiliarBolt.java @@ -1,11 +1,11 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.client.util.FamiliarHandlerClient; -import makeo.gadomancy.common.utils.StringHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.client.util.FamiliarHandlerClient; +import makeo.gadomancy.common.utils.StringHelper; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java index a0e40d4..9082497 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketStartAnimation.java @@ -1,21 +1,20 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.client.util.MultiTickEffectDispatcher; -import makeo.gadomancy.client.util.UtilsFX; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; -import makeo.gadomancy.common.utils.ExplosionHelper; - import net.minecraft.client.Minecraft; import net.minecraft.tileentity.TileEntity; -import thaumcraft.common.Thaumcraft; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.client.util.MultiTickEffectDispatcher; +import makeo.gadomancy.client.util.UtilsFX; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.blocks.tiles.TileInfusionClaw; +import makeo.gadomancy.common.utils.ExplosionHelper; +import thaumcraft.common.Thaumcraft; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java index 5997cb7..95a4ad1 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncConfigs.java @@ -6,12 +6,12 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.data.config.Sync; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.data.config.Sync; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncData.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncData.java index f197b20..412885a 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncData.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketSyncData.java @@ -4,11 +4,6 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.data.AbstractData; -import makeo.gadomancy.common.data.SyncDataHolder; -import makeo.gadomancy.common.utils.StringHelper; - import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTSizeTracker; import net.minecraft.nbt.NBTTagCompound; @@ -17,6 +12,10 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.data.AbstractData; +import makeo.gadomancy.common.data.SyncDataHolder; +import makeo.gadomancy.common.utils.StringHelper; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java index 55cf9a4..85d0320 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNodeBolt.java @@ -2,13 +2,13 @@ package makeo.gadomancy.common.network.packets; import net.minecraft.client.Minecraft; -import thaumcraft.client.fx.bolt.FXLightningBolt; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import io.netty.buffer.ByteBuf; +import thaumcraft.client.fx.bolt.FXLightningBolt; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java index b3e0cd2..24fe784 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCNotificationText.java @@ -2,18 +2,17 @@ package makeo.gadomancy.common.network.packets; import java.awt.*; -import makeo.gadomancy.common.utils.StringHelper; - import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.client.lib.PlayerNotifications; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.common.utils.StringHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.client.lib.PlayerNotifications; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCWispyLine.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCWispyLine.java index 099aa58..3d251c4 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTCWispyLine.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTCWispyLine.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.client.util.MultiTickEffectDispatcher; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.client.util.MultiTickEffectDispatcher; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java index f388eaf..7e52790 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketTransformationInfo.java @@ -1,19 +1,18 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.common.utils.world.fake.FakeWorld; - import net.minecraft.entity.EntityList; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import thaumcraft.common.entities.golems.EntityGolemBase; -import thaumcraft.common.entities.golems.EnumGolemType; import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.common.utils.world.fake.FakeWorld; +import thaumcraft.common.entities.golems.EntityGolemBase; +import thaumcraft.common.entities.golems.EnumGolemType; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java index e49e6b6..690a797 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateGolemTypeOrder.java @@ -3,11 +3,11 @@ package makeo.gadomancy.common.network.packets; import java.io.*; import java.util.Map; -import makeo.gadomancy.common.utils.GolemEnumHelper; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.common.utils.GolemEnumHelper; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateOnlineState.java b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateOnlineState.java index f059f9d..c4c37ae 100644 --- a/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateOnlineState.java +++ b/src/main/java/makeo/gadomancy/common/network/packets/PacketUpdateOnlineState.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.network.packets; -import makeo.gadomancy.common.CommonProxy; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import io.netty.buffer.ByteBuf; +import makeo.gadomancy.common.CommonProxy; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java b/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java index 778b322..4f74452 100644 --- a/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java +++ b/src/main/java/makeo/gadomancy/common/node/GrowingNodeBehavior.java @@ -3,6 +3,12 @@ package makeo.gadomancy.common.node; import java.util.LinkedHashMap; import java.util.Map; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; + +import cpw.mods.fml.common.network.NetworkRegistry; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.network.PacketHandler; @@ -10,17 +16,10 @@ import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; import makeo.gadomancy.common.registration.RegisteredBlocks; import makeo.gadomancy.common.utils.ResearchHelper; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.Vec3; -import net.minecraft.world.World; - import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.entities.EntityAspectOrb; import thaumcraft.common.tiles.TileNode; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java index a1dc621..57e8b83 100644 --- a/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java +++ b/src/main/java/makeo/gadomancy/common/node/NodeManipulatorResultHandler.java @@ -4,12 +4,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.registration.RegisteredManipulations; - import net.minecraft.util.WeightedRandom; import net.minecraft.world.World; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.registration.RegisteredManipulations; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java b/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java index 7186335..5180652 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionAchromatic.java @@ -2,16 +2,15 @@ package makeo.gadomancy.common.potions; import java.util.List; -import makeo.gadomancy.common.data.DataAchromatic; -import makeo.gadomancy.common.data.SyncDataHolder; -import makeo.gadomancy.common.utils.Vector3; - import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.IProjectile; import net.minecraft.entity.ai.attributes.BaseAttributeMap; import net.minecraft.util.AxisAlignedBB; +import makeo.gadomancy.common.data.DataAchromatic; +import makeo.gadomancy.common.data.SyncDataHolder; +import makeo.gadomancy.common.utils.Vector3; import thaumcraft.api.aspects.Aspect; /** diff --git a/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java b/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java index 86bbf47..ae9e809 100644 --- a/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java +++ b/src/main/java/makeo/gadomancy/common/potions/PotionInactiveGolem.java @@ -2,11 +2,10 @@ package makeo.gadomancy.common.potions; import java.awt.*; -import makeo.gadomancy.common.utils.ColorHelper; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.potion.Potion; +import makeo.gadomancy.common.utils.ColorHelper; import thaumcraft.common.entities.golems.EntityGolemBase; /** diff --git a/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java b/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java index 165faec..f9f6228 100644 --- a/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java +++ b/src/main/java/makeo/gadomancy/common/registration/ModSubstitutions.java @@ -1,19 +1,17 @@ package makeo.gadomancy.common.registration; -import makeo.gadomancy.common.CommonProxy; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; -import thaumcraft.common.config.ConfigBlocks; - import com.google.common.collect.BiMap; import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry; import cpw.mods.fml.common.registry.GameData; +import makeo.gadomancy.common.CommonProxy; +import makeo.gadomancy.common.data.config.ModConfig; +import thaumcraft.common.config.ConfigBlocks; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java index c62b2e7..a2a7b1e 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredBlocks.java @@ -3,22 +3,21 @@ package makeo.gadomancy.common.registration; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.api.ClickBehavior; -import makeo.gadomancy.common.blocks.*; -import makeo.gadomancy.common.blocks.tiles.*; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.items.*; - import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.ItemBlock; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; +import makeo.gadomancy.api.ClickBehavior; +import makeo.gadomancy.common.blocks.*; +import makeo.gadomancy.common.blocks.tiles.*; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.items.*; import thaumcraft.common.blocks.BlockAiry; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.tiles.TileInfusionMatrix; -import cpw.mods.fml.common.registry.GameRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java index 080050e..7f852c5 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredEnchantments.java @@ -2,13 +2,13 @@ package makeo.gadomancy.common.registration; import java.lang.reflect.Field; +import net.minecraft.enchantment.Enchantment; + import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.enchantments.EnchantmentRevealer; import makeo.gadomancy.common.utils.Injector; -import net.minecraft.enchantment.Enchantment; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java index ebb8a83..f36a1c7 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredEntities.java @@ -1,15 +1,14 @@ package makeo.gadomancy.common.registration; +import net.minecraft.entity.Entity; + +import cpw.mods.fml.common.registry.EntityRegistry; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.EntityAuraCore; import makeo.gadomancy.common.entities.EntityItemElement; import makeo.gadomancy.common.entities.EntityPermNoClipItem; import makeo.gadomancy.common.entities.player.FakePlayerEntity; -import net.minecraft.entity.Entity; - -import cpw.mods.fml.common.registry.EntityRegistry; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java index 44022c0..925cf65 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredFamiliarAI_Old.java @@ -5,12 +5,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import makeo.gadomancy.common.familiar.FamiliarAIController_Old; -import makeo.gadomancy.common.familiar.FamiliarAIProcess_Old; -import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; - import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -19,6 +13,11 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.familiar.FamiliarAIController_Old; +import makeo.gadomancy.common.familiar.FamiliarAIProcess_Old; +import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketFamiliarBolt; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java index 5222b8d..3ee66bb 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredIntegrations.java @@ -1,10 +1,10 @@ package makeo.gadomancy.common.registration; +import cpw.mods.fml.common.Loader; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.integration.*; import makeo.gadomancy.common.integration.mystcraft.IntegrationMystcraft; import makeo.gadomancy.common.utils.Injector; -import cpw.mods.fml.common.Loader; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java index 7af4fc3..83ca88f 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredItems.java @@ -3,13 +3,6 @@ package makeo.gadomancy.common.registration; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.items.*; -import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; -import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; -import makeo.gadomancy.common.research.SimpleResearchItem; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; @@ -18,6 +11,15 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.common.util.EnumHelper; +import cpw.mods.fml.common.LoadController; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.items.*; +import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; +import makeo.gadomancy.common.items.baubles.ItemFamiliar_Old; +import makeo.gadomancy.common.research.SimpleResearchItem; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -26,9 +28,6 @@ import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.lib.crafting.ThaumcraftCraftingManager; import thaumcraft.common.lib.research.ResearchManager; -import cpw.mods.fml.common.LoadController; -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.GameRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java index 39e7324..d26e3c5 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredManipulations.java @@ -2,15 +2,14 @@ package makeo.gadomancy.common.registration; import java.util.List; +import net.minecraft.world.World; + import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; import makeo.gadomancy.common.node.ExtendedNodeType; import makeo.gadomancy.common.node.NodeManipulatorResult; import makeo.gadomancy.common.node.NodeManipulatorResultHandler; import makeo.gadomancy.common.utils.ResearchHelper; - -import net.minecraft.world.World; - import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.nodes.INode; diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java index ab80aba..cb72d4a 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredPotions.java @@ -2,15 +2,14 @@ package makeo.gadomancy.common.registration; import java.lang.reflect.Field; +import net.minecraft.potion.Potion; + +import cpw.mods.fml.common.FMLLog; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.data.config.ModConfig; import makeo.gadomancy.common.potions.*; import makeo.gadomancy.common.utils.Injector; -import net.minecraft.potion.Potion; - -import cpw.mods.fml.common.FMLLog; - /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java index 7091f4b..8c898aa 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredRecipes.java @@ -4,6 +4,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; + +import cpw.mods.fml.common.registry.GameRegistry; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.crafting.*; @@ -14,13 +21,6 @@ import makeo.gadomancy.common.items.ItemElement; import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; import makeo.gadomancy.common.research.SimpleResearchItem; import makeo.gadomancy.common.utils.RandomizedAspectList; - -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; - import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -33,7 +33,6 @@ import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.config.ConfigItems; import thaumcraft.common.items.ItemWispEssence; import thaumcraft.common.items.wands.ItemWandCasting; -import cpw.mods.fml.common.registry.GameRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 82959af..0e59a3d 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -1,5 +1,9 @@ package makeo.gadomancy.common.registration; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.aura.AuraResearchManager; import makeo.gadomancy.common.crafting.InfusionVisualDisguiseArmor; @@ -9,11 +13,6 @@ import makeo.gadomancy.common.items.ItemAuraCore; import makeo.gadomancy.common.items.baubles.ItemEtherealFamiliar; import makeo.gadomancy.common.research.*; import makeo.gadomancy.common.utils.SimpleResourceLocation; - -import net.minecraft.enchantment.Enchantment; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; - import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java b/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java index a0c5a1f..bbcbbf0 100644 --- a/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/AlternatingResearchItem.java @@ -4,10 +4,9 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.List; -import makeo.gadomancy.common.utils.Injector; - import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.utils.Injector; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java b/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java index ea79f26..92414ad 100644 --- a/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/DisguiseResearchItem.java @@ -1,10 +1,9 @@ package makeo.gadomancy.common.research; -import makeo.gadomancy.common.crafting.InfusionVisualDisguiseArmor; - import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import makeo.gadomancy.common.crafting.InfusionVisualDisguiseArmor; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; diff --git a/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java b/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java index f16d028..e1591a6 100644 --- a/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/IfAnyParentResearchItem.java @@ -4,12 +4,12 @@ import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.client.gui.GuiResearchBrowser; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java b/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java index b478e77..01609b2 100644 --- a/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/PseudoResearchItem.java @@ -7,13 +7,13 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchCategories; import thaumcraft.api.research.ResearchItem; import thaumcraft.api.research.ResearchPage; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java b/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java index e25ef90..79f3f2b 100644 --- a/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/SimpleResearchItem.java @@ -1,10 +1,9 @@ package makeo.gadomancy.common.research; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.common.Gadomancy; import thaumcraft.api.aspects.AspectList; import thaumcraft.api.research.ResearchItem; diff --git a/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java b/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java index 72614e1..7e28a38 100644 --- a/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java +++ b/src/main/java/makeo/gadomancy/common/research/StickyJarResearchItem.java @@ -2,16 +2,15 @@ package makeo.gadomancy.common.research; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.registration.RegisteredItems; - import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; -import thaumcraft.api.aspects.AspectList; -import thaumcraft.common.config.ConfigBlocks; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.registration.RegisteredItems; +import thaumcraft.api.aspects.AspectList; +import thaumcraft.common.config.ConfigBlocks; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java index b3486cd..50726a9 100644 --- a/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/ExplosionHelper.java @@ -3,13 +3,6 @@ package makeo.gadomancy.common.utils; import java.util.ArrayList; import java.util.List; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; -import makeo.gadomancy.common.registration.RegisteredBlocks; - import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +12,13 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.Vec3; import net.minecraft.world.World; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketAnimationAbsorb; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.network.packets.PacketTCNodeBolt; +import makeo.gadomancy.common.registration.RegisteredBlocks; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.Thaumcraft; @@ -26,7 +26,6 @@ import thaumcraft.common.config.Config; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.utils.Utils; import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java index 153ccc2..cc495aa 100644 --- a/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/GolemEnumHelper.java @@ -5,16 +5,15 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; +import net.minecraftforge.common.util.EnumHelper; + +import cpw.mods.fml.relauncher.Side; import makeo.gadomancy.api.GadomancyApi; import makeo.gadomancy.api.golems.AdditionalGolemType; import makeo.gadomancy.client.events.ResourceReloadListener; import makeo.gadomancy.common.Gadomancy; import makeo.gadomancy.common.entities.golems.types.RemovedGolemType; - -import net.minecraftforge.common.util.EnumHelper; - import thaumcraft.common.entities.golems.EnumGolemType; -import cpw.mods.fml.relauncher.Side; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/Injector.java b/src/main/java/makeo/gadomancy/common/utils/Injector.java index f8d57fa..00f8ba0 100644 --- a/src/main/java/makeo/gadomancy/common/utils/Injector.java +++ b/src/main/java/makeo/gadomancy/common/utils/Injector.java @@ -6,10 +6,10 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; -import sun.misc.Unsafe; - import com.google.common.base.Throwables; + import cpw.mods.fml.relauncher.ReflectionHelper; +import sun.misc.Unsafe; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java b/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java index e1dd7eb..0345ce6 100644 --- a/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java +++ b/src/main/java/makeo/gadomancy/common/utils/NBTHelper.java @@ -2,13 +2,12 @@ package makeo.gadomancy.common.utils; import java.util.UUID; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; +import makeo.gadomancy.common.Gadomancy; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; diff --git a/src/main/java/makeo/gadomancy/common/utils/SimpleResourceLocation.java b/src/main/java/makeo/gadomancy/common/utils/SimpleResourceLocation.java index 6a63a51..d79db46 100644 --- a/src/main/java/makeo/gadomancy/common/utils/SimpleResourceLocation.java +++ b/src/main/java/makeo/gadomancy/common/utils/SimpleResourceLocation.java @@ -1,9 +1,9 @@ package makeo.gadomancy.common.utils; -import makeo.gadomancy.common.Gadomancy; - import net.minecraft.util.ResourceLocation; +import makeo.gadomancy.common.Gadomancy; + /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC * LICENSE for more read the LICENSE file diff --git a/src/main/java/makeo/gadomancy/common/utils/WandHandler.java b/src/main/java/makeo/gadomancy/common/utils/WandHandler.java index e918d2c..071ae96 100644 --- a/src/main/java/makeo/gadomancy/common/utils/WandHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/WandHandler.java @@ -3,19 +3,6 @@ package makeo.gadomancy.common.utils; import java.util.Iterator; import java.util.List; -import makeo.gadomancy.common.Gadomancy; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; -import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.entities.EntityAuraCore; -import makeo.gadomancy.common.items.ItemAuraCore; -import makeo.gadomancy.common.network.PacketHandler; -import makeo.gadomancy.common.network.packets.PacketStartAnimation; -import makeo.gadomancy.common.node.ExtendedNodeType; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.registration.RegisteredIntegrations; -import makeo.gadomancy.common.registration.RegisteredRecipes; - import net.minecraft.block.Block; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; @@ -28,6 +15,19 @@ import net.minecraft.util.ChunkCoordinates; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.network.NetworkRegistry; +import makeo.gadomancy.common.Gadomancy; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNode; +import makeo.gadomancy.common.blocks.tiles.TileExtendedNodeJar; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.entities.EntityAuraCore; +import makeo.gadomancy.common.items.ItemAuraCore; +import makeo.gadomancy.common.network.PacketHandler; +import makeo.gadomancy.common.network.packets.PacketStartAnimation; +import makeo.gadomancy.common.node.ExtendedNodeType; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.registration.RegisteredIntegrations; +import makeo.gadomancy.common.registration.RegisteredRecipes; import thaumcraft.api.ThaumcraftApiHelper; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -40,7 +40,6 @@ import thaumcraft.common.lib.research.ResearchManager; import thaumcraft.common.tiles.TileJarNode; import thaumcraft.common.tiles.TileOwned; import thaumcraft.common.tiles.TileWarded; -import cpw.mods.fml.common.network.NetworkRegistry; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java b/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java index a45138b..db8e63c 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/ChunkProviderTCOuter.java @@ -3,9 +3,6 @@ package makeo.gadomancy.common.utils.world; import java.util.Iterator; import java.util.List; -import makeo.gadomancy.common.blocks.tiles.TileOverrideEldritchLock; -import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration; - import net.minecraft.block.Block; import net.minecraft.entity.EnumCreatureType; import net.minecraft.nbt.NBTTagCompound; @@ -22,6 +19,8 @@ import net.minecraft.world.chunk.IChunkProvider; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.PopulateChunkEvent; +import makeo.gadomancy.common.blocks.tiles.TileOverrideEldritchLock; +import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.entities.EntityPermanentItem; import thaumcraft.common.entities.monster.EntityEldritchGuardian; diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java index 4a86cb2..55a7ea3 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeHandler.java @@ -3,11 +3,6 @@ package makeo.gadomancy.common.utils.world; import java.util.*; import java.util.concurrent.ConcurrentHashMap; -import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; -import makeo.gadomancy.common.data.config.ModConfig; -import makeo.gadomancy.common.registration.RegisteredBlocks; -import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration; - import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; @@ -17,6 +12,10 @@ import net.minecraft.world.EnumSkyBlock; import net.minecraft.world.WorldServer; import net.minecraftforge.common.DimensionManager; +import makeo.gadomancy.common.blocks.tiles.TileAdditionalEldritchPortal; +import makeo.gadomancy.common.data.config.ModConfig; +import makeo.gadomancy.common.registration.RegisteredBlocks; +import makeo.gadomancy.common.utils.world.fake.FakeWorldTCGeneration; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.lib.world.dim.CellLoc; import thaumcraft.common.lib.world.dim.GenCommon; diff --git a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java index aa2a904..1dfe13c 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/TCMazeSession.java @@ -2,8 +2,6 @@ package makeo.gadomancy.common.utils.world; import java.util.Map; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; @@ -16,6 +14,7 @@ import net.minecraft.world.chunk.Chunk; import org.apache.logging.log4j.LogManager; +import makeo.gadomancy.common.data.config.ModConfig; import thaumcraft.common.Thaumcraft; import thaumcraft.common.lib.world.dim.Cell; import thaumcraft.common.lib.world.dim.CellLoc; diff --git a/src/main/java/makeo/gadomancy/common/utils/world/WorldProviderTCEldrich.java b/src/main/java/makeo/gadomancy/common/utils/world/WorldProviderTCEldrich.java index 2366c09..0cf8828 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/WorldProviderTCEldrich.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/WorldProviderTCEldrich.java @@ -1,7 +1,5 @@ package makeo.gadomancy.common.utils.world; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.util.ChunkCoordinates; import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; @@ -10,9 +8,10 @@ import net.minecraft.world.biome.WorldChunkManagerHell; import net.minecraft.world.chunk.Chunk; import net.minecraft.world.chunk.IChunkProvider; -import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import makeo.gadomancy.common.data.config.ModConfig; +import thaumcraft.common.lib.world.ThaumcraftWorldGenerator; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java b/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java index 67589ba..ea58d9f 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/WorldUtil.java @@ -1,11 +1,10 @@ package makeo.gadomancy.common.utils.world; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.server.MinecraftServer; import cpw.mods.fml.common.FMLCommonHandler; +import makeo.gadomancy.common.data.config.ModConfig; /** * This class is part of the Gadomancy Mod Gadomancy is Open Source and distributed under the GNU LESSER GENERAL PUBLIC diff --git a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java index ba4d360..2d7b391 100644 --- a/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java +++ b/src/main/java/makeo/gadomancy/common/utils/world/fake/FakeWorldTCGeneration.java @@ -5,8 +5,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import makeo.gadomancy.common.data.config.ModConfig; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; @@ -19,6 +17,7 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.common.util.ForgeDirection; +import makeo.gadomancy.common.data.config.ModConfig; import thaumcraft.common.config.ConfigBlocks; import thaumcraft.common.entities.EntityPermanentItem; import thaumcraft.common.entities.monster.EntityEldritchGuardian; diff --git a/src/main/resources/assets/gadomancy/lang/en_US.lang b/src/main/resources/assets/gadomancy/lang/en_US.lang index e64ca43..2135037 100644 --- a/src/main/resources/assets/gadomancy/lang/en_US.lang +++ b/src/main/resources/assets/gadomancy/lang/en_US.lang @@ -40,7 +40,7 @@ gadomancy.research_page.GOLEMCOREBODYGUARD.1=Guard Golems are all good and fine, tc.research_name.GADOMANCY.INFUSIONCLAW=Automated Infusion tc.research_text.GADOMANCY.INFUSIONCLAW=Floating stuff! -gadomancy.research_page.INFUSIONCLAW.1=Considering there are many situations in which you would like to be able to automate an Infusion Altar without being so close, you've been fooling with the Wand Recharge Pedestal. Trying to get it to move a wand rather than just hold it has proven difficult, but not impossible. The resulting device is slightly sentient and somehow bound to your soul, but it seems to work well! Your eye has been twitching a bit recently though... you're sure everything is fine... maybe... +gadomancy.research_page.INFUSIONCLAW.1=Considering there are many situations in which you would like to be able to automate an Infusion Altar without being so close, you've been fooling with the Wand Recharge Pedestal. Trying to get it to move a wand rather than just hold it has proven difficult, but not impossible. The resulting device is slightly sentient and somehow bound to your soul, but it seems to work well! Your eye has been twitching a bit recently though... you're sure everything is fine... maybe...\nIf you give vis, the wand will charge gadomancy.research_page.INFUSIONCLAW.2=Place this device atop your Infusion Matrix and insert a wand or staff. They can be inserted and extracted from the top side. With the checkbox marked, only empty wands can be extracted. This process adds instability to any infusions triggered with the Infusion Claw. The amount of instability depends on how good the wand you use is. Staffs are a bit more stable, but the main factor is the amount of storage a wand has.
You can trigger infusions by running a redstone signal into one of the four sides.
This device can also be used to automate production of Thaumonomicons and Crucibles, making your dream of a Thaumonomicon and Crucible factory possible! tc.research_name.GADOMANCY.REMOTEJAR=Mirrored Jars