diff --git a/README.md b/README.md index a7e778b..febe9cc 100644 Binary files a/README.md and b/README.md differ diff --git a/build.gradle b/build.gradle index 846a351..bd6289c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1677938302 +//version: 1689409577 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -6,29 +6,25 @@ */ -import com.diffplug.blowdryer.Blowdryer -import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar import com.gtnewhorizons.retrofuturagradle.ObfuscationAttribute import com.gtnewhorizons.retrofuturagradle.mcp.ReobfuscatedJar import com.gtnewhorizons.retrofuturagradle.minecraft.RunMinecraftTask +import com.gtnewhorizons.retrofuturagradle.util.Distribution import com.matthewprenger.cursegradle.CurseArtifact import com.matthewprenger.cursegradle.CurseRelation import com.modrinth.minotaur.dependencies.ModDependency import com.modrinth.minotaur.dependencies.VersionDependency -import cpw.mods.fml.relauncher.Side -import org.gradle.api.tasks.options.Option; import org.gradle.internal.logging.text.StyledTextOutput.Style import org.gradle.internal.logging.text.StyledTextOutputFactory import org.gradle.internal.xml.XmlTransformer -import org.jetbrains.gradle.ext.* +import org.jetbrains.gradle.ext.Application +import org.jetbrains.gradle.ext.Gradle +import javax.inject.Inject import java.nio.file.Files import java.nio.file.Paths import java.util.concurrent.TimeUnit -import java.util.zip.ZipEntry -import java.util.zip.ZipOutputStream -import javax.inject.Inject buildscript { repositories { @@ -65,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.2.3' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.19' } + +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' } @@ -115,6 +115,8 @@ propertyDefaultIfUnset("usesMixinDebug", project.usesMixins) propertyDefaultIfUnset("forceEnableMixins", false) propertyDefaultIfUnset("channel", "stable") propertyDefaultIfUnset("mappingsVersion", "12") +propertyDefaultIfUnset("usesMavenPublishing", true) +propertyDefaultIfUnset("mavenPublishUrl", "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases") propertyDefaultIfUnset("modrinthProjectId", "") propertyDefaultIfUnset("modrinthRelations", "") propertyDefaultIfUnset("curseForgeProjectId", "") @@ -132,7 +134,7 @@ propertyDefaultIfUnset("enableGenericInjection", false) // On by default for new // this is meant to be set using the user wide property file. by default we do nothing. propertyDefaultIfUnset("ideaOverrideBuildType", "") // Can be nothing, "gradle" or "idea" -project.extensions.add(Blowdryer, "Blowdryer", Blowdryer) // Make blowdryer available in "apply from:" scripts +project.extensions.add(com.diffplug.blowdryer.Blowdryer, "Blowdryer", com.diffplug.blowdryer.Blowdryer) // Make blowdryer available in "apply from:" scripts if (!disableSpotless) { apply plugin: 'com.diffplug.spotless' apply from: Blowdryer.file('spotless.gradle') @@ -160,6 +162,14 @@ java { } } +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 { @@ -193,6 +203,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -206,6 +224,8 @@ if (enableModernJavaSyntax.toBoolean()) { dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } @@ -339,7 +359,27 @@ catch (Exception ignored) { String identifiedVersion String versionOverride = System.getenv("VERSION") ?: null try { - identifiedVersion = versionOverride == null ? gitVersion() : versionOverride + // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty + if (versionOverride == null) { + def gitDetails = versionDetails() + def isDirty = gitVersion().endsWith(".dirty") // No public API for this, isCleanTag has a different meaning + String branchName = gitDetails.branchName ?: (System.getenv('GIT_BRANCH') ?: 'git') + if (branchName.startsWith('origin/')) { + branchName = branchName.minus('origin/') + } + branchName = branchName.replaceAll("[^a-zA-Z0-9-]+", "-") // sanitize branch names for semver + identifiedVersion = gitDetails.lastTag ?: '${gitDetails.gitHash}' + if (gitDetails.commitDistance > 0) { + identifiedVersion += "-${branchName}.${gitDetails.commitDistance}+${gitDetails.gitHash}" + if (isDirty) { + identifiedVersion += "-dirty" + } + } else if (isDirty) { + identifiedVersion += "-${branchName}+${gitDetails.gitHash}-dirty" + } + } else { + identifiedVersion = versionOverride + } } catch (Exception ignored) { out.style(Style.Failure).text( @@ -391,14 +431,12 @@ minecraft { username = developmentEnvironmentUserName.toString() - lwjgl3Version = "3.3.2-SNAPSHOT" + 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", @@ -449,10 +487,19 @@ sourceSets { } } -if (file('addon.gradle').exists()) { +if (file('addon.gradle.kts').exists()) { + apply from: 'addon.gradle.kts' +} else if (file('addon.gradle').exists()) { apply from: 'addon.gradle' } +// File for local tweaks not commited to Git +if (file('addon.local.gradle.kts').exists()) { + apply from: 'addon.local.gradle.kts' +} else if (file('addon.local.gradle').exists()) { + apply from: 'addon.local.gradle' +} + // Allow unsafe repos but warn repositories.configureEach { repo -> if (repo instanceof org.gradle.api.artifacts.repositories.UrlArtifactRepository) { @@ -463,7 +510,14 @@ repositories.configureEach { repo -> } } -apply from: 'repositories.gradle' +if (file('repositories.gradle.kts').exists()) { + apply from: 'repositories.gradle.kts' +} else if (file('repositories.gradle').exists()) { + apply from: 'repositories.gradle' +} else { + logger.error("Neither repositories.gradle.kts nor repositories.gradle was found, make sure you extracted the full ExampleMod template.") + throw new RuntimeException("Missing repositories.gradle[.kts]") +} configurations { runtimeClasspath.extendsFrom(runtimeOnlyNonPublishable) @@ -513,14 +567,6 @@ 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/' @@ -559,30 +605,76 @@ 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.13: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.13') + 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.13:processor') + kapt(mixinProviderSpec) } } } -apply from: 'dependencies.gradle' +// 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") + } +} + +dependencies { + constraints { + def minGtnhLibVersion = "0.0.13" + implementation("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + runtimeOnly("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + devOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + runtimeOnlyNonPublishable("com.github.GTNewHorizons:GTNHLib:${minGtnhLibVersion}") { + because("fixes duplicate mod errors in java 17 configurations using old gtnhlib") + } + } +} + +if (file('dependencies.gradle.kts').exists()) { + apply from: 'dependencies.gradle.kts' +} else if (file('dependencies.gradle').exists()) { + apply from: 'dependencies.gradle' +} else { + logger.error("Neither dependencies.gradle.kts nor dependencies.gradle was found, make sure you extracted the full ExampleMod template.") + throw new RuntimeException("Missing dependencies.gradle[.kts]") +} def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' def mixinTmpDir = buildDir.path + File.separator + 'tmp' + File.separator + 'mixins' @@ -695,13 +787,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.1.35' + def lwjgl3ifyVersion = '1.4.0' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.0.40') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -775,7 +867,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { public boolean setEnableHotswap(boolean enable) { enableHotswap = enable } @Inject - public RunHotswappableMinecraftTask(Side side, String superTask, org.gradle.api.invocation.Gradle gradle) { + public RunHotswappableMinecraftTask(Distribution side, String superTask, org.gradle.api.invocation.Gradle gradle) { super(side, gradle) this.lwjglVersion = 3 @@ -784,7 +876,7 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { this.extraJvmArgs.addAll(project.provider(() -> enableHotswap ? project.hotswapJvmArgs : [])) this.classpath(project.java17PatchDependenciesCfg) - if (side == Side.CLIENT) { + if (side == Distribution.CLIENT) { this.classpath(project.minecraftTasks.lwjgl3Configuration) } // Use a raw provider instead of map to not create a dependency on the task @@ -793,14 +885,22 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { !file.path.contains("2.9.4-nightly-20150209") // Remove lwjgl2 } this.classpath(project.java17DependenciesCfg) + } - if (!(project.usesMixins.toBoolean() || project.forceEnableMixins.toBoolean())) { - this.extraArgs.addAll("--tweakClass", "org.spongepowered.asm.launch.MixinTweaker") + 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, Side.CLIENT, "runClient") +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") runClient17Task.configure { setup(project) group = "Modded Minecraft" @@ -811,7 +911,7 @@ runClient17Task.configure { userUUID = minecraft.userUUID } -def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Side.SERVER, "runServer") +def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer") runServer17Task.configure { setup(project) group = "Modded Minecraft" @@ -852,11 +952,6 @@ tasks.named("jar", Jar).configure { } if (usesShadowedDependencies.toBoolean()) { - tasks.register('relocateShadowJar', ConfigureShadowRelocation) { - target = tasks.shadowJar - prefix = modGroup + ".shadow" - enabled = relocateShadowedDependencies.toBoolean() - } tasks.named("shadowJar", ShadowJar).configure { manifest { attributes(getManifestAttributes()) @@ -872,7 +967,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -946,6 +1042,9 @@ idea { } } runConfigurations { + "0. Build and Test"(Gradle) { + taskNames = ["build"] + } "1. Run Client"(Gradle) { taskNames = ["runClient"] } @@ -1006,6 +1105,7 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] @@ -1064,6 +1164,11 @@ tasks.named("processIdeaSettings").configure { dependsOn("injectTags") } +tasks.named("ideVirtualMainClasses").configure { + // Make IntelliJ "Build project" build the mod jars + dependsOn("jar", "reobfJar", "spotlessCheck") +} + // workaround variable hiding in pom processing def projectConfigs = project.configurations @@ -1084,12 +1189,14 @@ publishing { } repositories { - maven { - url = "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases" - allowInsecureProtocol = true - credentials { - username = System.getenv("MAVEN_USER") ?: "NONE" - password = System.getenv("MAVEN_PASSWORD") ?: "NONE" + if (usesMavenPublishing.toBoolean()) { + maven { + url = mavenPublishUrl + allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven + credentials { + username = System.getenv("MAVEN_USER") ?: "NONE" + password = System.getenv("MAVEN_PASSWORD") ?: "NONE" + } } } } @@ -1125,7 +1232,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) @@ -1169,7 +1276,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) @@ -1204,7 +1311,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.1" +def buildscriptGradleVersion = "8.1.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1236,6 +1343,23 @@ if (!project.getGradle().startParameter.isOffline() && !Boolean.getBoolean('DISA } } +// 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, run './gradlew updateDependencies'. " + + "Or you can manually check if the versions are still on the distributing sites - " + + "the links can be found in repositories.gradle and build.gradle:repositories, " + + "but not build.gradle:buildscript.repositories - those ones are 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. " + + "However, keep in mind that Jabel enables only syntax features, but not APIs that were introduced in " + + "Java 9 or later.") + } +} + static URL availableBuildScriptUrl() { new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle") } @@ -1293,8 +1417,14 @@ boolean isNewBuildScriptVersionAvailable() { String currentBuildScript = getFile("build.gradle").getText() String currentBuildScriptHash = getVersionHash(currentBuildScript) - String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText() - String availableBuildScriptHash = getVersionHash(availableBuildScript) + String availableBuildScriptHash + try { + String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText() + availableBuildScriptHash = getVersionHash(availableBuildScript) + } catch (IOException e) { + logger.warn("Could not check for buildscript update availability: {}", e.message) + return false + } boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash return !isUpToDate @@ -1373,7 +1503,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 { @@ -1415,11 +1545,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. @@ -1427,34 +1553,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 @@ -1462,50 +1561,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) -} - -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() + return dependencies.rfg.deobf(files(obfFile)) } - // Helper methods def checkPropertyExists(String propertyName) { @@ -1532,3 +1589,17 @@ def getSecondaryArtifacts() { if (apiPackage) secondaryArtifacts += [apiJar] return secondaryArtifacts } + +// For easier scripting of things that require variables defined earlier in the buildscript +if (file('addon.late.gradle.kts').exists()) { + apply from: 'addon.late.gradle.kts' +} else if (file('addon.late.gradle').exists()) { + apply from: 'addon.late.gradle' +} + +// File for local tweaks not commited to Git +if (file('addon.late.local.gradle.kts').exists()) { + apply from: 'addon.late.local.gradle.kts' +} else if (file('addon.late.local.gradle').exists()) { + apply from: 'addon.late.local.gradle' +} diff --git a/dependencies.gradle b/dependencies.gradle index 9cc700b..78e3af0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -6,5 +6,4 @@ dependencies { compileOnly("com.github.GTNewHorizons:CodeChickenCore:1.1.11:dev") compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.3.46-GTNH:dev") compileOnly("com.github.GTNewHorizons:CraftTweaker:3.2.11:dev") - } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc10b60..37aef8d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java b/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java index 3fc7db7..2d19d7c 100644 --- a/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java +++ b/src/main/java/ab/api/recipe/lexicon/AdvancedPlateCraftPage.java @@ -13,18 +13,18 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lexicon.page.PageRecipe; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAdvancedPlate; import ab.client.core.ClientHelper; import ab.common.lib.register.BlockListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lexicon.page.PageRecipe; public class AdvancedPlateCraftPage extends PageRecipe { diff --git a/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java b/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java index dffa016..4507b45 100644 --- a/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java +++ b/src/main/java/ab/api/recipe/lexicon/AlphirineCraftPage.java @@ -14,16 +14,16 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.api.internal.IGuiLexiconEntry; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.lexicon.LexiconRecipeMappings; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import vazkii.botania.common.lexicon.page.PageRecipe; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAncientAlphirine; import ab.client.core.ClientHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.IGuiLexiconEntry; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.lexicon.LexiconRecipeMappings; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; +import vazkii.botania.common.lexicon.page.PageRecipe; public class AlphirineCraftPage extends PageRecipe { diff --git a/src/main/java/ab/client/core/handler/BoundRenderHandler.java b/src/main/java/ab/client/core/handler/BoundRenderHandler.java index 5ec87a9..3a642a7 100644 --- a/src/main/java/ab/client/core/handler/BoundRenderHandler.java +++ b/src/main/java/ab/client/core/handler/BoundRenderHandler.java @@ -18,11 +18,11 @@ import org.lwjgl.opengl.GL11; +import ab.api.IBoundRender; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; import vazkii.botania.api.wand.ICoordBoundItem; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.client.core.handler.ClientTickHandler; -import ab.api.IBoundRender; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class BoundRenderHandler { diff --git a/src/main/java/ab/client/core/handler/ClientHandler.java b/src/main/java/ab/client/core/handler/ClientHandler.java index 8eb306a..93495f9 100644 --- a/src/main/java/ab/client/core/handler/ClientHandler.java +++ b/src/main/java/ab/client/core/handler/ClientHandler.java @@ -18,13 +18,13 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.lib.LibObfuscation; import ab.api.IRankItem; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.relauncher.ReflectionHelper; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.lib.LibObfuscation; public class ClientHandler { diff --git a/src/main/java/ab/client/core/handler/HudRenderHandler.java b/src/main/java/ab/client/core/handler/HudRenderHandler.java index e0d76a7..59ae268 100644 --- a/src/main/java/ab/client/core/handler/HudRenderHandler.java +++ b/src/main/java/ab/client/core/handler/HudRenderHandler.java @@ -8,11 +8,11 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraftforge.client.event.RenderGameOverlayEvent; -import vazkii.botania.common.item.ItemLexicon; -import vazkii.botania.common.item.ItemTwigWand; import ab.api.IRenderHud; import ab.common.item.equipment.ItemBlackHalo; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.item.ItemLexicon; +import vazkii.botania.common.item.ItemTwigWand; public class HudRenderHandler { diff --git a/src/main/java/ab/client/core/handler/PlayerRendererHandler.java b/src/main/java/ab/client/core/handler/PlayerRendererHandler.java index 832d679..5626636 100644 --- a/src/main/java/ab/client/core/handler/PlayerRendererHandler.java +++ b/src/main/java/ab/client/core/handler/PlayerRendererHandler.java @@ -14,12 +14,12 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.api.item.IPhantomInkable; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.core.ClientHelper; import ab.common.item.equipment.armor.ItemNebulaArmor; import ab.common.item.equipment.armor.ItemNebulaHelm; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.client.core.handler.ClientTickHandler; public class PlayerRendererHandler { diff --git a/src/main/java/ab/client/core/proxy/ClientProxy.java b/src/main/java/ab/client/core/proxy/ClientProxy.java index 143433e..c761801 100644 --- a/src/main/java/ab/client/core/proxy/ClientProxy.java +++ b/src/main/java/ab/client/core/proxy/ClientProxy.java @@ -3,7 +3,6 @@ import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.MinecraftForge; -import vazkii.botania.common.Botania; import ab.client.core.handler.BoundRenderHandler; import ab.client.core.handler.ClientHandler; import ab.client.core.handler.HudRenderHandler; @@ -25,6 +24,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import vazkii.botania.common.Botania; public class ClientProxy extends CommonProxy { diff --git a/src/main/java/ab/client/gui/ContainerItemChest.java b/src/main/java/ab/client/gui/ContainerItemChest.java index 1dd827b..72e8bd7 100644 --- a/src/main/java/ab/client/gui/ContainerItemChest.java +++ b/src/main/java/ab/client/gui/ContainerItemChest.java @@ -6,8 +6,8 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; -import vazkii.botania.client.gui.SlotLocked; import ab.common.item.relic.ItemTalismanHiddenRiches; +import vazkii.botania.client.gui.SlotLocked; public class ContainerItemChest extends Container { diff --git a/src/main/java/ab/client/model/ModelFountainMana.java b/src/main/java/ab/client/model/ModelFountainMana.java index 3a2c3a5..069e601 100644 --- a/src/main/java/ab/client/model/ModelFountainMana.java +++ b/src/main/java/ab/client/model/ModelFountainMana.java @@ -4,55 +4,39 @@ import net.minecraft.client.model.ModelBox; import net.minecraft.client.model.ModelRenderer; -public class ModelFountainMana extends ModelBase { +public class ModelFountainMana extends ModelBase { - private final ModelRenderer bone; - private final ModelRenderer bb_main; + private final ModelRenderer bottomAnvil; + private final ModelRenderer topAnvil; public ModelFountainMana() { - textureWidth = 16; - textureHeight = 16; - - bone = new ModelRenderer(this); - bone.setRotationPoint(0.0F, 24.0F, 0.0F); - bone.cubeList.add(new ModelBox(bone, 0, 0, -1.0F, -11.0F, 2.0F, 2, 1, 1, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, -1.0F, -11.0F, -3.0F, 2, 1, 1, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -11.0F, -1.0F, 1, 1, 2, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, -3.0F, -11.0F, -1.0F, 1, 1, 2, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, 1.0F, -12.0F, 1.0F, 1, 2, 2, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -12.0F, 1.0F, 1, 2, 1, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, -2.0F, -12.0F, 1.0F, 1, 2, 2, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, -2.0F, -12.0F, -3.0F, 1, 2, 2, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, 1.0F, -12.0F, -3.0F, 1, 2, 2, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -12.0F, -2.0F, 1, 2, 1, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, -3.0F, -12.0F, 1.0F, 1, 2, 1, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, -3.0F, -12.0F, -2.0F, 1, 2, 1, 0.0F)); - bone.cubeList.add(new ModelBox(bone, 0, 0, 2.0F, -11.0F, -2.0F, 4, 3, 4, 0.0F)); - // PartPose.offset(0.0F, 24.0F, 0.0F); - - bb_main = new ModelRenderer(this); - bb_main.setRotationPoint(0.0F, 24.0F, 0.0F); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 3, -7.0F, -1.0F, -6.0F, 14, 1, 12, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, -10, -11, -8.0F, -5.0F, -6.0F, 1, 5, 12, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, -11, -11, 7.0F, -5.0F, -6.0F, 1, 5, 12, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -5.0F, -8.0F, 12, 5, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -5.0F, 7.0F, 12, 5, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, 6.0F, -5.0F, -7.0F, 1, 5, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, 6.0F, -5.0F, 6.0F, 1, 5, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -7.0F, -5.0F, 6.0F, 1, 5, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -7.0F, -5.0F, -7.0F, 1, 5, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -1.0F, 6.0F, 12, 1, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -6.0F, -1.0F, -7.0F, 12, 1, 1, 0.0F)); - bb_main.cubeList.add(new ModelBox(bb_main, 0, 0, -2.0F, -8.0F, -2.0F, 4, 7, 4, 0.0F)); - + textureWidth = 48; + textureHeight = 48; + + bottomAnvil = new ModelRenderer(this); + bottomAnvil.setRotationPoint(0.0F, 24.0F, 0.0F); + bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 32, 26, -3.0F, -1.0F, -4.0F, 6, 1, 1, 0.0F)); + bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 0, 31, -5.0F, -1.0F, -3.0F, 12, 1, 6, 0.0F)); + bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 32, 17, -2.0F, -3.0F, -2.0F, 4, 1, 4, 0.0F)); + bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 0, 8, -4.0F, -2.0F, -3.0F, 8, 1, 6, 0.0F)); + bottomAnvil.cubeList.add(new ModelBox(bottomAnvil, 32, 23, -3.0F, -1.0F, 3.0F, 6, 1, 1, 0.0F)); + + topAnvil = new ModelRenderer(this); + topAnvil.setRotationPoint(0.0F, 26.0F, 0.0F); + topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 23, -6.5F, -11.0F, -3.0F, 12, 2, 6, 0.0F)); + topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 38, -5.5F, -12.0F, -4.0F, 13, 2, 8, 0.0F)); + topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 15, -5.5F, -9.0F, -3.0F, 9, 2, 6, 0.0F)); + topAnvil.cubeList.add(new ModelBox(topAnvil, 17, 0, -4.5F, -11.0F, 2.5F, 7, 3, 1, 0.0F)); + topAnvil.cubeList.add(new ModelBox(topAnvil, 0, 0, -4.5F, -11.0F, -3.5F, 7, 3, 1, 0.0F)); + topAnvil.cubeList.add(new ModelBox(topAnvil, 30, 12, -2.5F, -7.0F, -2.0F, 5, 1, 4, 0.0F)); } - public void renderTop() { - bone.render(0.0625f); + public void renderBottom() { + bottomAnvil.render(0.0625f); } - public void renderBottom() { - bb_main.render(0.0625f); + public void renderTop() { + topAnvil.render(0.0625f); } public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, float z) { @@ -60,10 +44,4 @@ public void setRotationAngle(ModelRenderer modelRenderer, float x, float y, floa modelRenderer.rotateAngleY = y; modelRenderer.rotateAngleZ = z; } - - public void renderToBuffer(PoseStack poseStack, VertexConsumer vertexConsumer, int packedLight, int packedOverlay, - float red, float green, float blue, float alpha) { - bone.render(packedLight); - bb_main.render(packedLight); - } } diff --git a/src/main/java/ab/client/model/ModelManaCharger.java b/src/main/java/ab/client/model/ModelManaCharger.java index 0865afa..b0f3677 100644 --- a/src/main/java/ab/client/model/ModelManaCharger.java +++ b/src/main/java/ab/client/model/ModelManaCharger.java @@ -7,10 +7,10 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.LightningHandler; -import vazkii.botania.common.core.helper.Vector3; import ab.client.render.tile.RenderTileManaCharger; import ab.common.block.tile.TileManaCharger; +import vazkii.botania.client.core.handler.LightningHandler; +import vazkii.botania.common.core.helper.Vector3; public class ModelManaCharger extends ModelBase { diff --git a/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java b/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java index f0c24cf..cec4a58 100644 --- a/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java +++ b/src/main/java/ab/client/nei/RecipeHandlerAlphirine.java @@ -10,7 +10,6 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAncientAlphirine; import ab.client.core.ClientHelper; @@ -18,6 +17,7 @@ import codechicken.nei.NEIServerUtils; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; +import vazkii.botania.common.item.block.ItemBlockSpecialFlower; public class RecipeHandlerAlphirine extends TemplateRecipeHandler { diff --git a/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java b/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java index 158bb55..f1e67ac 100644 --- a/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java +++ b/src/main/java/ab/client/render/entity/RenderEntityAdvancedSpark.java @@ -2,10 +2,10 @@ import net.minecraft.util.IIcon; -import vazkii.botania.client.render.entity.RenderSparkBase; -import vazkii.botania.common.item.ItemSparkUpgrade; import ab.common.entity.EntityAdvancedSpark; import ab.common.item.ItemAdvancedSpark; +import vazkii.botania.client.render.entity.RenderSparkBase; +import vazkii.botania.common.item.ItemSparkUpgrade; public class RenderEntityAdvancedSpark extends RenderSparkBase { diff --git a/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java b/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java index 2a81fd9..762ca20 100644 --- a/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java +++ b/src/main/java/ab/client/render/entity/RenderEntityAlphirinePortal.java @@ -11,9 +11,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.core.ClientHelper; import ab.common.block.BlockLebethronWood; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderEntityAlphirinePortal extends Render { diff --git a/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java b/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java index e22ff67..75805b9 100644 --- a/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java +++ b/src/main/java/ab/client/render/item/RenderItemAntigravityCharm.java @@ -10,8 +10,8 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.common.item.ItemAntigravityCharm; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class RenderItemAntigravityCharm implements IItemRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileABSpreader.java b/src/main/java/ab/client/render/tile/RenderTileABSpreader.java index ec35ba6..e1fef66 100644 --- a/src/main/java/ab/client/render/tile/RenderTileABSpreader.java +++ b/src/main/java/ab/client/render/tile/RenderTileABSpreader.java @@ -12,12 +12,12 @@ import org.lwjgl.opengl.GL11; +import ab.common.block.tile.TileABSpreader; import vazkii.botania.api.mana.ILens; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.client.core.proxy.ClientProxy; import vazkii.botania.client.model.ModelSpreader; import vazkii.botania.client.render.item.RenderLens; -import ab.common.block.tile.TileABSpreader; public class RenderTileABSpreader extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileBoardFate.java b/src/main/java/ab/client/render/tile/RenderTileBoardFate.java index 4d2f2f4..427e288 100644 --- a/src/main/java/ab/client/render/tile/RenderTileBoardFate.java +++ b/src/main/java/ab/client/render/tile/RenderTileBoardFate.java @@ -10,9 +10,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelDiceFate; import ab.common.block.tile.TileBoardFate; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileBoardFate extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java b/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java index d8202ec..da909b5 100644 --- a/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java +++ b/src/main/java/ab/client/render/tile/RenderTileEngineerHopper.java @@ -9,8 +9,8 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelEngineerHopper; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileEngineerHopper extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileFountainAlchemy.java b/src/main/java/ab/client/render/tile/RenderTileFountainAlchemy.java index db8bd69..8396634 100644 --- a/src/main/java/ab/client/render/tile/RenderTileFountainAlchemy.java +++ b/src/main/java/ab/client/render/tile/RenderTileFountainAlchemy.java @@ -16,9 +16,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelFountainAlchemy; import ab.common.block.tile.TileFountainAlchemy; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileFountainAlchemy extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileFountainConjuration.java b/src/main/java/ab/client/render/tile/RenderTileFountainConjuration.java index d32267b..f1cf0b0 100644 --- a/src/main/java/ab/client/render/tile/RenderTileFountainConjuration.java +++ b/src/main/java/ab/client/render/tile/RenderTileFountainConjuration.java @@ -16,9 +16,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelFountainConjuration; import ab.common.block.tile.TileFountainConjuration; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileFountainConjuration extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileFountainMana.java b/src/main/java/ab/client/render/tile/RenderTileFountainMana.java index 909dd6c..e0a80ab 100644 --- a/src/main/java/ab/client/render/tile/RenderTileFountainMana.java +++ b/src/main/java/ab/client/render/tile/RenderTileFountainMana.java @@ -16,9 +16,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelFountainMana; import ab.common.block.tile.TileFountainMana; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileFountainMana extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileGameBoard.java b/src/main/java/ab/client/render/tile/RenderTileGameBoard.java index 22b2a35..322be7e 100644 --- a/src/main/java/ab/client/render/tile/RenderTileGameBoard.java +++ b/src/main/java/ab/client/render/tile/RenderTileGameBoard.java @@ -10,9 +10,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelDiceFate; import ab.common.block.tile.TileGameBoard; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileGameBoard extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java b/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java index 4c8636a..f35b6fa 100644 --- a/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java +++ b/src/main/java/ab/client/render/tile/RenderTileMagicCraftingCrate.java @@ -18,10 +18,10 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.common.block.BlockMagicCraftCrate; import ab.common.block.tile.TileMagicCraftCrate; import ab.common.lib.register.BlockListAB; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileMagicCraftingCrate extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileManaCharger.java b/src/main/java/ab/client/render/tile/RenderTileManaCharger.java index c7d08bc..82bcb74 100644 --- a/src/main/java/ab/client/render/tile/RenderTileManaCharger.java +++ b/src/main/java/ab/client/render/tile/RenderTileManaCharger.java @@ -19,9 +19,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelManaCharger; import ab.common.block.tile.TileManaCharger; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileManaCharger extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileManaContainer.java b/src/main/java/ab/client/render/tile/RenderTileManaContainer.java index 34d0803..2cb21b5 100644 --- a/src/main/java/ab/client/render/tile/RenderTileManaContainer.java +++ b/src/main/java/ab/client/render/tile/RenderTileManaContainer.java @@ -12,12 +12,12 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.client.core.helper.ShaderHelper; -import vazkii.botania.common.block.mana.BlockPool; import ab.client.core.ClientHelper; import ab.client.model.ModelManaContainer; import ab.common.block.tile.TileManaContainer; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.client.core.helper.ShaderHelper; +import vazkii.botania.common.block.mana.BlockPool; public class RenderTileManaContainer extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java b/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java index df8aef3..04109f8 100644 --- a/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java +++ b/src/main/java/ab/client/render/tile/RenderTileNidavellirForge.java @@ -16,9 +16,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; import ab.client.model.ModelNidavellirForge; import ab.common.block.tile.TileNidavellirForge; +import vazkii.botania.client.core.handler.ClientTickHandler; public class RenderTileNidavellirForge extends TileEntitySpecialRenderer { diff --git a/src/main/java/ab/common/block/BlockABSpreader.java b/src/main/java/ab/common/block/BlockABSpreader.java index 864c21a..fb8d4fa 100644 --- a/src/main/java/ab/common/block/BlockABSpreader.java +++ b/src/main/java/ab/common/block/BlockABSpreader.java @@ -20,16 +20,16 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import ab.AdvancedBotany; +import ab.common.block.tile.TileABSpreader; +import ab.common.lib.register.BlockListAB; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.api.wand.IWireframeAABBProvider; import vazkii.botania.common.item.ModItems; -import ab.AdvancedBotany; -import ab.common.block.tile.TileABSpreader; -import ab.common.lib.register.BlockListAB; -import ab.common.lib.register.RecipeListAB; public class BlockABSpreader extends BlockContainer implements IWandable, IWandHUD, IWireframeAABBProvider, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockAntigravitation.java b/src/main/java/ab/common/block/BlockAntigravitation.java index 3b6650f..86eb208 100644 --- a/src/main/java/ab/common/block/BlockAntigravitation.java +++ b/src/main/java/ab/common/block/BlockAntigravitation.java @@ -8,9 +8,9 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class BlockAntigravitation extends Block { diff --git a/src/main/java/ab/common/block/BlockBoardFate.java b/src/main/java/ab/common/block/BlockBoardFate.java index f3f1645..11ba786 100644 --- a/src/main/java/ab/common/block/BlockBoardFate.java +++ b/src/main/java/ab/common/block/BlockBoardFate.java @@ -18,15 +18,15 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.achievement.IPickupAchievement; import ab.AdvancedBotany; import ab.common.block.tile.TileBoardFate; import ab.common.block.tile.TileGameBoard; import ab.common.block.tile.TileInventory; import ab.common.lib.register.AchievementRegister; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.achievement.IPickupAchievement; public class BlockBoardFate extends BlockContainer implements IPickupAchievement, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockEngineerHopper.java b/src/main/java/ab/common/block/BlockEngineerHopper.java index c943e93..71999da 100644 --- a/src/main/java/ab/common/block/BlockEngineerHopper.java +++ b/src/main/java/ab/common/block/BlockEngineerHopper.java @@ -14,16 +14,16 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.wand.IWandHUD; -import vazkii.botania.api.wand.IWandable; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileEngineerHopper; import ab.common.block.tile.TileInventory; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.wand.IWandHUD; +import vazkii.botania.api.wand.IWandable; +import vazkii.botania.common.block.ModBlocks; public class BlockEngineerHopper extends BlockContainer implements IWandable, IWandHUD, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockFountainAlchemy.java b/src/main/java/ab/common/block/BlockFountainAlchemy.java index 1667b1e..8760fde 100644 --- a/src/main/java/ab/common/block/BlockFountainAlchemy.java +++ b/src/main/java/ab/common/block/BlockFountainAlchemy.java @@ -15,14 +15,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileFountainAlchemy; import ab.common.block.tile.TileInventory; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; public class BlockFountainAlchemy extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockFountainConjuration.java b/src/main/java/ab/common/block/BlockFountainConjuration.java index b79e347..598b6b2 100644 --- a/src/main/java/ab/common/block/BlockFountainConjuration.java +++ b/src/main/java/ab/common/block/BlockFountainConjuration.java @@ -15,14 +15,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileFountainConjuration; import ab.common.block.tile.TileInventory; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; public class BlockFountainConjuration extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockFountainMana.java b/src/main/java/ab/common/block/BlockFountainMana.java index 86f1973..ffc3845 100644 --- a/src/main/java/ab/common/block/BlockFountainMana.java +++ b/src/main/java/ab/common/block/BlockFountainMana.java @@ -15,14 +15,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileFountainMana; import ab.common.block.tile.TileInventory; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; public class BlockFountainMana extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockFreyrLiana.java b/src/main/java/ab/common/block/BlockFreyrLiana.java index e349907..0345109 100644 --- a/src/main/java/ab/common/block/BlockFreyrLiana.java +++ b/src/main/java/ab/common/block/BlockFreyrLiana.java @@ -13,11 +13,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import ab.common.core.CommonHelper; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; public class BlockFreyrLiana extends BlockBush implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockLebethronWood.java b/src/main/java/ab/common/block/BlockLebethronWood.java index 1566eb3..9aa0bea 100644 --- a/src/main/java/ab/common/block/BlockLebethronWood.java +++ b/src/main/java/ab/common/block/BlockLebethronWood.java @@ -18,14 +18,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.internal.VanillaPacketDispatcher; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import ab.AdvancedBotany; import ab.common.block.tile.TileLebethronCore; import ab.common.lib.register.RecipeListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.internal.VanillaPacketDispatcher; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; public class BlockLebethronWood extends Block implements ILexiconable, ITileEntityProvider { diff --git a/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java b/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java index 4f27cec..105ac8c 100644 --- a/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java +++ b/src/main/java/ab/common/block/BlockLuminousFreyrLiana.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class BlockLuminousFreyrLiana extends BlockFreyrLiana { diff --git a/src/main/java/ab/common/block/BlockMagicCraftCrate.java b/src/main/java/ab/common/block/BlockMagicCraftCrate.java index 1ceee93..87a2ec1 100644 --- a/src/main/java/ab/common/block/BlockMagicCraftCrate.java +++ b/src/main/java/ab/common/block/BlockMagicCraftCrate.java @@ -22,6 +22,10 @@ import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; +import ab.AdvancedBotany; +import ab.common.block.tile.TileMagicCraftCrate; +import ab.common.item.ItemCraftingPattern; +import ab.common.lib.register.RecipeListAB; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.client.lib.UtilsFX; @@ -32,10 +36,6 @@ import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.BlockModContainer; -import ab.AdvancedBotany; -import ab.common.block.tile.TileMagicCraftCrate; -import ab.common.item.ItemCraftingPattern; -import ab.common.lib.register.RecipeListAB; public class BlockMagicCraftCrate extends BlockModContainer implements IWandable, IWandHUD, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockManaCharger.java b/src/main/java/ab/common/block/BlockManaCharger.java index c999739..b538e2d 100644 --- a/src/main/java/ab/common/block/BlockManaCharger.java +++ b/src/main/java/ab/common/block/BlockManaCharger.java @@ -14,17 +14,17 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; +import ab.AdvancedBotany; +import ab.common.block.tile.TileInventory; +import ab.common.block.tile.TileManaCharger; +import ab.common.lib.register.BlockListAB; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.ModBlocks; -import ab.AdvancedBotany; -import ab.common.block.tile.TileInventory; -import ab.common.block.tile.TileManaCharger; -import ab.common.lib.register.BlockListAB; -import ab.common.lib.register.RecipeListAB; public class BlockManaCharger extends BlockContainer implements IWandHUD, IWandable, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockManaContainer.java b/src/main/java/ab/common/block/BlockManaContainer.java index 248b2bd..d6ac0dd 100644 --- a/src/main/java/ab/common/block/BlockManaContainer.java +++ b/src/main/java/ab/common/block/BlockManaContainer.java @@ -14,15 +14,15 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import ab.AdvancedBotany; +import ab.common.block.tile.TileManaContainer; +import ab.common.lib.register.BlockListAB; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; import vazkii.botania.common.block.ModBlocks; -import ab.AdvancedBotany; -import ab.common.block.tile.TileManaContainer; -import ab.common.lib.register.BlockListAB; -import ab.common.lib.register.RecipeListAB; public class BlockManaContainer extends BlockContainer implements IWandHUD, IWandable, ILexiconable { diff --git a/src/main/java/ab/common/block/BlockManaCrystalCube.java b/src/main/java/ab/common/block/BlockManaCrystalCube.java index 0956fad..a3956a9 100644 --- a/src/main/java/ab/common/block/BlockManaCrystalCube.java +++ b/src/main/java/ab/common/block/BlockManaCrystalCube.java @@ -12,14 +12,14 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.item.ItemTwigWand; import ab.AdvancedBotany; import ab.common.block.tile.TileManaCrystalCube; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.item.ItemTwigWand; public class BlockManaCrystalCube extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockNidavellirForge.java b/src/main/java/ab/common/block/BlockNidavellirForge.java index 34e06f3..1f936ed 100644 --- a/src/main/java/ab/common/block/BlockNidavellirForge.java +++ b/src/main/java/ab/common/block/BlockNidavellirForge.java @@ -15,14 +15,14 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.common.block.ModBlocks; import ab.AdvancedBotany; import ab.common.block.tile.TileInventory; import ab.common.block.tile.TileNidavellirForge; import ab.common.lib.register.BlockListAB; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.common.block.ModBlocks; public class BlockNidavellirForge extends BlockContainer implements ILexiconable { diff --git a/src/main/java/ab/common/block/BlockTerraFarmland.java b/src/main/java/ab/common/block/BlockTerraFarmland.java index ffe1e25..425f813 100644 --- a/src/main/java/ab/common/block/BlockTerraFarmland.java +++ b/src/main/java/ab/common/block/BlockTerraFarmland.java @@ -19,13 +19,13 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; import ab.api.AdvancedBotanyAPI; import ab.api.TerraFarmlandList; import ab.common.lib.register.RecipeListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; public class BlockTerraFarmland extends Block implements ILexiconable { diff --git a/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java b/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java index 46f50e9..5189895 100644 --- a/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java +++ b/src/main/java/ab/common/block/subtile/SubTileAncientAlphirine.java @@ -8,14 +8,14 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.subtile.RadiusDescriptor; -import vazkii.botania.api.subtile.SubTileFunctional; -import vazkii.botania.common.item.ItemLexicon; import ab.api.AdvancedBotanyAPI; import ab.api.recipe.RecipeAncientAlphirine; import ab.common.entity.EntityAlphirinePortal; import ab.common.lib.register.RecipeListAB; +import vazkii.botania.api.lexicon.LexiconEntry; +import vazkii.botania.api.subtile.RadiusDescriptor; +import vazkii.botania.api.subtile.SubTileFunctional; +import vazkii.botania.common.item.ItemLexicon; public class SubTileAncientAlphirine extends SubTileFunctional { diff --git a/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java b/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java index d28b895..acb6da6 100644 --- a/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java +++ b/src/main/java/ab/common/block/subtile/SubTileArdentAzarcissus.java @@ -5,12 +5,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import ab.common.block.tile.TileGameBoard; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; -import ab.common.block.tile.TileGameBoard; -import ab.common.lib.register.RecipeListAB; public class SubTileArdentAzarcissus extends SubTileGenerating { diff --git a/src/main/java/ab/common/block/subtile/SubTileAspecolus.java b/src/main/java/ab/common/block/subtile/SubTileAspecolus.java index 4762c60..ea80401 100644 --- a/src/main/java/ab/common/block/subtile/SubTileAspecolus.java +++ b/src/main/java/ab/common/block/subtile/SubTileAspecolus.java @@ -9,6 +9,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import ab.common.lib.register.RecipeListAB; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.Thaumcraft; @@ -17,7 +18,6 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; -import ab.common.lib.register.RecipeListAB; public class SubTileAspecolus extends SubTileFunctional { diff --git a/src/main/java/ab/common/block/subtile/SubTileDictarius.java b/src/main/java/ab/common/block/subtile/SubTileDictarius.java index 604c048..15e2e47 100644 --- a/src/main/java/ab/common/block/subtile/SubTileDictarius.java +++ b/src/main/java/ab/common/block/subtile/SubTileDictarius.java @@ -14,12 +14,12 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import ab.common.core.handler.ConfigABHandler; +import ab.common.lib.register.RecipeListAB; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileGenerating; import vazkii.botania.common.block.tile.TileSpecialFlower; -import ab.common.core.handler.ConfigABHandler; -import ab.common.lib.register.RecipeListAB; public class SubTileDictarius extends SubTileGenerating { diff --git a/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java b/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java index 43691bd..5cf67c8 100644 --- a/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java +++ b/src/main/java/ab/common/block/subtile/SubTilePureGladiolus.java @@ -8,13 +8,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import ab.common.lib.register.RecipeListAB; import thaumcraft.api.aspects.Aspect; import thaumcraft.common.entities.EntityAspectOrb; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.subtile.RadiusDescriptor; import vazkii.botania.api.subtile.SubTileFunctional; import vazkii.botania.common.block.ModBlocks; -import ab.common.lib.register.RecipeListAB; public class SubTilePureGladiolus extends SubTileFunctional { diff --git a/src/main/java/ab/common/block/tile/TileABSpreader.java b/src/main/java/ab/common/block/tile/TileABSpreader.java index b98d16e..d7d8719 100644 --- a/src/main/java/ab/common/block/tile/TileABSpreader.java +++ b/src/main/java/ab/common/block/tile/TileABSpreader.java @@ -11,13 +11,13 @@ import org.lwjgl.opengl.GL11; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.mana.BurstProperties; import vazkii.botania.api.mana.ILensEffect; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.client.core.handler.HUDHandler; import vazkii.botania.common.block.tile.mana.TileSpreader; import vazkii.botania.common.entity.EntityManaBurst; -import ab.common.core.handler.ConfigABHandler; public class TileABSpreader extends TileSpreader { diff --git a/src/main/java/ab/common/block/tile/TileBoardFate.java b/src/main/java/ab/common/block/tile/TileBoardFate.java index 09d7439..095319d 100644 --- a/src/main/java/ab/common/block/tile/TileBoardFate.java +++ b/src/main/java/ab/common/block/tile/TileBoardFate.java @@ -13,11 +13,11 @@ import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.Vec3; +import ab.api.AdvancedBotanyAPI; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.item.IRelic; import vazkii.botania.common.item.relic.ItemRelic; -import ab.api.AdvancedBotanyAPI; -import ab.common.core.handler.ConfigABHandler; public class TileBoardFate extends TileInventory { diff --git a/src/main/java/ab/common/block/tile/TileEngineerHopper.java b/src/main/java/ab/common/block/tile/TileEngineerHopper.java index 8079b6b..8af767e 100644 --- a/src/main/java/ab/common/block/tile/TileEngineerHopper.java +++ b/src/main/java/ab/common/block/tile/TileEngineerHopper.java @@ -19,9 +19,9 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.common.item.ModItems; import ab.api.IBoundRender; import ab.client.core.ClientHelper; +import vazkii.botania.common.item.ModItems; public class TileEngineerHopper extends TileInventory implements IHopper, IBoundRender { diff --git a/src/main/java/ab/common/block/tile/TileFountainAlchemy.java b/src/main/java/ab/common/block/tile/TileFountainAlchemy.java index 57344f5..89f82bf 100644 --- a/src/main/java/ab/common/block/tile/TileFountainAlchemy.java +++ b/src/main/java/ab/common/block/tile/TileFountainAlchemy.java @@ -11,6 +11,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeFountainAlchemy; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -18,8 +20,6 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.Botania; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeFountainAlchemy; public class TileFountainAlchemy extends TileInventory implements ISparkAttachable, ISidedInventory { diff --git a/src/main/java/ab/common/block/tile/TileFountainConjuration.java b/src/main/java/ab/common/block/tile/TileFountainConjuration.java index 613f3e4..60ff18d 100644 --- a/src/main/java/ab/common/block/tile/TileFountainConjuration.java +++ b/src/main/java/ab/common/block/tile/TileFountainConjuration.java @@ -11,6 +11,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeFountainConjuration; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -18,8 +20,6 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.Botania; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeFountainConjuration; public class TileFountainConjuration extends TileInventory implements ISparkAttachable, ISidedInventory { diff --git a/src/main/java/ab/common/block/tile/TileFountainMana.java b/src/main/java/ab/common/block/tile/TileFountainMana.java index 5ff3c3b..2b52c31 100644 --- a/src/main/java/ab/common/block/tile/TileFountainMana.java +++ b/src/main/java/ab/common/block/tile/TileFountainMana.java @@ -11,6 +11,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeFountainMana; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -18,8 +20,6 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.Botania; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeFountainMana; public class TileFountainMana extends TileInventory implements ISparkAttachable, ISidedInventory { diff --git a/src/main/java/ab/common/block/tile/TileGameBoard.java b/src/main/java/ab/common/block/tile/TileGameBoard.java index 65976c5..1218ac2 100644 --- a/src/main/java/ab/common/block/tile/TileGameBoard.java +++ b/src/main/java/ab/common/block/tile/TileGameBoard.java @@ -15,9 +15,9 @@ import net.minecraft.util.ChatStyle; import net.minecraft.util.EnumChatFormatting; +import ab.api.IRenderHud; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.block.tile.TileMod; -import ab.api.IRenderHud; public class TileGameBoard extends TileMod implements IRenderHud { diff --git a/src/main/java/ab/common/block/tile/TileLebethronCore.java b/src/main/java/ab/common/block/tile/TileLebethronCore.java index c91e37a..d3a7484 100644 --- a/src/main/java/ab/common/block/tile/TileLebethronCore.java +++ b/src/main/java/ab/common/block/tile/TileLebethronCore.java @@ -17,13 +17,13 @@ import org.lwjgl.opengl.GL11; +import ab.api.IRenderHud; +import ab.common.lib.register.BlockListAB; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.lexicon.multiblock.Multiblock; import vazkii.botania.api.lexicon.multiblock.MultiblockSet; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -import ab.api.IRenderHud; -import ab.common.lib.register.BlockListAB; public class TileLebethronCore extends TileMod implements IRenderHud { diff --git a/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java b/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java index 2b5fc48..1cbdc3e 100644 --- a/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java +++ b/src/main/java/ab/common/block/tile/TileMagicCraftCrate.java @@ -14,6 +14,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; +import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import thaumcraft.api.aspects.AspectList; import thaumcraft.common.items.relics.ItemThaumonomicon; import thaumcraft.common.items.wands.ItemWandCasting; @@ -21,7 +22,6 @@ import thaumcraft.common.tiles.TileMagicWorkbench; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.common.item.ModItems; -import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; public class TileMagicCraftCrate extends TileMagicWorkbench implements ISidedInventory, IInventory { diff --git a/src/main/java/ab/common/block/tile/TileManaCharger.java b/src/main/java/ab/common/block/tile/TileManaCharger.java index 2399485..172fd27 100644 --- a/src/main/java/ab/common/block/tile/TileManaCharger.java +++ b/src/main/java/ab/common/block/tile/TileManaCharger.java @@ -15,15 +15,15 @@ import org.lwjgl.opengl.GL11; +import ab.api.IRenderHud; +import ab.client.core.ClientHelper; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaReceiver; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.wand.IWandBindable; import vazkii.botania.common.block.ModBlocks; -import ab.api.IRenderHud; -import ab.client.core.ClientHelper; -import ab.common.core.handler.ConfigABHandler; public class TileManaCharger extends TileInventory implements ISidedInventory, IRenderHud, IWandBindable { diff --git a/src/main/java/ab/common/block/tile/TileManaContainer.java b/src/main/java/ab/common/block/tile/TileManaContainer.java index 2e056df..782f858 100644 --- a/src/main/java/ab/common/block/tile/TileManaContainer.java +++ b/src/main/java/ab/common/block/tile/TileManaContainer.java @@ -15,13 +15,13 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.StatCollector; +import ab.client.core.ClientHelper; +import ab.common.core.handler.ConfigABHandler; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.common.Botania; import vazkii.botania.common.block.tile.TileMod; -import ab.client.core.ClientHelper; -import ab.common.core.handler.ConfigABHandler; public class TileManaContainer extends TileMod implements IManaPool, ISparkAttachable { diff --git a/src/main/java/ab/common/block/tile/TileManaCrystalCube.java b/src/main/java/ab/common/block/tile/TileManaCrystalCube.java index 5330950..55ce67d 100644 --- a/src/main/java/ab/common/block/tile/TileManaCrystalCube.java +++ b/src/main/java/ab/common/block/tile/TileManaCrystalCube.java @@ -7,12 +7,12 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; +import ab.api.IRenderHud; +import ab.client.core.ClientHelper; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.common.block.tile.TileMod; -import ab.api.IRenderHud; -import ab.client.core.ClientHelper; public class TileManaCrystalCube extends TileMod implements IRenderHud { diff --git a/src/main/java/ab/common/block/tile/TileNidavellirForge.java b/src/main/java/ab/common/block/tile/TileNidavellirForge.java index 41ae6e5..8321b69 100644 --- a/src/main/java/ab/common/block/tile/TileNidavellirForge.java +++ b/src/main/java/ab/common/block/tile/TileNidavellirForge.java @@ -11,6 +11,8 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.AxisAlignedBB; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaPool; import vazkii.botania.api.mana.spark.ISparkAttachable; @@ -18,8 +20,6 @@ import vazkii.botania.api.mana.spark.SparkHelper; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.Botania; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; public class TileNidavellirForge extends TileInventory implements ISparkAttachable, ISidedInventory { diff --git a/src/main/java/ab/common/entity/EntityAdvancedSpark.java b/src/main/java/ab/common/entity/EntityAdvancedSpark.java index 243151d..2bb9e2e 100644 --- a/src/main/java/ab/common/entity/EntityAdvancedSpark.java +++ b/src/main/java/ab/common/entity/EntityAdvancedSpark.java @@ -19,6 +19,8 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import ab.common.lib.register.ItemListAB; +import baubles.common.lib.PlayerHandler; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; @@ -26,8 +28,6 @@ import vazkii.botania.common.Botania; import vazkii.botania.common.core.helper.Vector3; import vazkii.botania.common.item.ModItems; -import ab.common.lib.register.ItemListAB; -import baubles.common.lib.PlayerHandler; public class EntityAdvancedSpark extends Entity implements ISparkEntity { diff --git a/src/main/java/ab/common/entity/EntityManaVine.java b/src/main/java/ab/common/entity/EntityManaVine.java index 9eddd74..713f7c3 100644 --- a/src/main/java/ab/common/entity/EntityManaVine.java +++ b/src/main/java/ab/common/entity/EntityManaVine.java @@ -17,15 +17,15 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.handler.ConfigHandler; -import vazkii.botania.common.lib.LibObfuscation; import ab.client.core.ClientHelper; import ab.common.core.CommonHelper; import ab.common.lib.register.BlockListAB; import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.handler.ConfigHandler; +import vazkii.botania.common.lib.LibObfuscation; public class EntityManaVine extends EntityThrowable { diff --git a/src/main/java/ab/common/entity/EntityNebulaBlaze.java b/src/main/java/ab/common/entity/EntityNebulaBlaze.java index ae3bb6b..74f1180 100644 --- a/src/main/java/ab/common/entity/EntityNebulaBlaze.java +++ b/src/main/java/ab/common/entity/EntityNebulaBlaze.java @@ -13,9 +13,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class EntityNebulaBlaze extends EntityThrowable { diff --git a/src/main/java/ab/common/entity/EntitySeed.java b/src/main/java/ab/common/entity/EntitySeed.java index 834b099..0317315 100644 --- a/src/main/java/ab/common/entity/EntitySeed.java +++ b/src/main/java/ab/common/entity/EntitySeed.java @@ -17,11 +17,11 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.world.BlockEvent; -import vazkii.botania.common.Botania; -import vazkii.botania.common.item.ItemGrassSeeds; import ab.common.item.equipment.ItemSprawlRod; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; +import vazkii.botania.common.item.ItemGrassSeeds; public class EntitySeed extends EntityThrowable { diff --git a/src/main/java/ab/common/entity/EntitySword.java b/src/main/java/ab/common/entity/EntitySword.java index 92decd5..ebeff81 100644 --- a/src/main/java/ab/common/entity/EntitySword.java +++ b/src/main/java/ab/common/entity/EntitySword.java @@ -13,9 +13,9 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import vazkii.botania.common.Botania; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.Botania; public class EntitySword extends EntityThrowable { diff --git a/src/main/java/ab/common/item/ItemABResource.java b/src/main/java/ab/common/item/ItemABResource.java index c7d7502..c6d084e 100644 --- a/src/main/java/ab/common/item/ItemABResource.java +++ b/src/main/java/ab/common/item/ItemABResource.java @@ -16,11 +16,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.api.recipe.IFlowerComponent; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.recipe.IFlowerComponent; public class ItemABResource extends Item implements IFlowerComponent { diff --git a/src/main/java/ab/common/item/ItemAdvancedSpark.java b/src/main/java/ab/common/item/ItemAdvancedSpark.java index 2f25c82..2c95a29 100644 --- a/src/main/java/ab/common/item/ItemAdvancedSpark.java +++ b/src/main/java/ab/common/item/ItemAdvancedSpark.java @@ -8,13 +8,13 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; +import ab.common.entity.EntityAdvancedSpark; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.api.internal.VanillaPacketDispatcher; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.spark.ISparkAttachable; import vazkii.botania.api.mana.spark.ISparkEntity; -import ab.common.entity.EntityAdvancedSpark; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemAdvancedSpark extends ItemMod implements IManaGivingItem { diff --git a/src/main/java/ab/common/item/ItemAntigravityCharm.java b/src/main/java/ab/common/item/ItemAntigravityCharm.java index 069d029..6e6efe4 100644 --- a/src/main/java/ab/common/item/ItemAntigravityCharm.java +++ b/src/main/java/ab/common/item/ItemAntigravityCharm.java @@ -13,11 +13,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.common.core.CommonHelper; import ab.common.lib.register.BlockListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemAntigravityCharm extends ItemMod { diff --git a/src/main/java/ab/common/item/equipment/ItemAquaSword.java b/src/main/java/ab/common/item/equipment/ItemAquaSword.java index 5241b85..4501167 100644 --- a/src/main/java/ab/common/item/equipment/ItemAquaSword.java +++ b/src/main/java/ab/common/item/equipment/ItemAquaSword.java @@ -13,11 +13,11 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.Vec3; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; public class ItemAquaSword extends ItemSword { diff --git a/src/main/java/ab/common/item/equipment/ItemBauble.java b/src/main/java/ab/common/item/equipment/ItemBauble.java index 2d32fe2..76c33cb 100644 --- a/src/main/java/ab/common/item/equipment/ItemBauble.java +++ b/src/main/java/ab/common/item/equipment/ItemBauble.java @@ -14,12 +14,6 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.api.item.ICosmeticAttachable; -import vazkii.botania.api.item.IPhantomInkable; -import vazkii.botania.client.core.helper.RenderHelper; -import vazkii.botania.common.achievement.ModAchievements; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.entity.EntityDoppleganger; import ab.AdvancedBotany; import baubles.api.BaubleType; import baubles.api.IBauble; @@ -27,6 +21,12 @@ import baubles.common.lib.PlayerHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.item.ICosmeticAttachable; +import vazkii.botania.api.item.IPhantomInkable; +import vazkii.botania.client.core.helper.RenderHelper; +import vazkii.botania.common.achievement.ModAchievements; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.entity.EntityDoppleganger; public abstract class ItemBauble extends Item implements IBauble, ICosmeticAttachable, IPhantomInkable { diff --git a/src/main/java/ab/common/item/equipment/ItemBlackHalo.java b/src/main/java/ab/common/item/equipment/ItemBlackHalo.java index cf09980..3c2bfb2 100644 --- a/src/main/java/ab/common/item/equipment/ItemBlackHalo.java +++ b/src/main/java/ab/common/item/equipment/ItemBlackHalo.java @@ -29,15 +29,15 @@ import org.lwjgl.opengl.GL11; +import ab.common.item.ItemMod; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.api.item.IBlockProvider; import vazkii.botania.client.core.handler.ClientTickHandler; import vazkii.botania.common.core.helper.InventoryHelper; import vazkii.botania.common.core.helper.ItemNBTHelper; import vazkii.botania.common.item.ItemBlackHoleTalisman; -import ab.common.item.ItemMod; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class ItemBlackHalo extends ItemMod implements IBlockProvider { diff --git a/src/main/java/ab/common/item/equipment/ItemManaFlower.java b/src/main/java/ab/common/item/equipment/ItemManaFlower.java index e08e309..be9185a 100644 --- a/src/main/java/ab/common/item/equipment/ItemManaFlower.java +++ b/src/main/java/ab/common/item/equipment/ItemManaFlower.java @@ -4,10 +4,10 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; -import vazkii.botania.api.mana.IManaGivingItem; -import vazkii.botania.api.mana.ManaItemHandler; import ab.AdvancedBotany; import baubles.api.BaubleType; +import vazkii.botania.api.mana.IManaGivingItem; +import vazkii.botania.api.mana.ManaItemHandler; public class ItemManaFlower extends ItemBauble implements IManaGivingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java b/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java index ae8fb65..7875ad2 100644 --- a/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java +++ b/src/main/java/ab/common/item/equipment/ItemMithrillMultiTool.java @@ -10,11 +10,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemMithrillMultiTool extends ItemTool { diff --git a/src/main/java/ab/common/item/equipment/ItemMithrillRing.java b/src/main/java/ab/common/item/equipment/ItemMithrillRing.java index 55d8f65..297c91c 100644 --- a/src/main/java/ab/common/item/equipment/ItemMithrillRing.java +++ b/src/main/java/ab/common/item/equipment/ItemMithrillRing.java @@ -8,10 +8,10 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; +import baubles.api.BaubleType; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.api.mana.IManaTooltipDisplay; import vazkii.botania.common.core.helper.ItemNBTHelper; -import baubles.api.BaubleType; public class ItemMithrillRing extends ItemBauble implements IManaItem, IManaTooltipDisplay { diff --git a/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java b/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java index 9937192..2b5b3cb 100644 --- a/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java +++ b/src/main/java/ab/common/item/equipment/ItemNebulaBlaze.java @@ -6,11 +6,11 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; -import vazkii.botania.api.mana.ManaItemHandler; import ab.api.AdvancedBotanyAPI; import ab.common.entity.EntityNebulaBlaze; import ab.common.item.ItemMod; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; public class ItemNebulaBlaze extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemNebulaRod.java b/src/main/java/ab/common/item/equipment/ItemNebulaRod.java index 2d092da..e536b7a 100644 --- a/src/main/java/ab/common/item/equipment/ItemNebulaRod.java +++ b/src/main/java/ab/common/item/equipment/ItemNebulaRod.java @@ -23,15 +23,15 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.EnderTeleportEvent; -import vazkii.botania.api.mana.IManaUsingItem; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.Vector3; import ab.api.AdvancedBotanyAPI; import ab.client.core.ClientHelper; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; import ab.common.core.handler.ConfigABHandler; import ab.common.item.ItemMod; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.Vector3; public class ItemNebulaRod extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java b/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java index 3205d58..9a23c06 100644 --- a/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java +++ b/src/main/java/ab/common/item/equipment/ItemSpaceBlade.java @@ -29,20 +29,19 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; -import vazkii.botania.api.mana.IManaUsingItem; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.ItemNBTHelper; +import com.google.common.collect.Multimap; + import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.api.IRankItem; import ab.common.core.handler.*; import ab.common.entity.EntitySword; - -import com.google.common.collect.Multimap; - import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemSpaceBlade extends ItemSword implements IRankItem, IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemSprawlRod.java b/src/main/java/ab/common/item/equipment/ItemSprawlRod.java index 9eb8437..dbb37d4 100644 --- a/src/main/java/ab/common/item/equipment/ItemSprawlRod.java +++ b/src/main/java/ab/common/item/equipment/ItemSprawlRod.java @@ -9,13 +9,13 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; +import ab.common.core.handler.ConfigABHandler; +import ab.common.entity.EntitySeed; +import ab.common.item.ItemMod; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.item.ModItems; -import ab.common.core.handler.ConfigABHandler; -import ab.common.entity.EntitySeed; -import ab.common.item.ItemMod; public class ItemSprawlRod extends ItemMod implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/ItemTerraHoe.java b/src/main/java/ab/common/item/equipment/ItemTerraHoe.java index 69f5a16..7865701 100644 --- a/src/main/java/ab/common/item/equipment/ItemTerraHoe.java +++ b/src/main/java/ab/common/item/equipment/ItemTerraHoe.java @@ -11,15 +11,15 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.UseHoeEvent; +import ab.AdvancedBotany; +import ab.common.lib.register.BlockListAB; +import cpw.mods.fml.common.eventhandler.Event.Result; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.common.Botania; import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.item.ModItems; -import ab.AdvancedBotany; -import ab.common.lib.register.BlockListAB; -import cpw.mods.fml.common.eventhandler.Event.Result; public class ItemTerraHoe extends ItemHoe implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java index b9708fe..8d87ad3 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaArmor.java @@ -15,17 +15,17 @@ import net.minecraft.world.World; import net.minecraftforge.common.ISpecialArmor; -import vazkii.botania.api.mana.IManaItem; -import vazkii.botania.api.mana.IManaTooltipDisplay; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; -import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.client.model.armor.ModelArmorNebula; import ab.common.lib.register.ItemListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.IManaItem; +import vazkii.botania.api.mana.IManaTooltipDisplay; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; public class ItemNebulaArmor extends ItemManasteelArmor implements IManaItem, IManaTooltipDisplay { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java index 9124bbe..d46d9e0 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaBoots.java @@ -9,8 +9,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingEvent; -import vazkii.botania.common.Botania; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import vazkii.botania.common.Botania; public class ItemNebulaBoots extends ItemNebulaArmor { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java index 7108c53..70ba8c6 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaChest.java @@ -13,6 +13,7 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ItemNebulaChest extends ItemNebulaArmor { diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java index 663c978..cc63d08 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelm.java @@ -14,15 +14,15 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.mana.IManaDiscountArmor; import vazkii.botania.api.mana.IManaGivingItem; import vazkii.botania.api.mana.IManaItem; import vazkii.botania.common.core.helper.ItemNBTHelper; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - public class ItemNebulaHelm extends ItemNebulaArmor implements IManaDiscountArmor, IManaGivingItem { private static final String TAG_COSMIC_FACE = "enableCosmicFace"; diff --git a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java index 2f50f26..e6ca5f0 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemNebulaHelmRevealing.java @@ -3,10 +3,10 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemStack; -import thaumcraft.api.IGoggles; -import thaumcraft.api.nodes.IRevealer; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; +import thaumcraft.api.IGoggles; +import thaumcraft.api.nodes.IRevealer; @InterfaceList({ @Interface(modid = "Thaumcraft", iface = "thaumcraft.api.IGoggles", striprefs = true), @Interface(modid = "Thaumcraft", iface = "thaumcraft.api.nodes.IRevealer", striprefs = true) }) diff --git a/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java b/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java index da0aef9..f16222a 100644 --- a/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java +++ b/src/main/java/ab/common/item/equipment/armor/ItemWildHuntArmor.java @@ -9,13 +9,13 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; import ab.AdvancedBotany; import ab.api.AdvancedBotanyAPI; import ab.client.model.armor.ModelArmorWildHunt; import ab.common.lib.register.ItemListAB; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.item.equipment.armor.manasteel.ItemManasteelArmor; public class ItemWildHuntArmor extends ItemManasteelArmor { diff --git a/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java b/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java index 7451e1b..b02156f 100644 --- a/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java +++ b/src/main/java/ab/common/item/relic/ItemFreyrSlingshot.java @@ -5,9 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import ab.common.entity.EntityManaVine; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; -import ab.common.entity.EntityManaVine; public class ItemFreyrSlingshot extends ItemModRelic implements IManaUsingItem { diff --git a/src/main/java/ab/common/item/relic/ItemHornPlenty.java b/src/main/java/ab/common/item/relic/ItemHornPlenty.java index 554d572..60de8ce 100644 --- a/src/main/java/ab/common/item/relic/ItemHornPlenty.java +++ b/src/main/java/ab/common/item/relic/ItemHornPlenty.java @@ -11,8 +11,6 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.client.core.handler.PlayerItemUsingSound.ClientSoundHandler; import ab.common.core.handler.ConfigABHandler; import ab.common.core.handler.NetworkHandler; @@ -20,6 +18,8 @@ import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemHornPlenty extends ItemModRelic { diff --git a/src/main/java/ab/common/item/relic/ItemModRelic.java b/src/main/java/ab/common/item/relic/ItemModRelic.java index 8df26ce..b73b56b 100644 --- a/src/main/java/ab/common/item/relic/ItemModRelic.java +++ b/src/main/java/ab/common/item/relic/ItemModRelic.java @@ -8,10 +8,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; -import vazkii.botania.common.item.relic.ItemRelic; import ab.AdvancedBotany; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.common.item.relic.ItemRelic; public class ItemModRelic extends ItemRelic { diff --git a/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java b/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java index 866d6a4..bd04aa9 100644 --- a/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java +++ b/src/main/java/ab/common/item/relic/ItemPocketWardrobe.java @@ -20,13 +20,13 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.client.core.ClientHelper; import ab.common.entity.EntityAnonymousSteve; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemPocketWardrobe extends ItemModRelic { diff --git a/src/main/java/ab/common/item/relic/ItemSphereNavigation.java b/src/main/java/ab/common/item/relic/ItemSphereNavigation.java index fdd3eb7..44a0437 100644 --- a/src/main/java/ab/common/item/relic/ItemSphereNavigation.java +++ b/src/main/java/ab/common/item/relic/ItemSphereNavigation.java @@ -16,14 +16,14 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import vazkii.botania.api.mana.ManaItemHandler; -import vazkii.botania.common.Botania; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.client.core.handler.ItemsRemainingRender; import ab.common.core.handler.ConfigABHandler; import ab.common.core.handler.NetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemSphereNavigation extends ItemModRelic { diff --git a/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java b/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java index 7f81f59..6022ceb 100644 --- a/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java +++ b/src/main/java/ab/common/item/relic/ItemTalismanHiddenRiches.java @@ -23,13 +23,13 @@ import org.lwjgl.opengl.GL11; -import vazkii.botania.client.core.handler.ClientTickHandler; -import vazkii.botania.common.core.helper.ItemNBTHelper; import ab.AdvancedBotany; import ab.client.core.ClientHelper; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import vazkii.botania.client.core.handler.ClientTickHandler; +import vazkii.botania.common.core.helper.ItemNBTHelper; public class ItemTalismanHiddenRiches extends ItemModRelic { diff --git a/src/main/java/ab/common/lib/register/BlockListAB.java b/src/main/java/ab/common/lib/register/BlockListAB.java index d3f0409..c5ce3e0 100644 --- a/src/main/java/ab/common/lib/register/BlockListAB.java +++ b/src/main/java/ab/common/lib/register/BlockListAB.java @@ -2,7 +2,6 @@ import net.minecraft.block.Block; -import vazkii.botania.common.Botania; import ab.common.block.BlockABSpreader; import ab.common.block.BlockABStorage; import ab.common.block.BlockAntigravitation; @@ -37,6 +36,7 @@ import ab.common.item.block.ItemBlockBase; import ab.common.item.block.ItemBlockBoard; import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.common.Botania; public class BlockListAB { diff --git a/src/main/java/ab/common/lib/register/FlowerRegister.java b/src/main/java/ab/common/lib/register/FlowerRegister.java index a9ce751..11c9b32 100644 --- a/src/main/java/ab/common/lib/register/FlowerRegister.java +++ b/src/main/java/ab/common/lib/register/FlowerRegister.java @@ -1,14 +1,14 @@ package ab.common.lib.register; -import vazkii.botania.api.BotaniaAPI; -import vazkii.botania.api.subtile.SubTileEntity; -import vazkii.botania.common.Botania; import ab.common.block.subtile.ABSubTileSignature; import ab.common.block.subtile.SubTileAncientAlphirine; import ab.common.block.subtile.SubTileArdentAzarcissus; import ab.common.block.subtile.SubTileAspecolus; import ab.common.block.subtile.SubTileDictarius; import ab.common.block.subtile.SubTilePureGladiolus; +import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.subtile.SubTileEntity; +import vazkii.botania.common.Botania; public class FlowerRegister { diff --git a/src/main/java/ab/common/lib/register/ItemListAB.java b/src/main/java/ab/common/lib/register/ItemListAB.java index d5b01e5..0fc0509 100644 --- a/src/main/java/ab/common/lib/register/ItemListAB.java +++ b/src/main/java/ab/common/lib/register/ItemListAB.java @@ -2,7 +2,6 @@ import net.minecraft.item.Item; -import vazkii.botania.common.Botania; import ab.common.core.handler.ConfigABHandler; import ab.common.item.*; import ab.common.item.equipment.*; @@ -17,6 +16,7 @@ import ab.common.item.relic.ItemSphereNavigation; import ab.common.item.relic.ItemTalismanHiddenRiches; import cpw.mods.fml.common.registry.GameRegistry; +import vazkii.botania.common.Botania; public class ItemListAB { diff --git a/src/main/java/ab/common/lib/register/RecipeListAB.java b/src/main/java/ab/common/lib/register/RecipeListAB.java index 51c3cc9..a6c0846 100644 --- a/src/main/java/ab/common/lib/register/RecipeListAB.java +++ b/src/main/java/ab/common/lib/register/RecipeListAB.java @@ -1,11 +1,10 @@ package ab.common.lib.register; -import static net.fuzzycraft.botanichorizons.util.Constants.*; +// import static net.fuzzycraft.botanichorizons.util.Constants.*; import java.util.ArrayList; import java.util.List; -import net.fuzzycraft.botanichorizons.util.OreDict; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -19,6 +18,20 @@ import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; +import ab.api.recipe.RecipeAncientAlphirine; +import ab.api.recipe.RecipeFountainAlchemy; +import ab.api.recipe.RecipeFountainConjuration; +import ab.api.recipe.RecipeFountainMana; +import ab.api.recipe.lexicon.AdvancedPlateCraftPage; +import ab.api.recipe.lexicon.AlphirineCraftPage; +import ab.common.block.tile.TileLebethronCore; +import ab.common.core.handler.ConfigABHandler; +import ab.common.item.ItemCraftingPattern; +import ab.utils.IModHelper; +import ab.utils.LocalizationManager; +import cpw.mods.fml.common.registry.GameRegistry; import thaumcraft.api.ThaumcraftApi; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -44,21 +57,6 @@ import vazkii.botania.common.lexicon.RLexiconEntry; import vazkii.botania.common.lexicon.page.PageImage; import vazkii.botania.common.lexicon.page.PageText; -import vazkii.botania.common.lib.LibOreDict; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; -import ab.api.recipe.RecipeAncientAlphirine; -import ab.api.recipe.RecipeFountainAlchemy; -import ab.api.recipe.RecipeFountainConjuration; -import ab.api.recipe.RecipeFountainMana; -import ab.api.recipe.lexicon.AdvancedPlateCraftPage; -import ab.api.recipe.lexicon.AlphirineCraftPage; -import ab.common.block.tile.TileLebethronCore; -import ab.common.core.handler.ConfigABHandler; -import ab.common.item.ItemCraftingPattern; -import ab.utils.IModHelper; -import ab.utils.LocalizationManager; -import cpw.mods.fml.common.registry.GameRegistry; public class RecipeListAB implements IModHelper { @@ -78,13 +76,13 @@ public class RecipeListAB implements IModHelper { public static RecipeAdvancedPlate terrasteelBlockRecipe; public static RecipeAdvancedPlate mithrillRecipe; public static RecipeAdvancedPlate nebulaRecipe; - public static RecipeAdvancedPlate FlawlessManaDiamondRecipe; - public static RecipeAdvancedPlate ExquisiteManaDiamondRecipe; - public static RecipeAdvancedPlate FlawlessDragonstoneRecipe; - public static RecipeAdvancedPlate ExquisiteDragonstoneRecipe; public static RecipeAdvancedPlate EnderAirRecipe; public static RecipeAdvancedPlate GrassRecipe; public static RecipeAdvancedPlate LebWoodRecipe; + public static RecipeAdvancedPlate GaiasRecipe; + public static RecipeAdvancedPlate ChaosRecipe; + public static RecipeAdvancedPlate FluixRecipe; + public static RecipeAdvancedPlate KobolRecipe; public static RecipeFountainMana manasteelRecipes; public static RecipeFountainMana manaPowderRecipes; @@ -103,7 +101,6 @@ public class RecipeListAB implements IModHelper { public static RecipeFountainMana manaweaveClothRecipe; public static RecipeFountainMana wandCoresRecipes; public static RecipeFountainMana wandCapRecipe; - // public static RecipeFountainMana Bee1Recipe; public static RecipeFountainAlchemy leatherRecipe; public static RecipeFountainAlchemy woodRecipes; @@ -133,7 +130,7 @@ public class RecipeListAB implements IModHelper { public static RecipeFountainAlchemy flowersRecipes; public static RecipeFountainAlchemy petiteRecipes; public static RecipeFountainAlchemy conversionRecipes; - // public static RecipeFountainAlchemy Bee2Recipe; + public static RecipeFountainAlchemy aeSeedsRecipes; public static RecipeFountainConjuration redstoneRecipe; public static RecipeFountainConjuration glowstoneRecipe; @@ -145,6 +142,7 @@ public class RecipeListAB implements IModHelper { public static RecipeFountainConjuration gravelRecipe; public static RecipeFountainConjuration leavesRecipes; public static RecipeFountainConjuration grassRecipe; + public static RecipeFountainConjuration kobolssRecipe; public static RecipePetals alphirineRecipe; public static RecipePetals PrimalRecipe; @@ -152,6 +150,7 @@ public class RecipeListAB implements IModHelper { public static RecipePetals aspecolusRecipe; public static RecipePetals pureGladRecipe; public static RecipePetals azartFlowerRecipe; + public static RecipePetals LotusFlowersRecipe; public static LexiconEntry advandedAgglomerationPlate; public static LexiconEntry FountainMana; @@ -273,8 +272,8 @@ public static void setupCrafting() { mithrillRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack(ItemListAB.itemABResource, 1, 0), new ItemStack(ModItems.manaResource, 1, 14), - OreDictionary.getOres("blockManasteel").get(0), - OreDictionary.getOres("blockTerrasteel").get(0), + new ItemStack(ModBlocks.storage), + new ItemStack(ModBlocks.storage, 1, 1), 2500000, 0x25d6b7); terrasteelRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( @@ -294,15 +293,15 @@ public static void setupCrafting() { nebulaRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(BlockListAB.blockLebethron, 1, 4), - OreDictionary.getOres("blockBotaniaDragonstone").get(0), + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(BlockListAB.blockABStorage, 1, 0), 25000000, 0x8d16e0); terrasteelBlockRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( - OreDictionary.getOres("blockTerrasteel").get(0), + new ItemStack(ModBlocks.storage, 1, 1), new ItemStack(ModItems.rune, 1, 8), - OreDictionary.getOres("blockManasteel").get(0), - OreDictionary.getOres("blockManaDiamond").get(0), + new ItemStack(ModBlocks.storage), + new ItemStack(ModBlocks.storage, 1, 3), 4500000, 0x29de21); EnderAirRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( @@ -326,74 +325,154 @@ public static void setupCrafting() { new ItemStack(ModBlocks.shimmerwoodPlanks), 30000, 0x29de20); + GaiasRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack(ModItems.manaResource, 16, 5), + new ItemStack((Item) Item.itemRegistry.getObject("AWWayofTime:transcendentBloodOrb")), + new ItemStack(ModBlocks.pylon, 1, 2), + new ItemStack((Item) Item.itemRegistry.getObject("DraconicEvolution:awakenedCore")), + 30000000, + 0x29de20); + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("DraconicEvolution:chaosFragment")), + new ItemStack((Item) Item.itemRegistry.getObject("ThaumicTinkerer:fireChaos")), + new ItemStack((Item) Item.itemRegistry.getObject("DraconicEvolution:awakenedCore")), + new ItemStack(ItemListAB.itemABResource, 1, 5), + 30000, + 0x29de20); + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("witchery:infinityegg")), + new ItemStack((Item) Item.itemRegistry.getObject("witchery:devilstonguecharm")), + new ItemStack((Item) Item.itemRegistry.getObject("DraconicEvolution:reactorStabilizer")), + new ItemStack(Blocks.dragon_egg), + 30000000, + 0x29de20); + /* + * ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack((Item) + * Item.itemRegistry.getObject("Avaritia:Infinity_Helm")), new ItemStack((Item) + * Item.itemRegistry.getObject("avaritiaddons:InfinityChest")), new ItemStack((Item) + * Item.itemRegistry.getObject("DraconicEvolution:draconicHelm")), new + * ItemStack(ItemListAB.itemNebulaHelmReveal), 20000000, 0x29de20); ChaosRecipe = + * AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack((Item) + * Item.itemRegistry.getObject("Avaritia:Infinity_Chest")), new ItemStack((Item) + * Item.itemRegistry.getObject("avaritiaddons:InfinityChest")), new ItemStack((Item) + * Item.itemRegistry.getObject("DraconicEvolution:draconicChest")), new ItemStack(ItemListAB.itemNebulaChest), + * 20000000, 0x29de20); ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack((Item) + * Item.itemRegistry.getObject("Avaritia:Infinity_Pants")), new ItemStack((Item) + * Item.itemRegistry.getObject("avaritiaddons:InfinityChest")), new ItemStack((Item) + * Item.itemRegistry.getObject("DraconicEvolution:draconicLeggs")), new ItemStack(ItemListAB.itemNebulaLegs), + * 20000000, 0x29de20); ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( new ItemStack((Item) + * Item.itemRegistry.getObject("Avaritia:Infinity_Shoes")), new ItemStack((Item) + * Item.itemRegistry.getObject("avaritiaddons:InfinityChest")), new ItemStack((Item) + * Item.itemRegistry.getObject("DraconicEvolution:draconicBoots")), new ItemStack(ItemListAB.itemNebulaBoots), + * 20000000, 0x29de20); + */ + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("ThermalFoundation:material"), 1, 516), + new ItemStack((Item) Item.itemRegistry.getObject("ThermalFoundation:material"), 1, 38), + new ItemStack(ModItems.manaResource, 1, 23), + new ItemStack((Item) Item.itemRegistry.getObject("BigReactors:BRIngot"), 1, 9), + 200, + 0x29de20); + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("PortalGun:PortalMulti"), 1, 1), + new ItemStack((Item) Item.itemRegistry.getObject("PortalGun:PortalMulti"), 1, 2), + new ItemStack((Item) Item.itemRegistry.getObject("ExtraUtilities:pureLove"), 1, 2), + new ItemStack((Item) Item.itemRegistry.getObject("PortalGun:PortalTurret"), 1, 2), + 2000, + 0x29de20); + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("ExtraUtilities:pureLove"), 1, 2), + new ItemStack((Item) Item.itemRegistry.getObject("ThermalFoundation:material"), 1, 516), + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:heartCanister"), 1, 2), + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:jerky"), 1, 7), + 2000, + 0x29de20); + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:heartCanister"), 1, 5), + new ItemStack((Item) Item.itemRegistry.getObject("witchery:ingredient"), 1, 79), + new ItemStack((Item) Item.itemRegistry.getObject("MagicBees:miscResources"), 1, 11), + new ItemStack((Item) Item.itemRegistry.getObject("ExtraUtilities:block_bedrockium")), + 200000, + 0x29de20); + ChaosRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:heartCanister"), 1, 6), + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:heartCanister"), 1, 5), + new ItemStack((Item) Item.itemRegistry.getObject("PortalGun:PortalMulti"), 1, 3), + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:heartCanister"), 1, 4), + 200000, + 0x29de20); + + FluixRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), 2, 7), + new ItemStack(Items.redstone), + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), 1, 1), + new ItemStack(Items.quartz), + 30, + 0x29de20); + KobolRecipe = AdvancedBotanyAPI.registerAdvancedPlateRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("witchery:ingredient"), 1, 150), + new ItemStack(ItemListAB.itemABResource), + new ItemStack((Item) Item.itemRegistry.getObject("ThermalFoundation:material"), 1, 516), + new ItemStack((Item) Item.itemRegistry.getObject("AWWayofTime:itemComplexSpellCrystal")), + 3000, + 0x29de20); //////////////////////////////////////////////////////////////////////////////////////// // Stone age -- diluted pool, max 10K manasteelRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANASTEEL), - OreDictionary.getOres("ingotThaumium").get(0), + new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemResource"), 1, 2), + new ItemStack(ModItems.manaResource, 1, 0), 1500, 0x25d6b7)); manasteelRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANASTEEL), - OreDictionary.getOres("ingotThaumium").get(1), + new ItemStack(ModItems.manaResource, 1, 0), + new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemResource"), 1, 2), 1500, 0x25d6b7)); - manasteelRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModBlocks.storage, 1, STORAGE_META_MANASTEELBLOCK), - new ItemStack((Item) Item.itemRegistry.getObject("gregtech:gt.blockmetal7"), 1, 4), + new ItemStack(ModItems.manaResource, 1, 0), + new ItemStack(Items.iron_ingot), + 15000, + 0x25d6b7)); + manasteelRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( + new ItemStack(ModBlocks.storage, 1, 0), + new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4), 11500, 0x25d6b7)); manasteelRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModBlocks.storage, 1, STORAGE_META_MANASTEELBLOCK), new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 4), + new ItemStack(ModBlocks.storage, 1, 0), 11500, 0x25d6b7)); manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), + new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.gunpowder), 1000, 0x25d6b7)); manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), + new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.redstone), 1000, 0x25d6b7)); manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), + new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.glowstone_dust), 750, 0x25d6b7)); manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), + new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(Items.sugar), 2000, 0x25d6b7)); - manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), - OreDictionary.getOres("dustThaumium").get(0), - 250, - 0x25d6b7)); - manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), - OreDictionary.getOres("dustVinteum").get(0), - 150, - 0x25d6b7)); - manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), - OreDictionary.getOres("dustDraconium").get(0), - 50, - 0x25d6b7)); manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( new ItemStack((Item) Item.itemRegistry.getObject("witchery:ingredient"), 1, 12), new ItemStack(Items.flint), 50, 0x25d6b7)); for (int i = 0; i < 16; i++) manaPowderRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_MANAPOWDER), + new ItemStack(ModItems.manaResource, 1, 23), new ItemStack(ModItems.dye, 1, i), 1500, 0x25d6b7)); @@ -401,55 +480,45 @@ public static void setupCrafting() { // only the exquisite diamond is good enough for a diluted pool manaDiamondRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_DIAMOND), - OreDictionary.getOres("craftingIndustrialDiamond").get(0), - 20000, - 0x25d6b7)); - manaDiamondRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_DIAMOND), + new ItemStack(ModItems.manaResource, 1, 2), new ItemStack(Items.diamond), 40000, 0x25d6b7)); manaDiamondRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModBlocks.storage, 1, STORAGE_META_DIAMONDBLOCK), + new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(Blocks.diamond_block), 360000, 0x25d6b7)); grassSeedsRecipe = AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.grassSeeds, 1, SEEDS_META_GRASS), + new ItemStack(ModItems.grassSeeds, 1, 0), new ItemStack(Blocks.tallgrass, 1, 1), 2500, 0x25d6b7); podzolSeedsRecipe = AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.grassSeeds, 1, SEEDS_META_PODZOL), + new ItemStack(ModItems.grassSeeds, 1, 1), new ItemStack(Blocks.deadbush), 2500, 0x25d6b7); mycelSeedsRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.grassSeeds, 1, SEEDS_META_MYCELIUM), + new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(ModBlocks.mushroom, 1, Short.MAX_VALUE), 6500, 0x25d6b7)); mycelSeedsRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.grassSeeds, 1, SEEDS_META_MYCELIUM), + new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.red_mushroom), 6500, 0x25d6b7)); mycelSeedsRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.grassSeeds, 1, SEEDS_META_MYCELIUM), + new ItemStack(ModItems.grassSeeds, 1, 2), new ItemStack(Blocks.brown_mushroom), 6500, 0x25d6b7)); - mycelSeedsRecipes = (AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.grassSeeds, 1, SEEDS_META_MYCELIUM), - new ItemStack((Item) Item.itemRegistry.getObject("harvestcraft:whitemushroomItem")), - 6500, - 0x25d6b7)); manaQuartzRecipe = AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.quartz, 1, QUARTZ_META_MANA), + new ItemStack(ModItems.quartz, 1, 1), new ItemStack(Items.quartz), 1000, 0x25d6b7); @@ -480,7 +549,7 @@ public static void setupCrafting() { // MV -- regular pool, max 1M manaPearlRecipe = AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_PEARL), + new ItemStack(ModItems.manaResource, 1, 1), new ItemStack(Items.ender_pearl), 15000, 0x25d6b7); @@ -504,7 +573,7 @@ public static void setupCrafting() { // Manaweave Cloth Recipe manaweaveClothRecipe = AdvancedBotanyAPI.registerFountainManaRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_CLOTH), + new ItemStack(ModItems.manaResource, 1, 22), new ItemStack((Item) Item.itemRegistry.getObject("harvestcraft:wovencottonItem")), 15000, 0x25d6b7); @@ -528,18 +597,6 @@ public static void setupCrafting() { 2000, 0x25d6b7); - // Bee1Recipe = AdvancedBotanyAPI.registerFountainManaRecipe( - // new ItemStack((Item) Item.itemRegistry.getObject("magicbees.speciesBotBotanic")), - // new ItemStack((Item) Item.itemRegistry.getObject("magicbees.speciesBotRooted")), - // 450000, - // 0x25d6b7); - // Alchemy crafting - // Bee2Recipe = AdvancedBotanyAPI.registerFountainAlchemyRecipe( - // new ItemStack((Item) Item.itemRegistry.getObject("magicbees.speciesBotVazbee")), - // new ItemStack((Item) Item.itemRegistry.getObject("magicbees.speciesBotFloral")), - // 450000, - // 0x25d6b7); - leatherRecipe = AdvancedBotanyAPI.registerFountainAlchemyRecipe( new ItemStack(Items.leather), new ItemStack(Items.rotten_flesh), @@ -778,7 +835,7 @@ public static void setupCrafting() { 0x25d6b7); prismarineRecipe = AdvancedBotanyAPI.registerFountainAlchemyRecipe( - new ItemStack(ModItems.manaResource, 1, MANARESOURCE_META_PRISMARINE), + new ItemStack(ModItems.manaResource, 1, 10), new ItemStack(Items.quartz), 200, 0x25d6b7); @@ -937,6 +994,21 @@ public static void setupCrafting() { ItemBlockSpecialFlower.ofType("hydroangeas"), 30, 0x25d6b7)); + aeSeedsRecipes = (AdvancedBotanyAPI.registerFountainAlchemyRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), 1, 10), + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemCrystalSeed")), + 300, + 0x25d6b7)); + aeSeedsRecipes = (AdvancedBotanyAPI.registerFountainAlchemyRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), 1, 11), + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemCrystalSeed"), 1, 600), + 300, + 0x25d6b7)); + aeSeedsRecipes = (AdvancedBotanyAPI.registerFountainAlchemyRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), 1, 12), + new ItemStack((Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemCrystalSeed"), 1, 1200), + 300, + 0x25d6b7)); //////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Conjuration catalyst @@ -998,7 +1070,11 @@ public static void setupCrafting() { new ItemStack(Blocks.tallgrass, 1, 1), 2000, 0x25d6b7); - + kobolssRecipe = AdvancedBotanyAPI.registerFountainConjurationRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("witchery:ingredient"), 18, 149), + new ItemStack((Item) Item.itemRegistry.getObject("witchery:kobolditepickaxe")), + 2000, + 0x25d6b7); ///////////////////////////////////////////////////////////////////////////////////////// Shaped Recipes PrimalRecipe = BotaniaAPI.registerPetalRecipe( ItemBlockSpecialFlower.ofType("daybloomPrime"), @@ -1061,25 +1137,54 @@ public static void setupCrafting() { terrasteelBlockRecipe.getOutput(), ".abCraft1"), new AdvancedPlateCraftPage(advandedAgglomerationPlate, mithrillRecipe.getOutput(), ".abCraft0"), - new AdvancedPlateCraftPage(advandedAgglomerationPlate, nebulaRecipe.getOutput(), ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - FlawlessManaDiamondRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - FlawlessDragonstoneRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - ExquisiteManaDiamondRecipe.getOutput(), - ".abCraft0"), - new AdvancedPlateCraftPage( - advandedAgglomerationPlate, - ExquisiteDragonstoneRecipe.getOutput(), - ".abCraft0") }) + new AdvancedPlateCraftPage(advandedAgglomerationPlate, nebulaRecipe.getOutput(), ".abCraft0") }) .setIcon(new ItemStack(BlockListAB.blockABPlate)); + // Ae2 additions recipes + + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("ae2additions:a_accelerators"), 1, 2), + "CCC", + "C8C", + "CCC", + '8', + new ItemStack( + (Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), + 1, + 34), + 'C', + new ItemStack((Item) Item.itemRegistry.getObject("ae2additions:a_accelerators"), 1, 1))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("ae2additions:a_accelerators"), 1, 1), + "CCC", + "C8C", + "CCC", + '8', + new ItemStack( + (Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), + 1, + 34), + 'C', + new ItemStack((Item) Item.itemRegistry.getObject("ae2additions:a_accelerators")))); + GameRegistry.addRecipe( + new ShapedOreRecipe( + new ItemStack((Item) Item.itemRegistry.getObject("ae2additions:a_accelerators")), + "CCC", + "C8C", + "CCC", + '8', + new ItemStack( + (Item) Item.itemRegistry.getObject("appliedenergistics2:item.ItemMultiMaterial"), + 1, + 34), + 'C', + new ItemStack( + (Item) Item.itemRegistry.getObject("appliedenergistics2:tile.BlockCraftingUnit"), + 1, + 1))); + // Natural mana spreader recipe GameRegistry.addRecipe( @@ -1121,7 +1226,7 @@ public static void setupCrafting() { "LEL", "SLS", 'S', - "ingotSteeleaf", + "blockLudicrite", 'L', new ItemStack(BlockListAB.blockLebethron, 1, 0), 'E', @@ -1275,7 +1380,7 @@ public static void setupCrafting() { 'D', new ItemStack(ModBlocks.dreamwood), 'M', - "blockManasteel" + new ItemStack(ModBlocks.storage) )); @@ -1372,7 +1477,7 @@ public static void setupCrafting() { "DHD", " E ", 'E', - new ItemStack(ModBlocks.pylon,1,2), + new ItemStack(ModBlocks.pylon, 1, 2), 'D', new ItemStack(ModItems.blackHoleTalisman), 'H', @@ -1398,7 +1503,7 @@ public static void setupCrafting() { 'D', new ItemStack(ModBlocks.floatingFlower, 1, 32767), 'E', - new ItemStack(ModBlocks.pylon,1,2), + new ItemStack(ModBlocks.pylon, 1, 2), 'R', new ItemStack(ModItems.rune, 1, 3) @@ -1422,7 +1527,7 @@ public static void setupCrafting() { 'N', new ItemStack(ItemListAB.itemABResource, 1, 6), 'M', - "blockManasteel", + new ItemStack(ModBlocks.storage), 'A', new ItemStack(ItemListAB.itemABResource, 1, 3) @@ -1468,7 +1573,7 @@ public static void setupCrafting() { 'R', new ItemStack(ModItems.rune, 1, 8), 'E', - "itemEnderCrystal" + new ItemStack((Item) Item.itemRegistry.getObject("EnderIO:blockTelePad")) )); @@ -1486,13 +1591,13 @@ public static void setupCrafting() { "QDQ", "MPM", 'G', - "gearGtSmallInfusedGold", + "blockVibrantAlloy", 'Q', new ItemStack(ModFluffBlocks.manaQuartz), 'D', new ItemStack(ModItems.manaResource, 1, 2), 'M', - new ItemStack(ModBlocks.pylon,1,1), + new ItemStack(ModBlocks.pylon, 1, 1), 'P', new ItemStack(ModItems.manaResource, 1, 23) @@ -1545,7 +1650,7 @@ public static void setupCrafting() { 'L', new ItemStack(BlockListAB.blockLebethron, 1, 3), 'P', - new ItemStack(ModBlocks.pylon,1,1))); + new ItemStack(ModBlocks.pylon, 1, 1))); GameRegistry.addRecipe( new ShapedOreRecipe( @@ -1554,13 +1659,13 @@ public static void setupCrafting() { "SRS", "BHB", 'E', - "pipeLargeElectrum", + "blockElectrumFlux", 'D', new ItemStack(Blocks.dispenser), 'O', new ItemStack(Blocks.dropper), 'S', - "springRoseGold", + "blockVibrantAlloy", 'R', new ItemStack(ModItems.rainbowRod), 'B', @@ -1612,6 +1717,30 @@ public static void setupCrafting() { sprawlRod.setKnowledgeType(forgotten).setLexiconPages( new LexiconPage[] { new PageText("0"), BotaniaAPI.internalHandler.craftingRecipePage(".craft", getLastRecipe()) }); + // Lotus recipes + LotusFlowersRecipe = BotaniaAPI.registerPetalRecipe( + new ItemStack(ModItems.blackLotus), + + new ItemStack(BlockListAB.blockLebethron, 1, 3), + new ItemStack(ModItems.rune, 1, 9), + new ItemStack(ModItems.rune), + new ItemStack(ModItems.rune, 1, 8), + new ItemStack(ModItems.manaBottle), + new ItemStack(ModItems.manaResource, 1, 15), + new ItemStack(ModItems.petal, 1, 5), + new ItemStack(ModItems.petal, 1, 15)); + + LotusFlowersRecipe = BotaniaAPI.registerPetalRecipe( + new ItemStack(ModItems.blackLotus, 1, 1), + + new ItemStack(ModItems.blackLotus), + new ItemStack(ModItems.rune, 1, 15), + new ItemStack(ModItems.rune, 1, 2), + new ItemStack(ModItems.rune, 1, 8), + new ItemStack(Items.experience_bottle), + new ItemStack(ItemListAB.itemABResource, 1, 3), + new ItemStack(ModItems.petal, 1, 13), + new ItemStack(ModItems.petal, 1, 15)); // Ardent azarcissus recipe azartFlowerRecipe = BotaniaAPI.registerPetalRecipe( @@ -1663,18 +1792,15 @@ public static void setupCrafting() { .add(Aspect.CROP, 16), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemHoeElemental")), new ItemStack[] { OreDictionary.getOres("blockPeridot").get(0), - new ItemStack(ModItems.manaResource, 1, 3), - new ItemStack(ModBlocks.pylon,1,1), + new ItemStack(ModItems.manaResource, 1, 3), new ItemStack(ModBlocks.pylon, 1, 1), new ItemStack(ModItems.rune, 1, 2), new ItemStack(ModItems.fertilizer), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCrystal"), 1, 3), - new ItemStack(ModBlocks.pylon,1,1), - new ItemStack(ModItems.manaResource, 1, 3), OreDictionary.getOres("blockEmerald").get(0), - new ItemStack(ModItems.manaResource, 1, 3), - new ItemStack(ModBlocks.pylon,1,1), + new ItemStack(ModBlocks.pylon, 1, 1), new ItemStack(ModItems.manaResource, 1, 3), + OreDictionary.getOres("blockEmerald").get(0), new ItemStack(ModItems.manaResource, 1, 3), + new ItemStack(ModBlocks.pylon, 1, 1), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCrystal"), 1, 3), new ItemStack(ModItems.fertilizer), new ItemStack(ModItems.rune, 1, 2), - new ItemStack(ModBlocks.pylon,1,1), - new ItemStack(ModItems.manaResource, 1, 3) }); + new ItemStack(ModBlocks.pylon, 1, 1), new ItemStack(ModItems.manaResource, 1, 3) }); AquaSword = ThaumcraftApi.addInfusionCraftingRecipe( "AquaSword", @@ -1720,15 +1846,14 @@ public static void setupCrafting() { .add(Aspect.MAGIC, 32).add(Aspect.ELDRITCH, 32).add(Aspect.BEAST, 16).add(Aspect.HUNGER, 16), new ItemStack(ItemListAB.itemAquaSword), new ItemStack[] { new ItemStack(ModItems.rainbowRod), new ItemStack(ItemListAB.itemABResource, 1, 0), - new ItemStack(ModBlocks.storage,1,3), - new ItemStack(ItemListAB.itemABResource, 1, 0), new ItemStack(ItemListAB.itemNebulaRod), - new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5), - new ItemStack(ModBlocks.livingwood, 1, 5), + new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(ItemListAB.itemABResource, 1, 0), + new ItemStack(ItemListAB.itemNebulaRod), new ItemStack(ModBlocks.dreamwood, 1, 5), + new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:HandMirror")), new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ItemListAB.itemNebulaRod), new ItemStack(ItemListAB.itemABResource, 1, 0), - OreDictionary.getOres("BlockCrystalFlux").get(0), + new ItemStack((Item) Item.itemRegistry.getObject("RedstoneArsenal:Storage"), 1, 1), new ItemStack(ItemListAB.itemABResource, 1, 0) }); Forge = ThaumcraftApi.addInfusionCraftingRecipe( @@ -1738,19 +1863,19 @@ public static void setupCrafting() { 8, new AspectList().add(Aspect.AIR, 80).add(Aspect.EARTH, 60).add(Aspect.ORDER, 40).add(Aspect.MAGIC, 32) .add(Aspect.CRAFT, 32).add(Aspect.CRYSTAL, 20).add(Aspect.METAL, 20), - new ItemStack((Item) Item.itemRegistry.getObject("thaumicbases:voidAnvil")), + new ItemStack((Item) Item.itemRegistry.getObject("TConstruct:ToolForgeBlock"), 1, 6), new ItemStack[] { new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2), - OreDictionary.getOres("blockTerrasteel").get(0), + new ItemStack(ModBlocks.storage, 1, 1), new ItemStack((Item) Item.itemRegistry.getObject("gendustry:GeneticsProcessor")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3), - OreDictionary.getOres("blockManasteel").get(0), - new ItemStack((Item) Item.itemRegistry.getObject("thaumicenergistics:material"),1,0), + new ItemStack(ModBlocks.storage), + new ItemStack((Item) Item.itemRegistry.getObject("factorization:servo/instruction_plate")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 2), - OreDictionary.getOres("blockTerrasteel").get(0), + new ItemStack(ModBlocks.storage, 1, 1), new ItemStack((Item) Item.itemRegistry.getObject("gendustry:EnvProcessor")), new ItemStack(ModBlocks.terraPlate), new ItemStack(ModItems.rune, 1, 3), - OreDictionary.getOres("blockManasteel").get(0), - new ItemStack((Item) Item.itemRegistry.getObject("thaumicenergistics:material"),1,1), }); + new ItemStack(ModBlocks.storage), + new ItemStack((Item) Item.itemRegistry.getObject("StevesCarts:CartModule"), 1, 9), }); Destroyer = ThaumcraftApi.addInfusionCraftingRecipe( "Destroyer", @@ -1761,14 +1886,15 @@ public static void setupCrafting() { .add(Aspect.CROP, 32).add(Aspect.HARVEST, 32).add(Aspect.TREE, 32), new ItemStack(ItemListAB.itemABResource, 1, 2), new ItemStack[] { new ItemStack(ModItems.terraAxe), new ItemStack(BlockListAB.blockABStorage, 1, 0), - new ItemStack(ModBlocks.storage,1,3), - new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack(ModItems.terraPick, 1, 0), // nbt(2147483646), - new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCosmeticOpaque"), 1, 1), + new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(BlockListAB.blockABStorage, 1, 0), + new ItemStack(ModItems.terraPick, 1, 0), // nbt(2147483646), + new ItemStack(ModBlocks.livingwood, 1, 5), + new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCosmeticOpaque"), 1, 1), new ItemStack(BlockListAB.blockLebethron, 1, 4), new ItemStack(ModItems.temperanceStone, 1, 0), new ItemStack(BlockListAB.blockLebethron, 1, 4), - new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCosmeticOpaque"), 1, 1), new ItemStack(ModBlocks.livingwood, 1, 5), - new ItemStack(ItemListAB.itemTerraHoe), new ItemStack(BlockListAB.blockABStorage, 1, 0), - new ItemStack(ModBlocks.storage,1,3), + new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:blockCosmeticOpaque"), 1, 1), + new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ItemListAB.itemTerraHoe), + new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(BlockListAB.blockABStorage, 1, 0) }); NebulaHelm = ThaumcraftApi.addInfusionCraftingRecipe( @@ -1780,16 +1906,15 @@ public static void setupCrafting() { .add(Aspect.METAL, 20).add(Aspect.SENSES, 20).add(Aspect.ELDRITCH, 20), new ItemStack(ModItems.gaiaHead), new ItemStack[] { new ItemStack(ModItems.elementiumHelm), new ItemStack(ModItems.laputaShard, 1, 15), - new ItemStack(ModBlocks.storage,1,4), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 3), + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(ItemListAB.itemABResource, 1, 3), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ModItems.terrasteelHelm), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ItemListAB.itemABResource, 1, 3), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), - new ItemStack(ModBlocks.storage,1,4), - new ItemStack(ModItems.laputaShard, 1, 15), }); + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModItems.laputaShard, 1, 15), }); NebulaChest = ThaumcraftApi.addInfusionCraftingRecipe( "Nebula", @@ -1800,16 +1925,15 @@ public static void setupCrafting() { .add(Aspect.METAL, 20).add(Aspect.SENSES, 20).add(Aspect.FLIGHT, 20), new ItemStack(ModItems.flightTiara), new ItemStack[] { new ItemStack(ModItems.elementiumChest), new ItemStack(ModItems.laputaShard, 1, 15), - OreDictionary.getOres("blockElvenElementium").get(0), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(BlockListAB.blockABStorage, 1, 0), + new ItemStack(ModBlocks.storage, 1, 2), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ModItems.terrasteelChest), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(BlockListAB.blockABStorage, 1, 0), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), - OreDictionary.getOres("blockElvenElementium").get(0), - new ItemStack(ModItems.laputaShard, 1, 15), + new ItemStack(ModBlocks.storage, 1, 2), new ItemStack(ModItems.laputaShard, 1, 15), }); @@ -1820,18 +1944,17 @@ public static void setupCrafting() { 12, new AspectList().add(Aspect.EARTH, 128).add(Aspect.MAGIC, 64).add(Aspect.CRYSTAL, 20) .add(Aspect.METAL, 20).add(Aspect.SENSES, 20).add(Aspect.BEAST, 20), - new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemGirdleRunic"), 1, 1), + new ItemStack((Item) Item.itemRegistry.getObject("ExtraUtilities:angelRing"), 1, 3), new ItemStack[] { new ItemStack(ModItems.elementiumLegs), new ItemStack(ModItems.laputaShard, 1, 15), - new ItemStack(ModBlocks.storage,1,4), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), - new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ModBlocks.manaBeacon, 1, 5), + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), + new ItemStack(ModBlocks.manaBeacon, 1, 5), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ModItems.terrasteelLegs), new ItemStack((Item) Item.itemRegistry.getObject("Thaumcraft:ItemAmuletRunic"), 1, 1), new ItemStack(ModBlocks.manaBeacon, 1, 5), new ItemStack(ItemListAB.itemABResource, 1, 5), new ItemStack(ItemListAB.itemNebulaRing), new ItemStack(ItemListAB.itemABResource, 1, 5), - new ItemStack(ModBlocks.storage,1,4), - new ItemStack(ModItems.laputaShard, 1, 15), + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModItems.laputaShard, 1, 15), }); @@ -1884,9 +2007,8 @@ public static void setupCrafting() { .add(Aspect.VOID, 80).add(Aspect.ORDER, 40).add(Aspect.EXCHANGE, 20), new ItemStack(BlockListAB.blockABFountain), new ItemStack[] { new ItemStack(ModBlocks.alchemyCatalyst), new ItemStack(ModBlocks.livingwood, 1, 5), - new ItemStack(ModBlocks.livingwood, 1, 5), - new ItemStack(ModBlocks.storage,1,3), new ItemStack(ModBlocks.brewery), - new ItemStack(ModBlocks.storage,1,3), + new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ModBlocks.storage, 1, 3), + new ItemStack(ModBlocks.brewery), new ItemStack(ModBlocks.storage, 1, 3), new ItemStack(ModBlocks.livingwood, 1, 5), new ItemStack(ModBlocks.livingwood, 1, 5), }); @@ -1901,10 +2023,9 @@ public static void setupCrafting() { new ItemStack(BlockListAB.blockABAlchemy), new ItemStack[] { new ItemStack(ModBlocks.conjurationCatalyst), new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ModBlocks.dreamwood, 1, 5), - new ItemStack(ModBlocks.storage,1,4), - new ItemStack(ModBlocks.pylon, 1, 1), - new ItemStack(ModBlocks.storage,1,4), - new ItemStack(ModBlocks.dreamwood, 1, 5), new ItemStack(ModBlocks.dreamwood, 1, 5), + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.pylon, 1, 1), + new ItemStack(ModBlocks.storage, 1, 4), new ItemStack(ModBlocks.dreamwood, 1, 5), + new ItemStack(ModBlocks.dreamwood, 1, 5), }); diff --git a/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java b/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java index 32ba90e..d9581f3 100644 --- a/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java +++ b/src/main/java/ab/common/minetweaker/AdvancedPlateMT.java @@ -1,16 +1,15 @@ package ab.common.minetweaker; +import net.minecraft.item.ItemStack; + +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAdvancedPlate; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAdvancedPlate; @ZenClass("mods.advBotany.AdvancedPlate") public class AdvancedPlateMT { diff --git a/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java b/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java index 4af8657..cc7100c 100644 --- a/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java +++ b/src/main/java/ab/common/minetweaker/AdvancedPlatePageMT.java @@ -2,19 +2,18 @@ import java.util.List; +import net.minecraft.item.ItemStack; + +import ab.api.recipe.lexicon.AdvancedPlateCraftPage; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import ab.api.recipe.lexicon.AdvancedPlateCraftPage; @ZenClass("mods.advBotany.AdvancedPlatePage") public class AdvancedPlatePageMT { diff --git a/src/main/java/ab/common/minetweaker/AlphirineMT.java b/src/main/java/ab/common/minetweaker/AlphirineMT.java index d8fc6cc..f19ec57 100644 --- a/src/main/java/ab/common/minetweaker/AlphirineMT.java +++ b/src/main/java/ab/common/minetweaker/AlphirineMT.java @@ -1,16 +1,15 @@ package ab.common.minetweaker; +import net.minecraft.item.ItemStack; + +import ab.api.AdvancedBotanyAPI; +import ab.api.recipe.RecipeAncientAlphirine; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import ab.api.AdvancedBotanyAPI; -import ab.api.recipe.RecipeAncientAlphirine; @ZenClass("mods.advBotany.AncientAlphirine") public class AlphirineMT { diff --git a/src/main/java/ab/common/minetweaker/AlphirinePageMT.java b/src/main/java/ab/common/minetweaker/AlphirinePageMT.java index a666468..0b9c33e 100644 --- a/src/main/java/ab/common/minetweaker/AlphirinePageMT.java +++ b/src/main/java/ab/common/minetweaker/AlphirinePageMT.java @@ -2,19 +2,18 @@ import java.util.List; +import net.minecraft.item.ItemStack; + +import ab.api.recipe.lexicon.AlphirineCraftPage; import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; - -import net.minecraft.item.ItemStack; - import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; import vazkii.botania.api.BotaniaAPI; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.lexicon.LexiconPage; -import ab.api.recipe.lexicon.AlphirineCraftPage; @ZenClass("mods.advBotany.AlphirinePage") public class AlphirinePageMT { diff --git a/src/main/resources/assets/ab/textures/model/FountainMana.png b/src/main/resources/assets/ab/textures/model/FountainMana.png index c998acd..5f9ca7f 100644 Binary files a/src/main/resources/assets/ab/textures/model/FountainMana.png and b/src/main/resources/assets/ab/textures/model/FountainMana.png differ diff --git a/src/main/resources/assets/ab/textures/model/FountainMana1.png b/src/main/resources/assets/ab/textures/model/FountainMana1.png deleted file mode 100644 index 5f9ca7f..0000000 Binary files a/src/main/resources/assets/ab/textures/model/FountainMana1.png and /dev/null differ