diff --git a/build.gradle b/build.gradle index 5dc6b8b..3fa171e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1677142954 +//version: 1683705740 /* 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.2' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.11' } + +print("You might want to check out './gradlew :faq' if your build fails.\n") + boolean settingsupdated = verifySettingsGradle() settingsupdated = verifyGitAttributes() || settingsupdated if (settingsupdated) throw new GradleException("Settings has been updated, please re-run task.") -if (project.file('.git/HEAD').isFile()) { +// In submodules, .git is a file pointing to the real git dir +if (project.file('.git/HEAD').isFile() || project.file('.git').isFile()) { apply plugin: 'com.palantir.git-version' } @@ -132,7 +132,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') @@ -153,13 +153,21 @@ java { } else { languageVersion.set(projectJavaVersion) } - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) } if (!noPublishedSources) { withSourcesJar() } } +tasks.withType(JavaCompile).configureEach { + options.encoding = "UTF-8" +} + +tasks.withType(ScalaCompile).configureEach { + options.encoding = "UTF-8" +} + pluginManager.withPlugin('org.jetbrains.kotlin.jvm') { // If Kotlin is enabled in the project kotlin { @@ -193,6 +201,14 @@ configurations { canBeConsumed = false canBeResolved = false } + + create("devOnlyNonPublishable") { + description = "Runtime and compiletime dependencies that are not published alongside the jar (compileOnly + runtimeOnlyNonPublishable)" + canBeConsumed = false + canBeResolved = false + } + compileOnly.extendsFrom(devOnlyNonPublishable) + runtimeOnlyNonPublishable.extendsFrom(devOnlyNonPublishable) } if (enableModernJavaSyntax.toBoolean()) { @@ -206,6 +222,8 @@ if (enableModernJavaSyntax.toBoolean()) { dependencies { annotationProcessor 'com.github.bsideup.jabel:jabel-javac-plugin:1.0.0' + // workaround for https://github.com/bsideup/jabel/issues/174 + annotationProcessor 'net.java.dev.jna:jna-platform:5.13.0' compileOnly('com.github.bsideup.jabel:jabel-javac-plugin:1.0.0') { transitive = false // We only care about the 1 annotation class } @@ -222,7 +240,7 @@ if (enableModernJavaSyntax.toBoolean()) { javaCompiler.set(javaToolchains.compilerFor { languageVersion.set(JavaLanguageVersion.of(17)) - vendor.set(JvmVendorSpec.ADOPTIUM) + vendor.set(JvmVendorSpec.AZUL) }) } } @@ -391,14 +409,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", @@ -513,14 +529,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,29 +567,50 @@ repositories { } } +def mixinProviderGroup = "io.github.legacymoddingmc" +def mixinProviderModule = "unimixins" +def mixinProviderVersion = "0.1.7.1" +def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" +def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec + dependencies { if (usesMixins.toBoolean()) { annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3') annotationProcessor('com.google.guava:guava:24.1.1-jre') annotationProcessor('com.google.code.gson:gson:2.8.6') - annotationProcessor('com.gtnewhorizon:gtnhmixins:2.1.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) } } } +// Replace old mixin mods with unimixins +// https://docs.gradle.org/8.0.2/userguide/resolution_rules.html#sec:substitution_with_classifier +configurations.all { + resolutionStrategy.dependencySubstitution { + substitute module('com.gtnewhorizon:gtnhmixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:Mixingasm') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongePoweredMixin') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('com.github.GTNewHorizons:SpongeMixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Unimixins replaces other mixin mods") + substitute module('io.github.legacymoddingmc:unimixins') using module(mixinProviderSpecNoClassifer) withClassifier("dev") because("Our previous unimixins upload was missing the dev classifier") + } +} + apply from: 'dependencies.gradle' def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json' @@ -695,13 +724,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.1.28' + def lwjgl3ifyVersion = '1.3.5' def asmVersion = '9.4' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.0.35') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.8') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -718,8 +747,8 @@ dependencies { ext.java17JvmArgs = [ // Java 9+ support "--illegal-access=warn", - "-Dfile.encoding=UTF-8", "-Djava.security.manager=allow", + "-Dfile.encoding=UTF-8", "--add-opens", "java.base/jdk.internal.loader=ALL-UNNAMED", "--add-opens", "java.base/java.net=ALL-UNNAMED", "--add-opens", "java.base/java.nio=ALL-UNNAMED", @@ -730,6 +759,7 @@ ext.java17JvmArgs = [ "--add-opens", "java.base/java.util=ALL-UNNAMED", "--add-opens", "java.base/jdk.internal.reflect=ALL-UNNAMED", "--add-opens", "java.base/sun.nio.ch=ALL-UNNAMED", + "--add-opens", "jdk.naming.dns/com.sun.jndi.dns=ALL-UNNAMED,java.naming", "--add-opens", "java.desktop/sun.awt.image=ALL-UNNAMED", "--add-modules", "jdk.dynalink", "--add-opens", "jdk.dynalink/jdk.dynalink.beans=ALL-UNNAMED", @@ -774,7 +804,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 @@ -783,7 +813,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 @@ -792,14 +822,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" @@ -810,7 +848,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" @@ -851,11 +889,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()) @@ -871,7 +904,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -1005,6 +1039,7 @@ idea { } compiler.javac { afterEvaluate { + javacAdditionalOptions = "-encoding utf8" moduleJavacAdditionalOptions = [ (project.name + ".main"): tasks.compileJava.options.compilerArgs.collect { '"' + it + '"' }.join(' ') ] @@ -1124,7 +1159,7 @@ if (modrinthProjectId.size() != 0 && System.getenv("MODRINTH_TOKEN") != null) { } } if (usesMixins.toBoolean()) { - addModrinthDep("required", "project", "gtnhmixins") + addModrinthDep("required", "project", "unimixins") } tasks.modrinth.dependsOn(build) tasks.publish.dependsOn(tasks.modrinth) @@ -1168,7 +1203,7 @@ if (curseForgeProjectId.size() != 0 && System.getenv("CURSEFORGE_TOKEN") != null } } if (usesMixins.toBoolean()) { - addCurseForgeRelation("requiredDependency", "gtnhmixins") + addCurseForgeRelation("requiredDependency", "unimixins") } tasks.curseforge.dependsOn(build) tasks.publish.dependsOn(tasks.curseforge) @@ -1203,7 +1238,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 @@ -1235,6 +1270,21 @@ 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, they might have been deleted and replaced by newer " + + "versions.\nCheck if the versions you try to fetch are still on the distributing sites.\n" + + "The links can be found in repositories.gradle and build.gradle:repositories, " + + "not build.gradle:buildscript.repositories - this one is for gradle plugin metadata.\n\n" + + "If your build fails to recognize the syntax of new Java versions, enable Jabel in your " + + "gradle.properties. See how it's done in GTNH ExampleMod/gradle.properties.") + } +} + static URL availableBuildScriptUrl() { new URL("https://raw.githubusercontent.com/GTNewHorizons/ExampleMod1.7.10/master/build.gradle") } @@ -1372,7 +1422,7 @@ static int replaceParams(File file, Map params) { return 0 } -// Dependency Deobfuscation +// Dependency Deobfuscation (Deprecated, use the new RFG API documented in dependencies.gradle) def deobf(String sourceURL) { try { @@ -1414,11 +1464,7 @@ def deobfMaven(String repoURL, String mavenDep) { } def deobfCurse(String curseDep) { - try { - return deobfMaven("https://www.cursemaven.com/", "curse.maven:$curseDep") - } catch (Exception ignored) { - out.style(Style.Failure).println("Failed to get $curseDep from cursemaven.") - } + return dependencies.rfg.deobf("curse.maven:$curseDep") } // The method above is to be preferred. Use this method if the filename is not at the end of the URL. @@ -1426,34 +1472,7 @@ def deobf(String sourceURL, String rawFileName) { String bon2Version = "2.5.1" String fileName = URLDecoder.decode(rawFileName, "UTF-8") String cacheDir = "$project.gradle.gradleUserHomeDir/caches" - String bon2Dir = "$cacheDir/forge_gradle/deobf" - String bon2File = "$bon2Dir/BON2-${bon2Version}.jar" String obfFile = "$cacheDir/modules-2/files-2.1/${fileName}.jar" - String deobfFile = "$cacheDir/modules-2/files-2.1/${fileName}-deobf.jar" - - if (file(deobfFile).exists()) { - return files(deobfFile) - } - - String mappingsVer - String remoteMappings = project.hasProperty('remoteMappings') ? project.remoteMappings : 'https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/' - if (remoteMappings) { - String id = "${forgeVersion.split("\\.")[3]}-$minecraftVersion" - String mappingsZIP = "$cacheDir/forge_gradle/maven_downloader/de/oceanlabs/mcp/mcp_snapshot_nodoc/$id/mcp_snapshot_nodoc-${id}.zip" - - zipMappings(mappingsZIP, remoteMappings, bon2Dir) - - mappingsVer = "snapshot_$id" - } else { - mappingsVer = "${channel}_$mappingsVersion" - } - - download.run { - src "http://jenkins.usrv.eu:8081/nexus/content/repositories/releases/com/github/parker8283/BON2/$bon2Version-CUSTOM/BON2-$bon2Version-CUSTOM-all.jar" - dest bon2File - quiet true - overwrite false - } download.run { src sourceURL @@ -1461,50 +1480,8 @@ def deobf(String sourceURL, String rawFileName) { quiet true overwrite false } - - exec { - commandLine 'java', '-jar', bon2File, '--inputJar', obfFile, '--outputJar', deobfFile, '--mcVer', minecraftVersion, '--mappingsVer', mappingsVer, '--notch' - workingDir bon2Dir - standardOutput = new FileOutputStream("${deobfFile}.log") - } - - return files(deobfFile) + return dependencies.rfg.deobf(files(obfFile)) } - -def zipMappings(String zipPath, String url, String bon2Dir) { - File zipFile = new File(zipPath) - if (zipFile.exists()) { - return - } - - String fieldsCache = "$bon2Dir/data/fields.csv" - String methodsCache = "$bon2Dir/data/methods.csv" - - download.run { - src "${url}fields.csv" - dest fieldsCache - quiet true - } - download.run { - src "${url}methods.csv" - dest methodsCache - quiet true - } - - zipFile.getParentFile().mkdirs() - ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFile)) - - zos.putNextEntry(new ZipEntry("fields.csv")) - Files.copy(Paths.get(fieldsCache), zos) - zos.closeEntry() - - zos.putNextEntry(new ZipEntry("methods.csv")) - Files.copy(Paths.get(methodsCache), zos) - zos.closeEntry() - - zos.close() -} - // Helper methods def checkPropertyExists(String propertyName) { diff --git a/dependencies.gradle b/dependencies.gradle index ed9539f..f22400b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,12 +1,10 @@ // Add your dependencies here dependencies { - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-76-GTNH:api') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.41.254:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.2.6-GTNH:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:waila:1.5.18:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Avaritia:1.30:dev') {transitive=false} - + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-211-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.29:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.3.52-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:waila:1.6.0:dev') {transitive=false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('curse.maven:refined-relocation-75811:2262970') compileOnly('curse.maven:minetweaker3-224029:2255759') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cb..ccebba7 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 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/repositories.gradle b/repositories.gradle index 83329ef..c227b16 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,14 +1,4 @@ // Add any additional repositories for your dependencies here repositories { - maven { - name = "GTNH" - url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" - } - maven { - url "https://cursemaven.com" - } - maven { - url = "https://jitpack.io" - } } diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java index 0582c9e..b7c5643 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/config/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.config; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java index a83b0fa..b58461c 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/DrawerPopulatedEvent.java @@ -1,6 +1,7 @@ package com.jaquadro.minecraft.storagedrawers.api.event; import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawer; + import cpw.mods.fml.common.eventhandler.Event; /** diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java index 04d56f3..3530d61 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/event/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.event; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java index 30c0890..06d89a3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/inventory/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.inventory; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java index 314183f..cd70439 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/pack/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.pack; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java index 7392f26..10d79f5 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/registry/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.registry; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java index f2a07c5..033e2b2 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/render/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.render; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java index 4d3f03e..5577d24 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/attribute/package-info.java @@ -5,4 +5,5 @@ package com.jaquadro.minecraft.storagedrawers.api.storage.attribute; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java index 2c4b6e5..a311d82 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/api/storage/package-info.java @@ -2,4 +2,5 @@ package com.jaquadro.minecraft.storagedrawers.api.storage; import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; + import cpw.mods.fml.common.API; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java index 2e84953..8a14406 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/BlockDrawers.java @@ -8,6 +8,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; import java.util.Random; +import java.util.function.Consumer; import net.minecraft.block.*; import net.minecraft.block.material.Material; @@ -598,7 +599,13 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH /* Only a minimum number of ItemStack are dropped */ for (int i = 0; i < tile.getDrawerCount(); i++) { if (!tile.isDrawerEnabled(i)) continue; - dropBigStackInWord(world, x, y, z, tile.getDrawer(i).getStoredItemCopy()); + + final ItemStack rawStoredItem = tile.getDrawer(i).getStoredItemPrototype(); + if (rawStoredItem != null && rawStoredItem.isStackable()) { + dropBigStackInWord(world, x, y, z, tile.getDrawer(i).getStoredItemCopy()); + } else { + forEachSplitStack(tile, i, stack -> dropStackInBatches(world, x, y, z, stack)); + } } break; case "destroy": @@ -608,12 +615,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH if (!tile.isDrawerEnabled(i)) continue; IDrawer drawer = tile.getDrawer(i); if (drawer.getStoredItemCount() > maxDropNum) drawer.setStoredItemCount(maxDropNum); - while (drawer.getStoredItemCount() > 0) { - ItemStack stack = tile.takeItemsFromSlot(i, drawer.getStoredItemStackSize()); - if (stack == null || stack.stackSize == 0) break; - dropStackInBatches(world, x, y, z, stack); - } + forEachSplitStack(tile, i, stack -> dropStackInBatches(world, x, y, z, stack)); } break; case "cluster": @@ -625,14 +628,8 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH Method method = itemMatterClusterClass.getMethod("makeClusters", List.class); /* May not be used */ for (int i = 0; i < tile.getDrawerCount(); i++) { - IDrawer drawer = tile.getDrawer(i); List stacks = new ArrayList<>(); - while (drawer.getStoredItemCount() > 0) { - ItemStack stack = tile.takeItemsFromSlot(i, drawer.getStoredItemStackSize()); - if (stack == null || stack.stackSize == 0) break; - - stacks.add(stack); - } + forEachSplitStack(tile, i, stacks::add); List clusters = (List) method .invoke(itemMatterClusterClass, stacks); @@ -656,15 +653,7 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH case "default": default: for (int i = 0; i < tile.getDrawerCount(); i++) { - if (!tile.isDrawerEnabled(i)) continue; - - IDrawer drawer = tile.getDrawer(i); - while (drawer.getStoredItemCount() > 0) { - ItemStack stack = tile.takeItemsFromSlot(i, drawer.getStoredItemStackSize()); - if (stack == null || stack.stackSize == 0) break; - - dropStackInBatches(world, x, y, z, stack); - } + forEachSplitStack(tile, i, stack -> dropStackInBatches(world, x, y, z, stack)); } } } @@ -675,6 +664,18 @@ public class BlockDrawers extends BlockContainer implements IExtendedBlockClickH super.breakBlock(world, x, y, z, block, meta); } + private void forEachSplitStack(TileEntityDrawers tile, int index, Consumer forEachStack) { + if (!tile.isDrawerEnabled(index)) return; + IDrawer drawer = tile.getDrawer(index); + + while (drawer.getStoredItemCount() > 0) { + ItemStack stack = tile.takeItemsFromSlot(index, drawer.getStoredItemStackSize()); + if (stack == null || stack.stackSize == 0) break; + + forEachStack.accept(stack); + } + } + private void dropStackInBatches(World world, int x, int y, int z, ItemStack stack) { Random rand = world.rand; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java index 4f4c7b5..8f7d8a3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/block/tile/BaseTileEntity.java @@ -8,6 +8,7 @@ import net.minecraft.tileentity.TileEntity; import org.apache.logging.log4j.Level; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + import cpw.mods.fml.common.FMLLog; public class BaseTileEntity extends TileEntity { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java index 850f3d1..49fe6e6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/ControllerRenderer.java @@ -12,6 +12,7 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockController; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityController; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class ControllerRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java index a8bf880..1214149 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/DrawersRenderer.java @@ -13,6 +13,7 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; import com.jaquadro.minecraft.storagedrawers.util.RenderHelperState; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class DrawersRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java index 30a20d2..f3db22b 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/FramingTableRenderer.java @@ -11,6 +11,7 @@ import com.jaquadro.minecraft.storagedrawers.block.BlockFramingTable; import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonFramingRenderer; import com.jaquadro.minecraft.storagedrawers.core.ClientProxy; import com.jaquadro.minecraft.storagedrawers.util.RenderHelper; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class FramingTableRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java index a5f5085..ef7b7f3 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/client/renderer/TrimCustomRenderer.java @@ -10,6 +10,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.block.BlockTrimCustom; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityTrim; import com.jaquadro.minecraft.storagedrawers.client.renderer.common.CommonTrimRenderer; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class TrimCustomRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java index 540b683..7fd937a 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ForgeEventHandler.java @@ -4,6 +4,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class ForgeEventHandler { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java index d082349..f555d44 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModGuiFactory.java @@ -6,6 +6,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; import com.jaquadro.minecraft.storagedrawers.config.ModConfigGui; + import cpw.mods.fml.client.IModGuiFactory; public class ModGuiFactory implements IModGuiFactory { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java index 9079d44..037cfbb 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModItems.java @@ -4,6 +4,7 @@ import net.minecraft.item.Item; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.item.*; + import cpw.mods.fml.common.registry.GameRegistry; public class ModItems { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java index 7230b87..4dd8a06 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/ModRecipes.java @@ -15,6 +15,7 @@ import com.jaquadro.minecraft.storagedrawers.core.recipe.FallbackShapedOreRecipe import com.jaquadro.minecraft.storagedrawers.core.recipe.TemplateRecipe; import com.jaquadro.minecraft.storagedrawers.integration.ChiselIntegrationModule; import com.jaquadro.minecraft.storagedrawers.integration.GTNHIntegrationModule; + import cpw.mods.fml.common.registry.GameRegistry; public class ModRecipes { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java index c9863b4..8cae199 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/core/handlers/GuiHandler.java @@ -10,6 +10,7 @@ import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityFramingTable; import com.jaquadro.minecraft.storagedrawers.client.gui.GuiDrawers; import com.jaquadro.minecraft.storagedrawers.client.gui.GuiFraming; import com.jaquadro.minecraft.storagedrawers.inventory.*; + import cpw.mods.fml.common.network.IGuiHandler; public class GuiHandler implements IGuiHandler { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java index 677a7ae..ef42db0 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/AppliedEnergistics.java @@ -2,6 +2,9 @@ package com.jaquadro.minecraft.storagedrawers.integration; import java.lang.reflect.Constructor; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import com.jaquadro.minecraft.storagedrawers.integration.ae2.*; + import appeng.api.AEApi; import appeng.api.networking.security.BaseActionSource; import appeng.api.recipes.IIngredient; @@ -9,9 +12,6 @@ import appeng.api.storage.IMEInventory; import appeng.api.storage.IMEMonitor; import appeng.api.storage.data.IAEItemStack; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; -import com.jaquadro.minecraft.storagedrawers.integration.ae2.*; - public class AppliedEnergistics extends IntegrationModule { private static class ReflectionFactory implements IStorageBusMonitorFactory { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java index 7efc1c9..7df7abf 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/GTNHIntegrationModule.java @@ -2,6 +2,7 @@ package com.jaquadro.minecraft.storagedrawers.integration; import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.integration.gtnh.ModRecipes; + import cpw.mods.fml.common.Loader; public class GTNHIntegrationModule extends IntegrationModule { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java index 7e70e9f..816a7a6 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/MineTweaker.java @@ -1,11 +1,11 @@ package com.jaquadro.minecraft.storagedrawers.integration; -import minetweaker.MineTweakerAPI; - import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.Compaction; import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryBlacklist; import com.jaquadro.minecraft.storagedrawers.integration.minetweaker.OreDictionaryWhitelist; +import minetweaker.MineTweakerAPI; + public class MineTweaker extends IntegrationModule { @Override diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java index 89e0d91..b260876 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Thaumcraft.java @@ -16,10 +16,6 @@ import net.minecraftforge.common.util.Constants; import org.lwjgl.opengl.GL11; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; - import com.jaquadro.minecraft.storagedrawers.api.StorageDrawersApi; import com.jaquadro.minecraft.storagedrawers.api.event.DrawerPopulatedEvent; import com.jaquadro.minecraft.storagedrawers.api.registry.IWailaTooltipHandler; @@ -29,6 +25,9 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; public class Thaumcraft extends IntegrationModule { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java index 4ee662c..e8ff139 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ThermalFoundation.java @@ -9,6 +9,7 @@ import com.jaquadro.minecraft.storagedrawers.StorageDrawers; import com.jaquadro.minecraft.storagedrawers.core.ModItems; import com.jaquadro.minecraft.storagedrawers.integration.thermalfoundation.CoFHSecurityProvider; import com.mojang.authlib.GameProfile; + import cpw.mods.fml.common.registry.GameRegistry; public class ThermalFoundation extends IntegrationModule { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java index ff6a7c0..e224207 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/Waila.java @@ -2,11 +2,6 @@ package com.jaquadro.minecraft.storagedrawers.integration; import java.util.List; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaRegistrar; - import net.minecraft.client.Minecraft; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; @@ -23,7 +18,12 @@ import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute import com.jaquadro.minecraft.storagedrawers.block.BlockDrawers; import com.jaquadro.minecraft.storagedrawers.block.tile.TileEntityDrawers; import com.jaquadro.minecraft.storagedrawers.security.SecurityManager; + import cpw.mods.fml.common.event.FMLInterModComms; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; /** * @author dmillerw diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java index edcea9a..9a7059f 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerExternalStorageHandler.java @@ -3,13 +3,13 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; +import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; + import appeng.api.networking.security.BaseActionSource; import appeng.api.storage.IExternalStorageHandler; import appeng.api.storage.IMEInventory; import appeng.api.storage.StorageChannel; -import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; - public class DrawerExternalStorageHandler implements IExternalStorageHandler { private IStorageBusMonitorFactory sbmFactory; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java index f72a68e..c56f324 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/DrawerMEInventory.java @@ -5,6 +5,11 @@ import java.util.List; import net.minecraft.item.ItemStack; +import com.jaquadro.minecraft.storagedrawers.api.storage.*; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; +import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; + import appeng.api.AEApi; import appeng.api.config.Actionable; import appeng.api.networking.security.BaseActionSource; @@ -13,11 +18,6 @@ import appeng.api.storage.StorageChannel; import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; -import com.jaquadro.minecraft.storagedrawers.api.storage.*; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.ILockable; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IVoidable; -import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.LockAttribute; - public class DrawerMEInventory implements IMEInventory { final IDrawerGroup group; diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java index 60bbba9..d71f003 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/ae2/IngredientHandler.java @@ -2,10 +2,10 @@ package com.jaquadro.minecraft.storagedrawers.integration.ae2; import net.minecraft.item.ItemStack; -import appeng.api.recipes.IIngredient; - import com.jaquadro.minecraft.storagedrawers.api.registry.IIngredientHandler; +import appeng.api.recipes.IIngredient; + public class IngredientHandler implements IIngredientHandler { @Override diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java index 0f68843..47b6e40 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/Compaction.java @@ -1,17 +1,16 @@ package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; +import net.minecraft.item.ItemStack; + +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + 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 com.jaquadro.minecraft.storagedrawers.StorageDrawers; - @ZenClass("mods.storagedrawers.Compaction") public class Compaction { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java index f0e464b..e6b6d53 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryBlacklist.java @@ -1,12 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; - @ZenClass("mods.storagedrawers.OreDictionaryBlacklist") public class OreDictionaryBlacklist { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java index 4e18fbd..4394cac 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/minetweaker/OreDictionaryWhitelist.java @@ -1,12 +1,12 @@ package com.jaquadro.minecraft.storagedrawers.integration.minetweaker; +import com.jaquadro.minecraft.storagedrawers.StorageDrawers; + import minetweaker.IUndoableAction; import minetweaker.MineTweakerAPI; import stanhebben.zenscript.annotations.ZenClass; import stanhebben.zenscript.annotations.ZenMethod; -import com.jaquadro.minecraft.storagedrawers.StorageDrawers; - @ZenClass("mods.storagedrawers.OreDictionaryWhitelist") public class OreDictionaryWhitelist { diff --git a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java index 550c383..f7ee8fe 100644 --- a/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java +++ b/src/main/java/com/jaquadro/minecraft/storagedrawers/integration/notenoughitems/NEIStorageDrawersConfig.java @@ -8,11 +8,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import codechicken.nei.api.API; -import codechicken.nei.api.IConfigureNEI; - import com.jaquadro.minecraft.storagedrawers.StorageDrawers; +import codechicken.nei.api.API; +import codechicken.nei.api.IConfigureNEI; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameData;