diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh deleted file mode 100644 index 84c1e5d6..00000000 --- a/.github/scripts/test-no-error-reports.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash - -RUNDIR="run" -CRASH="crash-reports" -SERVERLOG="server.log" - -if [[ -d $RUNDIR/$CRASH ]]; then - echo "Crash reports detected:" - cat $RUNDIR/$CRASH/crash*.txt - exit 1 -fi - -if grep --quiet "Fatal errors were detected" $SERVERLOG; then - echo "Fatal errors detected:" - cat server.log - exit 1 -fi - -if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" $SERVERLOG; then - echo "Server force stopped:" - cat server.log - exit 1 -fi - -if ! grep --quiet -Po '.+Done \(.+\)\! For help, type "help" or "\?"' $SERVERLOG; then - echo "Server didn't finish startup:" - cat server.log - exit 1 -fi - -echo "No crash reports detected" -exit 0 - diff --git a/build.gradle b/build.gradle index 055dcee4..1aaadcce 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1680120787 +//version: 1690104383 /* 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 { @@ -66,21 +62,25 @@ plugins { 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 '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.4' + id 'com.gtnewhorizons.retrofuturagradle' version '1.3.21' } + +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') @@ -201,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()) { @@ -214,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 } @@ -347,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( @@ -399,7 +431,7 @@ minecraft { username = developmentEnvironmentUserName.toString() - lwjgl3Version = "3.3.2-SNAPSHOT" + lwjgl3Version = "3.3.2" // Enable assertions in the current mod extraRunJvmArguments.add("-ea:${modGroup}") @@ -455,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) { @@ -469,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) @@ -527,13 +575,28 @@ repositories { } } if (includeWellKnownRepositories.toBoolean()) { - maven { - name "CurseMaven" - url "https://cursemaven.com" - content { + exclusiveContent { + forRepository { + maven { + name "CurseMaven" + url "https://cursemaven.com" + } + } + filter { includeGroup "curse.maven" } } + exclusiveContent { + forRepository { + maven { + name = "Modrinth" + url = "https://api.modrinth.com/maven" + } + } + filter { + includeGroup "maven.modrinth" + } + } maven { name = "ic2" url = "https://maven.ic2.player.to/" @@ -559,9 +622,10 @@ repositories { def mixinProviderGroup = "io.github.legacymoddingmc" def mixinProviderModule = "unimixins" -def mixinProviderVersion = "0.1.6" +def mixinProviderVersion = "0.1.7.1" def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}" def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev" +ext.mixinProviderSpec = mixinProviderSpec dependencies { if (usesMixins.toBoolean()) { @@ -574,7 +638,7 @@ dependencies { } } if (usesMixins.toBoolean()) { - implementation(mixinProviderSpec) + implementation(modUtils.enableMixins(mixinProviderSpec)) } else if (forceEnableMixins.toBoolean()) { runtimeOnlyNonPublishable(mixinProviderSpec) } @@ -600,12 +664,34 @@ configurations.all { } } -apply from: 'dependencies.gradle' +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' -def refMap = "${mixinTmpDir}" + File.separator + mixingConfigRefMap -def mixinSrg = "${mixinTmpDir}" + File.separator + "mixins.srg" tasks.register('generateAssets') { group = "GTNH Buildscript" @@ -637,46 +723,17 @@ tasks.register('generateAssets') { } if (usesMixins.toBoolean()) { - tasks.named("reobfJar", ReobfuscatedJar).configure { - extraSrgFiles.from(mixinSrg) - } - tasks.named("processResources").configure { dependsOn("generateAssets") } tasks.named("compileJava", JavaCompile).configure { - doFirst { - new File(mixinTmpDir).mkdirs() - } options.compilerArgs += [ - "-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}", - "-AoutSrgFile=${mixinSrg}", - "-AoutRefMapFile=${refMap}", // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code "-XDenableSunApiLintControl", "-XDignore.symbol.file" ] } - - pluginManager.withPlugin('org.jetbrains.kotlin.kapt') { - kapt { - correctErrorTypes = true - javacOptions { - option("-AreobfSrgFile=${tasks.reobfJar.srg.get().asFile}") - option("-AoutSrgFile=$mixinSrg") - option("-AoutRefMapFile=$refMap") - } - } - tasks.configureEach { task -> - if (task.name == "kaptKotlin") { - task.doFirst { - new File(mixinTmpDir).mkdirs() - } - } - } - } - } tasks.named("processResources", ProcessResources).configure { @@ -694,7 +751,6 @@ tasks.named("processResources", ProcessResources).configure { } if (usesMixins.toBoolean()) { - from refMap dependsOn("compileJava", "compileScala") } } @@ -713,13 +769,13 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.3.3' + 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.2.4') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19') } java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false} @@ -793,7 +849,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 @@ -802,7 +858,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 @@ -812,9 +868,21 @@ public abstract class RunHotswappableMinecraftTask extends RunMinecraftTask { } this.classpath(project.java17DependenciesCfg) } + + public void setup(Project project) { + super.setup(project) + if (project.usesMixins.toBoolean()) { + this.extraJvmArgs.addAll(project.provider(() -> { + def mixinCfg = project.configurations.detachedConfiguration(project.dependencies.create(project.mixinProviderSpec)) + mixinCfg.canBeConsumed = false + mixinCfg.transitive = false + enableHotswap ? ["-javaagent:" + mixinCfg.singleFile.absolutePath] : [] + })) + } + } } -def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Side.CLIENT, "runClient") +def runClient17Task = tasks.register("runClient17", RunHotswappableMinecraftTask, Distribution.CLIENT, "runClient") runClient17Task.configure { setup(project) group = "Modded Minecraft" @@ -825,7 +893,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" @@ -866,11 +934,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()) @@ -886,7 +949,8 @@ if (usesShadowedDependencies.toBoolean()) { ] archiveClassifier.set('dev') if (relocateShadowedDependencies.toBoolean()) { - dependsOn(relocateShadowJar) + relocationPrefix = modGroup + ".shadow" + enableRelocation = true } } configurations.runtimeElements.outgoing.artifacts.clear() @@ -960,6 +1024,9 @@ idea { } } runConfigurations { + "0. Build and Test"(Gradle) { + taskNames = ["build"] + } "1. Run Client"(Gradle) { taskNames = ["runClient"] } @@ -1079,6 +1146,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 @@ -1099,12 +1171,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" + } } } } @@ -1219,7 +1293,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.0.2" +def buildscriptGradleVersion = "8.2.1" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion @@ -1251,6 +1325,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") } @@ -1308,8 +1399,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 @@ -1388,7 +1485,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 { @@ -1430,11 +1527,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. @@ -1442,34 +1535,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 @@ -1477,50 +1543,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) { @@ -1547,3 +1571,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 4c7f9b24..8b1c1983 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,25 +1,26 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:EnderCore:0.2.13:dev') - implementation('com.github.GTNewHorizons:ForestryMC:4.6.5:dev') - implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.45-GTNH:dev') + api('com.github.GTNewHorizons:EnderCore:0.2.16:dev') + implementation('com.github.GTNewHorizons:ForestryMC:4.6.13:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.76-GTNH:dev') implementation("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") - api('com.github.GTNewHorizons:BuildCraft:7.1.33:dev') + api('com.github.GTNewHorizons:BuildCraft:7.1.36:dev') api('curse.maven:cofh-lib-220333:2388748') // https://www.curseforge.com/minecraft/mc-mods/cofh-lib/files/2388748 shadowImplementation('cglib:cglib-nodep:3.3.0') - compileOnly('com.github.GTNewHorizons:waila:1.5.24:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-195-GTNH:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.14:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:Railcraft:9.14.1:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:StorageDrawers:1.11.13-GTNH:api') {transitive = false} - implementation('com.github.GTNewHorizons:Chisel:2.10.17-GTNH:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:waila:1.6.0:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-240-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.140:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:Railcraft:9.14.6:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:StorageDrawers:1.12.0-GTNH:api') {transitive = false} + implementation('com.github.GTNewHorizons:Chisel:2.11.3-GTNH:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.12-GTNH:api') {transitive = false} compileOnly('curse.maven:minefactory-reloaded-66672:2366150') // https://www.curseforge.com/minecraft/mc-mods/minefactory-reloaded/files/2366150 compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') compileOnly('curse.maven:ee3-65509:2305023') // https://www.curseforge.com/minecraft/mc-mods/ee3/files/2305023 - compileOnly(deobf('https://media.forgecdn.net/files/2269/339/ComputerCraft1.75.jar')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339 - compileOnly(deobf('https://media.forgecdn.net/files/2426/270/Mekanism-1.7.10-9.1.0.281.jar')) // https://aidancbrady.com/mekanism/download/ - compileOnly(deobf('https://immibis.com/mcmoddl/files/immibis-microblocks-59.1.2.jar')) + compileOnly(rfg.deobf('curse.maven:computercraft-67504:2269339')) // https://www.curseforge.com/minecraft/mc-mods/computercraft/files/2269339 + compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797 + compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2 } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 943f0cbf..c1962a79 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 fc10b601..17a8ddce 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.2.1-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 65dcd68d..aeb74cbb 100755 --- a/gradlew +++ b/gradlew @@ -85,9 +85,6 @@ done APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -144,7 +141,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +149,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,6 +194,10 @@ if "$cygwin" || "$msys" ; then done fi + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index f3837146..23bee5f5 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -207,6 +207,7 @@ public class EnderIO { public static final Lang lang = new Lang("enderio"); public static final boolean hasLwjgl3 = Loader.isModLoaded("lwjgl3ify"); + public static final boolean hasGT5 = Loader.isModLoaded("gregtech") && !Loader.isModLoaded("gregapi_post"); // Materials public static ItemCapacitor itemBasicCapacitor; diff --git a/src/main/java/crazypants/enderio/Log.java b/src/main/java/crazypants/enderio/Log.java index 5df7260c..23a12557 100644 --- a/src/main/java/crazypants/enderio/Log.java +++ b/src/main/java/crazypants/enderio/Log.java @@ -2,10 +2,13 @@ package crazypants.enderio; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.Marker; +import org.apache.logging.log4j.MarkerManager; public final class Log { public static final Logger LOGGER = LogManager.getLogger(EnderIO.MODID); + public static final Marker securityMarker = MarkerManager.getMarker("SuspiciousPackets"); public static void warn(String msg) { LOGGER.warn(msg); diff --git a/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java b/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java index 44f2be63..398ad1e6 100644 --- a/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java +++ b/src/main/java/crazypants/enderio/api/teleport/IItemOfTravel.java @@ -4,10 +4,20 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import cofh.api.energy.IEnergyContainerItem; +import crazypants.enderio.config.Config; public interface IItemOfTravel extends IEnergyContainerItem { boolean isActive(EntityPlayer ep, ItemStack equipped); void extractInternal(ItemStack equipped, int power); + + /** + * @param equipped player who is currently holding this item. caller will ensure the item held has your Item as item + * type + * @return -1 if method not supported, or max(can extract, power), e.g. 0 if item is empty. + */ + default int canExtractInternal(ItemStack equipped, int power) { + return Config.strictTPItemChecking ? 0 : -1; + } } diff --git a/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java index f9add46d..de49cbf1 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITravelAccessable.java @@ -8,6 +8,7 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import com.enderio.core.common.util.BlockCoord; + import crazypants.util.UserIdent; public interface ITravelAccessable { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java index 816fb675..b49fd663 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractConduit.java @@ -9,11 +9,6 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import mods.immibis.microblocks.api.EnumPartClass; -import mods.immibis.microblocks.api.EnumPosition; -import mods.immibis.microblocks.api.IMicroblockCoverSystem; -import mods.immibis.microblocks.api.Part; - import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -52,6 +47,10 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.power.PowerConduitNetwork; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.RedstoneConduitNetwork; +import mods.immibis.microblocks.api.EnumPartClass; +import mods.immibis.microblocks.api.EnumPosition; +import mods.immibis.microblocks.api.IMicroblockCoverSystem; +import mods.immibis.microblocks.api.Part; public abstract class AbstractConduit implements IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java index 1e2fafec..5d036fb6 100644 --- a/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/AbstractItemConduit.java @@ -2,11 +2,6 @@ package crazypants.enderio.conduit; import java.util.List; -import mods.immibis.microblocks.api.IMicroblockCoverSystem; -import mods.immibis.microblocks.api.IMicroblockSupporterTile; -import mods.immibis.microblocks.api.MicroblockAPIUtils; -import mods.immibis.microblocks.api.Part; - import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -29,6 +24,10 @@ import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; import crazypants.enderio.EnderIOTab; import crazypants.enderio.ModObject; +import mods.immibis.microblocks.api.IMicroblockCoverSystem; +import mods.immibis.microblocks.api.IMicroblockSupporterTile; +import mods.immibis.microblocks.api.MicroblockAPIUtils; +import mods.immibis.microblocks.api.Part; public abstract class AbstractItemConduit extends Item implements IConduitItem { diff --git a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java index db697dc0..a1fc362f 100644 --- a/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/BlockConduitBundle.java @@ -6,9 +6,6 @@ import java.util.Iterator; import java.util.List; import java.util.Random; -import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker; -import mods.immibis.core.api.multipart.IMultipartSystem; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.audio.ISound; @@ -31,9 +28,6 @@ import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.PlaySoundAtEntityEvent; import net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; -import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode; -import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; @@ -73,6 +67,10 @@ import crazypants.enderio.machine.painter.PainterUtil; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.tool.ToolUtil; import crazypants.util.IFacade; +import mods.immibis.core.api.multipart.IMultipartRenderingBlockMarker; +import mods.immibis.core.api.multipart.IMultipartSystem; +import powercrystals.minefactoryreloaded.api.rednet.IRedNetOmniNode; +import powercrystals.minefactoryreloaded.api.rednet.connectivity.RedNetConnectionType; @Optional.InterfaceList({ @Interface( diff --git a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java index 4511c33c..08bfa877 100644 --- a/src/main/java/crazypants/enderio/conduit/IConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/IConduitBundle.java @@ -4,11 +4,6 @@ import java.util.Collection; import java.util.List; import java.util.Set; -import li.cil.oc.api.network.Environment; -import li.cil.oc.api.network.SidedEnvironment; -import mekanism.api.gas.IGasHandler; -import mods.immibis.microblocks.api.IMicroblockSupporterTile; - import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; @@ -16,11 +11,10 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import appeng.api.networking.IGridHost; -import cofh.api.transport.IItemDuct; - import com.enderio.core.common.util.BlockCoord; +import appeng.api.networking.IGridHost; +import cofh.api.transport.IItemDuct; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import cpw.mods.fml.relauncher.Side; @@ -29,6 +23,10 @@ import crazypants.enderio.conduit.facade.ItemConduitFacade.FacadeType; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.power.IInternalPowerHandler; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.SidedEnvironment; +import mekanism.api.gas.IGasHandler; +import mods.immibis.microblocks.api.IMicroblockSupporterTile; @InterfaceList({ @Interface(iface = "appeng.api.networking.IGridHost", modid = "appliedenergistics2"), @Interface(iface = "mekanism.api.gas.IGasHandler", modid = "MekanismAPI|gas"), diff --git a/src/main/java/crazypants/enderio/conduit/IExtractor.java b/src/main/java/crazypants/enderio/conduit/IExtractor.java index a87ab214..2b3e0ed4 100644 --- a/src/main/java/crazypants/enderio/conduit/IExtractor.java +++ b/src/main/java/crazypants/enderio/conduit/IExtractor.java @@ -3,6 +3,7 @@ package crazypants.enderio.conduit; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.machine.RedstoneControlMode; public interface IExtractor extends IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java b/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java index a0c83abd..3e0be0e3 100644 --- a/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java +++ b/src/main/java/crazypants/enderio/conduit/MicroblocksUtil.java @@ -1,11 +1,10 @@ package crazypants.enderio.conduit; -import mods.immibis.microblocks.api.EnumPosition; - import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional.Method; +import mods.immibis.microblocks.api.EnumPosition; public class MicroblocksUtil { diff --git a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java index b933a654..d9cf6365 100644 --- a/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java +++ b/src/main/java/crazypants/enderio/conduit/TileConduitBundle.java @@ -7,19 +7,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import li.cil.oc.api.network.*; -import li.cil.oc.api.network.Message; -import li.cil.oc.api.network.Node; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; -import mods.immibis.microblocks.api.EnumPartClass; -import mods.immibis.microblocks.api.EnumPosition; -import mods.immibis.microblocks.api.IMicroblockCoverSystem; -import mods.immibis.microblocks.api.IMicroblockSystem; -import mods.immibis.microblocks.api.MicroblockAPIUtils; -import mods.immibis.microblocks.api.Part; -import mods.immibis.microblocks.api.PartType; - import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; @@ -37,11 +24,10 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTankInfo; -import appeng.api.networking.IGridNode; -import appeng.api.util.AECableType; - import com.enderio.core.client.render.BoundingBox; +import appeng.api.networking.IGridNode; +import appeng.api.util.AECableType; import cpw.mods.fml.common.Optional.Method; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -64,6 +50,18 @@ import crazypants.enderio.conduit.power.IPowerConduit; import crazypants.enderio.conduit.redstone.IRedstoneConduit; import crazypants.enderio.conduit.redstone.InsulatedRedstoneConduit; import crazypants.enderio.config.Config; +import li.cil.oc.api.network.*; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; +import mods.immibis.microblocks.api.EnumPartClass; +import mods.immibis.microblocks.api.EnumPosition; +import mods.immibis.microblocks.api.IMicroblockCoverSystem; +import mods.immibis.microblocks.api.IMicroblockSystem; +import mods.immibis.microblocks.api.MicroblockAPIUtils; +import mods.immibis.microblocks.api.Part; +import mods.immibis.microblocks.api.PartType; public class TileConduitBundle extends TileEntityEio implements IConduitBundle { diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java index 3b9cd4ce..6ef2f017 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasConduit.java @@ -5,8 +5,6 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import mekanism.api.gas.IGasHandler; - import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; @@ -23,6 +21,7 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; +import mekanism.api.gas.IGasHandler; public abstract class AbstractGasConduit extends AbstractConduit implements IGasConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java index bbe09921..e44ec356 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduit.java @@ -2,9 +2,6 @@ package crazypants.enderio.conduit.gas; import java.util.List; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; - import net.minecraft.entity.player.EntityPlayer; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.common.util.ForgeDirection; @@ -17,6 +14,8 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.RaytraceResult; import crazypants.enderio.tool.ToolUtil; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasHandler; public abstract class AbstractGasTankConduit extends AbstractGasConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java index 78a60a6a..ebd677bf 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/AbstractGasTankConduitNetwork.java @@ -1,7 +1,7 @@ package crazypants.enderio.conduit.gas; -import mekanism.api.gas.GasStack; import crazypants.enderio.conduit.AbstractConduitNetwork; +import mekanism.api.gas.GasStack; public class AbstractGasTankConduitNetwork extends AbstractConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java b/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java index cf34240f..eecd7a72 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java +++ b/src/main/java/crazypants/enderio/conduit/gas/ConduitGasTank.java @@ -1,11 +1,10 @@ package crazypants.enderio.conduit.gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.GasTank; - import net.minecraft.nbt.NBTTagCompound; import cpw.mods.fml.common.Optional.Method; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.GasTank; public class ConduitGasTank extends GasTank { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java index c950dd66..01622685 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduit.java @@ -3,9 +3,6 @@ package crazypants.enderio.conduit.gas; import java.util.HashMap; import java.util.Map; -import mekanism.api.gas.Gas; -import mekanism.api.gas.GasStack; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; @@ -24,6 +21,8 @@ import crazypants.enderio.conduit.ConnectionMode; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.config.Config; +import mekanism.api.gas.Gas; +import mekanism.api.gas.GasStack; public class GasConduit extends AbstractGasTankConduit { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java index 6035f41c..89505569 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitNetwork.java @@ -4,15 +4,15 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.IConduit; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasHandler; public class GasConduitNetwork extends AbstractGasTankConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java index ff032ccd..ba62a40f 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasConduitRenderer.java @@ -4,8 +4,6 @@ import static com.enderio.core.client.render.CubeRenderer.addVecWithUV; import java.util.List; -import mekanism.api.gas.GasStack; - import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.Tessellator; import net.minecraft.util.IIcon; @@ -25,6 +23,7 @@ import crazypants.enderio.conduit.geom.ConnectionModeGeometry; import crazypants.enderio.conduit.geom.Offset; import crazypants.enderio.conduit.render.ConduitBundleRenderer; import crazypants.enderio.conduit.render.DefaultConduitRenderer; +import mekanism.api.gas.GasStack; public class GasConduitRenderer extends DefaultConduitRenderer { diff --git a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java index 84c1864e..63e1dd40 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java +++ b/src/main/java/crazypants/enderio/conduit/gas/GasUtil.java @@ -1,8 +1,5 @@ package crazypants.enderio.conduit.gas; -import mekanism.api.gas.GasStack; -import mekanism.api.gas.IGasHandler; - import net.minecraft.tileentity.TileEntity; import net.minecraft.world.IBlockAccess; @@ -12,6 +9,8 @@ import cpw.mods.fml.common.ModAPIManager; import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.config.Config; +import mekanism.api.gas.GasStack; +import mekanism.api.gas.IGasHandler; public final class GasUtil { diff --git a/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java b/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java index fe2a98b8..a2f4b3f8 100644 --- a/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java +++ b/src/main/java/crazypants/enderio/conduit/gas/IGasConduit.java @@ -1,12 +1,11 @@ package crazypants.enderio.conduit.gas; -import mekanism.api.gas.IGasHandler; - import net.minecraftforge.common.util.ForgeDirection; import cpw.mods.fml.common.Optional.Interface; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; +import mekanism.api.gas.IGasHandler; @Interface(iface = "mekanism.api.gas.IGasHandler", modid = GasUtil.API_NAME) public interface IGasConduit extends IConduit, IGasHandler, IExtractor { diff --git a/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java b/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java index 5864b1f1..28391779 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java +++ b/src/main/java/crazypants/enderio/conduit/geom/CollidableComponent.java @@ -3,6 +3,7 @@ package crazypants.enderio.conduit.geom; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.client.render.BoundingBox; + import crazypants.enderio.conduit.IConduit; public class CollidableComponent { diff --git a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java index 492dff35..d0ef88fa 100644 --- a/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java +++ b/src/main/java/crazypants/enderio/conduit/geom/ConduitGeometryUtil.java @@ -10,6 +10,7 @@ import com.enderio.core.client.render.BoundingBox; import com.enderio.core.common.util.ForgeDirectionOffsets; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.conduit.IConduit; public class ConduitGeometryUtil { diff --git a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java index 42638755..1148f9d7 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java +++ b/src/main/java/crazypants/enderio/conduit/gui/ExternalConnectionContainer.java @@ -10,6 +10,7 @@ import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -24,12 +25,14 @@ import crazypants.enderio.conduit.gui.item.InventoryUpgrades; import crazypants.enderio.conduit.item.IItemConduit; import crazypants.enderio.conduit.item.SpeedUpgrade; import crazypants.enderio.conduit.item.filter.IItemFilter; +import crazypants.enderio.machine.gui.IContainerWithTileEntity; import crazypants.enderio.network.PacketHandler; -public class ExternalConnectionContainer extends ContainerEnder { +public class ExternalConnectionContainer extends ContainerEnder implements IContainerWithTileEntity { private final IItemConduit itemConduit; private final ForgeDirection direction; + private final TileEntity te; private int speedUpgradeSlotLimit = 15; @@ -52,6 +55,7 @@ public class ExternalConnectionContainer extends ContainerEnder @Override public IMessage onMessage(PacketFluidChannel message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; ILiquidConduit conduit = message.getTileCasted(ctx); if (!(conduit instanceof AbstractEnderLiquidConduit)) { return null; diff --git a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java index 6618cbc7..4a5a5243 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java +++ b/src/main/java/crazypants/enderio/conduit/gui/PacketFluidFilter.java @@ -53,6 +53,7 @@ public class PacketFluidFilter extends AbstractConduitPacket @Override public IMessage onMessage(PacketFluidFilter message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; ILiquidConduit conduit = message.getTileCasted(ctx); if (!(conduit instanceof AbstractEnderLiquidConduit)) { return null; diff --git a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java index 6a5c9d9b..f20507f4 100644 --- a/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java +++ b/src/main/java/crazypants/enderio/conduit/gui/item/PacketExistingItemFilterSnapshot.java @@ -58,6 +58,7 @@ public class PacketExistingItemFilterSnapshot extends AbstractConduitPacket @Override public IMessage onMessage(PacketModItemFilter message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; IItemConduit conduit = message.getTileCasted(ctx); if (conduit == null) { return null; diff --git a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java index 3026aaea..bd00f631 100644 --- a/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/IItemConduit.java @@ -5,10 +5,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.transport.IItemDuct; - import com.enderio.core.common.util.DyeColor; +import cofh.api.transport.IItemDuct; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IExtractor; import crazypants.enderio.conduit.item.filter.IItemFilter; diff --git a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java index 1f2e45c6..8a216c30 100644 --- a/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java +++ b/src/main/java/crazypants/enderio/conduit/item/ItemConduit.java @@ -18,12 +18,11 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.inventory.IInventoryConnection; - import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; +import cofh.api.inventory.IInventoryConnection; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.AbstractConduitNetwork; diff --git a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java index 90c8c803..b878d0ee 100644 --- a/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java +++ b/src/main/java/crazypants/enderio/conduit/item/filter/PowerItemFilter.java @@ -5,11 +5,10 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.network.NetworkUtil; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.conduit.gui.GuiExternalConnection; diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java index a365c305..6f7b9c6d 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AbstractLiquidConduit.java @@ -16,6 +16,7 @@ import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; import com.enderio.core.common.util.FluidUtil; +import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.ConnectionMode; @@ -23,6 +24,8 @@ import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; import crazypants.enderio.machine.RedstoneControlMode; import crazypants.enderio.machine.reservoir.TileReservoir; +import gregtech.api.interfaces.metatileentity.IMetaTileEntity; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; public abstract class AbstractLiquidConduit extends AbstractConduit implements ILiquidConduit { @@ -54,6 +57,12 @@ public abstract class AbstractLiquidConduit extends AbstractConduit implements I if (h == null) { return false; } + + if (EnderIO.hasGT5 && h instanceof IGregTechTileEntity) { + IMetaTileEntity mte = ((IGregTechTileEntity) h).getMetaTileEntity(); + return mte != null && mte.getCapacity() > 0; + } + // TODO: This check was added to work around a bug in dynamic tanks, but // it causes issues with not conecting to empty tanks such as dim. trans + // BC fluid pipes, so I am removing it for now. diff --git a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java index 56cab1e6..97b718f2 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/AdvancedLiquidConduitNetwork.java @@ -12,6 +12,7 @@ import net.minecraftforge.fluids.IFluidHandler; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.FluidUtil; + import crazypants.enderio.conduit.IConduit; public class AdvancedLiquidConduitNetwork extends AbstractTankConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java index 07f15fce..20c1c2f0 100644 --- a/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/liquid/LiquidConduitNetwork.java @@ -10,6 +10,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.IFluidHandler; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.conduit.ConduitUtil; public class LiquidConduitNetwork extends AbstractTankConduitNetwork { diff --git a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java index c556afdf..4c54f155 100644 --- a/src/main/java/crazypants/enderio/conduit/me/MEConduit.java +++ b/src/main/java/crazypants/enderio/conduit/me/MEConduit.java @@ -12,6 +12,9 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import com.enderio.core.client.render.IconUtil; +import com.enderio.core.common.util.BlockCoord; + import appeng.api.AEApi; import appeng.api.networking.GridFlags; import appeng.api.networking.IGridConnection; @@ -19,10 +22,6 @@ import appeng.api.networking.IGridHost; import appeng.api.networking.IGridNode; import appeng.api.parts.IPart; import appeng.api.parts.IPartHost; - -import com.enderio.core.client.render.IconUtil; -import com.enderio.core.common.util.BlockCoord; - import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.EnderIO; import crazypants.enderio.conduit.AbstractConduit; diff --git a/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java index 414bc257..ba8912fa 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/IOCConduit.java @@ -1,8 +1,5 @@ package crazypants.enderio.conduit.oc; -import li.cil.oc.api.network.Environment; -import li.cil.oc.api.network.SidedEnvironment; - import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.DyeColor; @@ -10,6 +7,8 @@ import com.enderio.core.common.util.DyeColor; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; import crazypants.enderio.conduit.IConduit; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.SidedEnvironment; @InterfaceList({ @Interface(iface = "li.cil.oc.api.network.Environment", modid = "OpenComputersAPI|Network"), @Interface(iface = "li.cil.oc.api.network.SidedEnvironment", modid = "OpenComputersAPI|Network") }) diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java index 12d3ae90..2387b76f 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduit.java @@ -9,11 +9,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import li.cil.oc.api.network.Environment; -import li.cil.oc.api.network.Message; -import li.cil.oc.api.network.Node; -import li.cil.oc.api.network.SidedEnvironment; - import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -45,6 +40,10 @@ import crazypants.enderio.conduit.geom.CollidableComponent; import crazypants.enderio.conduit.geom.ConduitGeometryUtil; import crazypants.enderio.config.Config; import crazypants.enderio.tool.ToolUtil; +import li.cil.oc.api.network.Environment; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.SidedEnvironment; public class OCConduit extends AbstractConduit implements IOCConduit { diff --git a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java index 54e67093..94bc81e3 100644 --- a/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java +++ b/src/main/java/crazypants/enderio/conduit/oc/OCConduitNetwork.java @@ -1,11 +1,5 @@ package crazypants.enderio.conduit.oc; -import li.cil.oc.api.Network; -import li.cil.oc.api.network.ManagedEnvironment; -import li.cil.oc.api.network.Message; -import li.cil.oc.api.network.Node; -import li.cil.oc.api.network.Visibility; - import net.minecraft.nbt.NBTTagCompound; import com.enderio.core.common.util.DyeColor; @@ -13,6 +7,11 @@ import com.enderio.core.common.util.DyeColor; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.Method; import crazypants.enderio.conduit.AbstractConduitNetwork; +import li.cil.oc.api.Network; +import li.cil.oc.api.network.ManagedEnvironment; +import li.cil.oc.api.network.Message; +import li.cil.oc.api.network.Node; +import li.cil.oc.api.network.Visibility; @Interface(iface = "li.cil.oc.api.network.ManagedEnvironment", modid = "OpenComputersAPI|Network") public class OCConduitNetwork extends AbstractConduitNetwork implements ManagedEnvironment { diff --git a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java index 2975dc4b..c44ad598 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java +++ b/src/main/java/crazypants/enderio/conduit/packet/AbstractConduitPacket.java @@ -6,6 +6,7 @@ import net.minecraft.world.World; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.IConduitBundle; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class AbstractConduitPacket extends AbstractConduitBundlePacket { @@ -50,4 +51,12 @@ public class AbstractConduitPacket extends AbstractConduitBu IConduitBundle bundle = (IConduitBundle) te; return (T) bundle.getConduit(getConType()); } + + /** + * Validates if TileEntity received from client is actually the one player is interacting with. It prevents + * malicious user disturbing random machine settings etc. + */ + protected static boolean isInvalidPacketForGui(AbstractConduitPacket message, MessageContext ctx) { + return PacketUtil.isInvalidPacketForGui(ctx, message.getTileEntity(message.getWorld(ctx)), message.getClass()); + } } diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java index 95166c71..1a2e4123 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketConnectionMode.java @@ -40,6 +40,7 @@ public class PacketConnectionMode extends AbstractConduitPacket @Override public IMessage onMessage(PacketConnectionMode message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; IConduit conduit = message.getTileCasted(ctx); if (conduit == null) { return null; diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java index 5d4d9e43..03c2e82b 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketExtractMode.java @@ -45,6 +45,7 @@ public class PacketExtractMode extends AbstractConduitPacket @Override public IMessage onMessage(PacketExtractMode message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; message.getTileCasted(ctx).setExtractionRedstoneMode(message.mode, message.dir); message.getTileCasted(ctx).setExtractionSignalColor(message.dir, message.color); message.getWorld(ctx).markBlockForUpdate(message.x, message.y, message.z); diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java index e2de6321..5cca3f2b 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketItemConduitFilter.java @@ -68,6 +68,7 @@ public class PacketItemConduitFilter extends AbstractConduitPacket @Override public IMessage onMessage(PacketItemConduitFilter message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; IItemConduit conduit = message.getTileCasted(ctx); conduit.setSelfFeedEnabled(message.dir, message.loopMode); conduit.setRoundRobinEnabled(message.dir, message.roundRobin); diff --git a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java index 80e7acb7..69cf54ed 100644 --- a/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java +++ b/src/main/java/crazypants/enderio/conduit/packet/PacketOCConduitSignalColor.java @@ -40,6 +40,7 @@ public class PacketOCConduitSignalColor extends AbstractConduitPacket @Override public IMessage onMessage(PacketRoundRobinMode message, MessageContext ctx) { + if (isInvalidPacketForGui(message, ctx)) return null; final ILiquidConduit conduit = message.getTileCasted(ctx); if (conduit instanceof AbstractEnderLiquidConduit) { ((AbstractEnderLiquidConduit) conduit).setRoundRobin(message.dir, message.roundRobin); diff --git a/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java index 377c9d5b..047a4ef7 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/IInsulatedRedstoneConduit.java @@ -3,6 +3,7 @@ package crazypants.enderio.conduit.redstone; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.ConnectionMode; public interface IInsulatedRedstoneConduit extends IRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java index 5fce185e..5e800ae5 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/IRedstoneConduit.java @@ -6,6 +6,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.DyeColor; + import crazypants.enderio.conduit.IConduit; public interface IRedstoneConduit extends IConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java index e3f54e7d..47623592 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/InsulatedRedstoneConduit.java @@ -21,13 +21,12 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.tileentity.IRedstoneControl; - import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; +import cofh.api.tileentity.IRedstoneControl; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java index 4a4be9f3..35ec8793 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneConduit.java @@ -17,8 +17,6 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode; - import com.enderio.core.client.render.IconUtil; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.DyeColor; @@ -36,6 +34,7 @@ import crazypants.enderio.conduit.ConduitUtil; import crazypants.enderio.conduit.IConduit; import crazypants.enderio.conduit.geom.CollidableComponent; import dan200.computercraft.api.ComputerCraftAPI; +import powercrystals.minefactoryreloaded.api.rednet.IRedNetOutputNode; public class RedstoneConduit extends AbstractConduit implements IRedstoneConduit { diff --git a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java index edaa7031..9ff61398 100644 --- a/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java +++ b/src/main/java/crazypants/enderio/conduit/redstone/RedstoneSwitchBounds.java @@ -4,6 +4,7 @@ import com.enderio.core.api.client.render.VertexTransform; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.VertexRotation; import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.config.Config; public class RedstoneSwitchBounds { diff --git a/src/main/java/crazypants/enderio/config/Config.java b/src/main/java/crazypants/enderio/config/Config.java index 1f424410..0a3a7c73 100644 --- a/src/main/java/crazypants/enderio/config/Config.java +++ b/src/main/java/crazypants/enderio/config/Config.java @@ -323,6 +323,8 @@ public final class Config { public static boolean addFuelTooltipsToAllFluidContainers = true; public static boolean addFurnaceFuelTootip = true; public static boolean addDurabilityTootip = true; + public static boolean renderDurabilityBar = true; + public static boolean renderChargeBar = true; public static int farmContinuousEnergyUseRF = 40; public static int farmActionEnergyUseRF = 500; @@ -563,6 +565,8 @@ public final class Config { public static float inventoryPanelExtractCostPerItem = 12.0f; public static float inventoryPanelExtractCostPerOperation = 32.0f; + public static boolean strictTPItemChecking = true; + public static void load(FMLPreInitializationEvent event) { PacketHandler.INSTANCE .registerMessage(PacketConfigSync.class, PacketConfigSync.class, PacketHandler.nextID(), Side.CLIENT); @@ -1925,6 +1929,16 @@ public final class Config { "addFurnaceFuelTootip", addFuelTooltipsToAllFluidContainers, "If true, adds burn duration tooltips to furnace fuels").getBoolean(addFurnaceFuelTootip); + renderChargeBar = config.get( + sectionPersonal.name, + "renderChargeBar", + renderChargeBar, + "If true, render the bar when an item has RF").getBoolean(renderChargeBar); + renderDurabilityBar = config.get( + sectionPersonal.name, + "renderDurabilityBar", + renderDurabilityBar, + "If true, render the bar when an item is damaged").getBoolean(renderDurabilityBar); farmContinuousEnergyUseRF = config.get( sectionFarm.name, @@ -2881,6 +2895,12 @@ public final class Config { 0.0f, 10000.0f, "Internal power used per extract operation (independent of stack size)"); + strictTPItemChecking = config.get( + sectionMisc.name, + "strictTPItemChecking", + strictTPItemChecking, + "If true, turn on strict checking of item energy checking. This might cause traveling tools from third party mods to fire fake security warnings on server side and not function correctly.") + .getBoolean(strictTPItemChecking); } public static void checkYetaAccess() { diff --git a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java index 8f7ac5e2..660a3b0a 100644 --- a/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java +++ b/src/main/java/crazypants/enderio/entity/EntityWitherSkeleton.java @@ -17,6 +17,7 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import com.enderio.core.common.util.EntityUtil; + import cpw.mods.fml.common.registry.GameRegistry; public class EntityWitherSkeleton extends EntitySkeleton { diff --git a/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java b/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java index 0674dea5..b70657a4 100644 --- a/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java +++ b/src/main/java/crazypants/enderio/gui/GuiContainerBaseEIO.java @@ -8,6 +8,7 @@ import net.minecraft.util.ResourceLocation; import com.enderio.core.client.gui.GuiContainerBase; import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.EnderIO; public abstract class GuiContainerBaseEIO extends GuiContainerBase { diff --git a/src/main/java/crazypants/enderio/item/ItemMagnet.java b/src/main/java/crazypants/enderio/item/ItemMagnet.java index 0336dffd..2b0c7a7e 100644 --- a/src/main/java/crazypants/enderio/item/ItemMagnet.java +++ b/src/main/java/crazypants/enderio/item/ItemMagnet.java @@ -12,13 +12,12 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import baubles.api.BaubleType; -import baubles.api.IBauble; -import cofh.api.energy.ItemEnergyContainer; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; import com.enderio.core.common.util.ItemUtil; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import cofh.api.energy.ItemEnergyContainer; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.Optional.Method; @@ -237,4 +236,9 @@ public class ItemMagnet extends ItemEnergyContainer implements IResourceTooltipP public boolean canUnequip(ItemStack itemstack, EntityLivingBase player) { return true; } + + @Override + public boolean showDurabilityBar(ItemStack stack) { + return Config.renderDurabilityBar && super.showDurabilityBar(stack); + } } diff --git a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java index bceeb084..994a40ca 100644 --- a/src/main/java/crazypants/enderio/item/ItemYetaWrench.java +++ b/src/main/java/crazypants/enderio/item/ItemYetaWrench.java @@ -20,11 +20,10 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action; import org.lwjgl.input.Keyboard; -import cofh.api.block.IDismantleable; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.client.handlers.SpecialTooltipHandler; +import cofh.api.block.IDismantleable; import cpw.mods.fml.common.eventhandler.Event.Result; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java index ffaaeb08..8cc613de 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java +++ b/src/main/java/crazypants/enderio/item/darksteel/DarkSteelController.java @@ -27,14 +27,13 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import org.lwjgl.opengl.GL11; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.VecmathUtil; import com.enderio.core.common.vecmath.Vector3d; import com.enderio.core.common.vecmath.Vector4d; import com.mojang.authlib.GameProfile; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java index 6425c064..6c81f8cc 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelArmor.java @@ -16,15 +16,10 @@ import net.minecraftforge.common.ISpecialArmor; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.EnumHelper; -import thaumcraft.api.IGoggles; -import thaumcraft.api.IVisDiscountGear; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.nodes.IRevealer; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Optional.Interface; import cpw.mods.fml.common.Optional.InterfaceList; @@ -42,6 +37,10 @@ import crazypants.enderio.item.darksteel.upgrade.NaturalistEyeUpgrade; import crazypants.enderio.thaumcraft.GogglesOfRevealingUpgrade; import forestry.api.apiculture.IArmorApiarist; import forestry.api.core.IArmorNaturalist; +import thaumcraft.api.IGoggles; +import thaumcraft.api.IVisDiscountGear; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.nodes.IRevealer; @InterfaceList({ @Interface(iface = "thaumcraft.api.IGoggles", modid = "Thaumcraft"), @Interface(iface = "thaumcraft.api.IVisDiscountGear", modid = "Thaumcraft"), diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java index 2503cc3f..ad581767 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelAxe.java @@ -24,12 +24,11 @@ import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.event.entity.player.PlayerEvent; import net.minecraftforge.oredict.OreDictionary; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java index bf7cfd17..c01a1d86 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelPickaxe.java @@ -18,12 +18,11 @@ import net.minecraft.world.World; import net.minecraftforge.common.ForgeHooks; import net.minecraftforge.common.MinecraftForge; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.google.common.collect.Sets; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -332,6 +331,11 @@ public class ItemDarkSteelPickaxe extends ItemPickaxe extractEnergy(equipped, power, false); } + @Override + public int canExtractInternal(ItemStack equipped, int power) { + return Math.min(getEnergyStored(equipped), power); + } + private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java index 5fb11f3d..59bbc19f 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelShears.java @@ -20,12 +20,11 @@ import net.minecraftforge.common.IShearable; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerEvent; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.ItemUtil; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java index 7d9bcc86..f27d2553 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java +++ b/src/main/java/crazypants/enderio/item/darksteel/ItemDarkSteelSword.java @@ -24,12 +24,11 @@ import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.living.EnderTeleportEvent; import net.minecraftforge.event.entity.living.LivingDropsEvent; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.api.client.gui.IAdvancedTooltipProvider; import com.enderio.core.common.util.ItemUtil; import com.enderio.core.common.util.Util; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.eventhandler.EventPriority; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; @@ -395,6 +394,11 @@ public class ItemDarkSteelSword extends ItemSword extractEnergy(equipped, power, false); } + @Override + public int canExtractInternal(ItemStack equipped, int power) { + return Math.min(getEnergyStored(equipped), power); + } + private boolean isTravelUpgradeActive(EntityPlayer ep, ItemStack equipped) { return isEquipped(ep) && ep.isSneaking() && TravelUpgrade.loadFromItem(equipped) != null; } diff --git a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java index bd76b828..0b4b5ad6 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java +++ b/src/main/java/crazypants/enderio/item/darksteel/PoweredItemRenderer.java @@ -10,11 +10,12 @@ import net.minecraftforge.client.IItemRenderer; import org.lwjgl.opengl.GL11; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; import com.enderio.core.common.vecmath.Vector4f; + +import cofh.api.energy.IEnergyContainerItem; +import crazypants.enderio.config.Config; import crazypants.enderio.item.darksteel.upgrade.EnergyUpgrade; public class PoweredItemRenderer implements IItemRenderer { @@ -44,26 +45,29 @@ public class PoweredItemRenderer implements IItemRenderer { ri.renderItemIntoGUI(mc.fontRenderer, mc.getTextureManager(), item, 0, 0, true); GL11.glDisable(GL11.GL_LIGHTING); - if (isJustCrafted(item)) { + if (isJustCrafted(item) || (!Config.renderChargeBar && !Config.renderDurabilityBar)) { return; } boolean hasEnergyUpgrade = EnergyUpgrade.loadFromItem(item) != null; - int y = hasEnergyUpgrade ? 12 : 13; - int bgH = hasEnergyUpgrade ? 4 : 2; + int y = (Config.renderDurabilityBar ^ Config.renderChargeBar) || !hasEnergyUpgrade ? 13 : 12; + int bgH = (Config.renderDurabilityBar ^ Config.renderChargeBar) || !hasEnergyUpgrade ? 2 : 4; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); RenderUtil.renderQuad2D(2, y, 0, 13, bgH, ColorUtil.getRGB(Color.black)); - double maxDam = item.getMaxDamage(); - double dispDamage = item.getItemDamageForDisplay(); - y = hasEnergyUpgrade ? 14 : 13; - renderBar(y, maxDam, dispDamage, Color.green, Color.red); + double maxDam, dispDamage; + if (Config.renderDurabilityBar) { + maxDam = item.getMaxDamage(); + dispDamage = item.getItemDamageForDisplay(); + y = Config.renderChargeBar && hasEnergyUpgrade ? 14 : 13; + renderBar(y, maxDam, dispDamage, Color.green, Color.red); + } - if (hasEnergyUpgrade) { + if (Config.renderChargeBar && hasEnergyUpgrade) { IEnergyContainerItem armor = (IEnergyContainerItem) item.getItem(); maxDam = armor.getMaxEnergyStored(item); dispDamage = armor.getEnergyStored(item); - y = 12; + y = Config.renderDurabilityBar ? 12 : 13; Color color = new Color(0x2D, 0xCE, 0xFA); // electric blue renderBar2(y, maxDam, maxDam - dispDamage, color, color); } diff --git a/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java b/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java index 401c29e5..5ba37360 100644 --- a/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java +++ b/src/main/java/crazypants/enderio/item/darksteel/SoundEntity.java @@ -6,6 +6,7 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import com.enderio.core.common.vecmath.Vector3d; + import crazypants.enderio.config.Config; public class SoundEntity extends Entity { diff --git a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java index 93900e10..27cd4666 100644 --- a/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java +++ b/src/main/java/crazypants/enderio/item/skull/BlockEndermanSkull.java @@ -9,13 +9,13 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import thaumcraft.api.crafting.IInfusionStabiliser; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.BlockEio; import crazypants.enderio.ModObject; +import thaumcraft.api.crafting.IInfusionStabiliser; @Optional.Interface(iface = "thaumcraft.api.crafting.IInfusionStabiliser", modid = "Thaumcraft") public class BlockEndermanSkull extends BlockEio implements IInfusionStabiliser { diff --git a/src/main/java/crazypants/enderio/machine/ContainerNoInv.java b/src/main/java/crazypants/enderio/machine/ContainerNoInv.java index 24f3409f..0b4903bd 100644 --- a/src/main/java/crazypants/enderio/machine/ContainerNoInv.java +++ b/src/main/java/crazypants/enderio/machine/ContainerNoInv.java @@ -2,19 +2,25 @@ package crazypants.enderio.machine; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; -import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; -public class ContainerNoInv extends Container { +import crazypants.enderio.machine.gui.IContainerWithTileEntity; - private IInventory inv; +public class ContainerNoInv extends Container implements IContainerWithTileEntity { - public ContainerNoInv(IInventory inv) { - super(); - this.inv = inv; + private final AbstractMachineEntity tile; + + public ContainerNoInv(AbstractMachineEntity tile) { + this.tile = tile; } @Override public boolean canInteractWith(EntityPlayer player) { - return inv.isUseableByPlayer(player); + return tile.isUseableByPlayer(player); + } + + @Override + public TileEntity getTileEntity() { + return tile; } } diff --git a/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java b/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java index 18544f19..7633948d 100644 --- a/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java +++ b/src/main/java/crazypants/enderio/machine/FakePlayerEIO.java @@ -8,6 +8,7 @@ import net.minecraftforge.common.util.FakePlayer; import com.enderio.core.common.util.BlockCoord; import com.mojang.authlib.GameProfile; + import crazypants.enderio.machine.farm.FakeNetHandlerPlayServer; public class FakePlayerEIO extends FakePlayer { diff --git a/src/main/java/crazypants/enderio/machine/PacketIoMode.java b/src/main/java/crazypants/enderio/machine/PacketIoMode.java index a3a336cf..f6875dd5 100644 --- a/src/main/java/crazypants/enderio/machine/PacketIoMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketIoMode.java @@ -9,6 +9,7 @@ import com.enderio.core.common.util.BlockCoord; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketIoMode implements IMessage, IMessageHandler { @@ -61,6 +62,7 @@ public class PacketIoMode implements IMessage, IMessageHandler { @@ -47,6 +48,7 @@ public class PacketItemBuffer implements IMessage, IMessageHandler implements IMessageHandler { - - private float progress; - - public PacketProgress() {} - - public PacketProgress(IProgressTile tile) { - super(tile.getTileEntity()); - progress = tile.getProgress(); - } - - @Override - public void toBytes(ByteBuf buf) { - super.toBytes(buf); - buf.writeFloat(progress); - } - - @Override - public void fromBytes(ByteBuf buf) { - super.fromBytes(buf); - progress = buf.readFloat(); - } - - @Override - public IMessage onMessage(PacketProgress message, MessageContext ctx) { - TileEntity tile = message.getTileEntity(EnderIO.proxy.getClientWorld()); - if (tile instanceof IProgressTile) { - ((IProgressTile) tile).setProgress(message.progress); - } - return null; - } -} diff --git a/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java b/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java index f8cc79cc..916507cd 100644 --- a/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java +++ b/src/main/java/crazypants/enderio/machine/PacketRedstoneMode.java @@ -6,6 +6,7 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketRedstoneMode implements IMessage, IMessageHandler { @@ -52,6 +53,7 @@ public class PacketRedstoneMode implements IMessage, IMessageHandler extends TechneModelRenderer { diff --git a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java index fe52edcd..d078b256 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java +++ b/src/main/java/crazypants/enderio/machine/alloy/ContainerAlloySmelter.java @@ -9,6 +9,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.stats.AchievementList; import com.enderio.core.common.util.Util; + import crazypants.enderio.machine.gui.AbstractMachineContainer; public class ContainerAlloySmelter extends AbstractMachineContainer { diff --git a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java index d2d1e478..ed5018e3 100644 --- a/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/alloy/PacketClientState.java @@ -5,6 +5,7 @@ import net.minecraft.tileentity.TileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketClientState implements IMessage, IMessageHandler { @@ -43,6 +44,7 @@ public class PacketClientState implements IMessage, IMessageHandler { +public class ContainerCapBank extends ContainerEnderTileEntity { private InventoryImpl inv; diff --git a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java index 2da26264..775b166b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java +++ b/src/main/java/crazypants/enderio/machine/capbank/TileCapBank.java @@ -18,13 +18,12 @@ import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.EntityUtil; import com.enderio.core.common.util.Util; import com.enderio.core.common.vecmath.Vector3d; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java index d558128d..d3fcd648 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/CapBankNetwork.java @@ -11,11 +11,10 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.IEnergyContainerItem; - import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.RoundRobinIterator; +import cofh.api.energy.IEnergyContainerItem; import cpw.mods.fml.common.gameevent.TickEvent.ServerTickEvent; import crazypants.enderio.conduit.ConduitNetworkTickHandler; import crazypants.enderio.conduit.ConduitNetworkTickHandler.TickListener; diff --git a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java index 0072e9d6..4e49b71b 100644 --- a/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java +++ b/src/main/java/crazypants/enderio/machine/capbank/network/NetworkUtil.java @@ -10,6 +10,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.capbank.TileCapBank; public class NetworkUtil { diff --git a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java index 278f8a9b..0c2bd777 100644 --- a/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java +++ b/src/main/java/crazypants/enderio/machine/crafter/PacketCrafter.java @@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketCrafter extends MessageTileEntity implements IMessageHandler { @@ -46,9 +47,8 @@ public class PacketCrafter extends MessageTileEntity implements IMe @Override public IMessage onMessage(PacketCrafter msg, MessageContext ctx) { TileCrafter te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - msg.execute(te); - } + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + msg.execute(te); return null; } diff --git a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java index 2b9ab544..03454ed4 100644 --- a/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java +++ b/src/main/java/crazypants/enderio/machine/crusher/GuiCrusher.java @@ -7,6 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer; import org.lwjgl.opengl.GL11; import com.enderio.core.client.gui.widget.GuiToolTip; + import crazypants.enderio.machine.gui.GuiPoweredMachineBase; public class GuiCrusher extends GuiPoweredMachineBase { diff --git a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java index 328c0a5e..7f8c5e21 100644 --- a/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java +++ b/src/main/java/crazypants/enderio/machine/enchanter/ContainerEnchanter.java @@ -11,9 +11,10 @@ import net.minecraft.item.ItemStack; import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; -public class ContainerEnchanter extends ContainerEnder { +import crazypants.enderio.machine.gui.ContainerEnderTileEntity; + +public class ContainerEnchanter extends ContainerEnderTileEntity { public ContainerEnchanter(EntityPlayer player, InventoryPlayer playerInv, TileEnchanter te) { super(playerInv, te); diff --git a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java index cad1f2c2..583b88e3 100644 --- a/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java +++ b/src/main/java/crazypants/enderio/machine/farm/Fertilizer.java @@ -14,6 +14,7 @@ import net.minecraftforge.oredict.OreDictionary; import com.enderio.core.common.util.BlockCoord; import com.google.common.collect.Lists; + import cpw.mods.fml.common.registry.GameRegistry; public enum Fertilizer { diff --git a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java index 670bc857..0e62e8dc 100644 --- a/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java +++ b/src/main/java/crazypants/enderio/machine/farm/PacketFarmLockedSlot.java @@ -5,6 +5,7 @@ import com.enderio.core.common.network.MessageTileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketFarmLockedSlot extends MessageTileEntity @@ -34,9 +35,8 @@ public class PacketFarmLockedSlot extends MessageTileEntity @Override public IMessage onMessage(PacketFarmLockedSlot message, MessageContext ctx) { TileFarmStation te = message.getTileEntity(message.getWorld(ctx)); - if (te != null) { - te.toggleLockedState(message.buttonID); - } + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + te.toggleLockedState(message.buttonID); return null; } } diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java index 05e3b129..11cc88f2 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/FarmersCommune.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class FarmersCommune implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java b/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java index baa89075..b8e0d404 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/IFarmerJoe.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public interface IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java index 120c2f8e..00843549 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/MelonFarmer.java @@ -4,6 +4,7 @@ import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class MelonFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java index 54be415d..46206088 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/NetherWartFarmer.java @@ -8,6 +8,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class NetherWartFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java index 261ffe62..e0c124ef 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PickableFarmer.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.world.World; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class PickableFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java index 9c03b2d1..4d765b96 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/PlantableFarmer.java @@ -17,6 +17,7 @@ import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class PlantableFarmer implements IFarmerJoe { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java index 0bcf04f1..6b161e73 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/StemFarmer.java @@ -12,6 +12,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class StemFarmer extends CustomSeedFarmer { diff --git a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java index ab85006b..34c89f9b 100644 --- a/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java +++ b/src/main/java/crazypants/enderio/machine/farm/farmers/TreeHarvestUtil.java @@ -8,6 +8,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.farm.TileFarmStation; public class TreeHarvestUtil { diff --git a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java index 612b9e37..35815a1a 100644 --- a/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java +++ b/src/main/java/crazypants/enderio/machine/gui/AbstractMachineContainer.java @@ -11,13 +11,12 @@ import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import com.enderio.core.api.common.util.IProgressTile; -import com.enderio.core.common.ContainerEnder; import com.enderio.core.common.util.Util; import crazypants.enderio.machine.AbstractMachineEntity; import crazypants.enderio.machine.SlotDefinition; -public abstract class AbstractMachineContainer extends ContainerEnder { +public abstract class AbstractMachineContainer extends ContainerEnderTileEntity { protected Slot upgradeSlot; diff --git a/src/main/java/crazypants/enderio/machine/gui/ContainerEnderTileEntity.java b/src/main/java/crazypants/enderio/machine/gui/ContainerEnderTileEntity.java new file mode 100644 index 00000000..b578b5a8 --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/gui/ContainerEnderTileEntity.java @@ -0,0 +1,20 @@ +package crazypants.enderio.machine.gui; + +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.tileentity.TileEntity; + +import com.enderio.core.common.ContainerEnder; + +public class ContainerEnderTileEntity extends ContainerEnder + implements IContainerWithTileEntity { + + public ContainerEnderTileEntity(InventoryPlayer playerInv, T inv) { + super(playerInv, inv); + } + + @Override + public TileEntity getTileEntity() { + return getInv(); + } +} diff --git a/src/main/java/crazypants/enderio/machine/gui/IContainerWithTileEntity.java b/src/main/java/crazypants/enderio/machine/gui/IContainerWithTileEntity.java new file mode 100644 index 00000000..3a51714a --- /dev/null +++ b/src/main/java/crazypants/enderio/machine/gui/IContainerWithTileEntity.java @@ -0,0 +1,13 @@ +package crazypants.enderio.machine.gui; + +import net.minecraft.tileentity.TileEntity; + +/** + * Container implementing this interface holds TileEntity player is interacting with. + * + * @see crazypants.enderio.network.PacketUtil#isInvalidPacketForGui + */ +public interface IContainerWithTileEntity { + + TileEntity getTileEntity(); +} diff --git a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java index c3db56da..903d35d8 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/CompositeInventory.java @@ -10,6 +10,7 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.InventoryWrapper; + import crazypants.enderio.ModObject; public class CompositeInventory implements ISidedInventory { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java index 9341a554..9721c6a1 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/HyperCubeConfig.java @@ -17,6 +17,7 @@ import java.util.UUID; import org.apache.commons.io.IOUtils; import com.enderio.core.common.util.PlayerUtil; + import crazypants.enderio.Log; public class HyperCubeConfig { diff --git a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java index 2c4384da..46d40b21 100644 --- a/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java +++ b/src/main/java/crazypants/enderio/machine/hypercube/PacketClientState.java @@ -14,6 +14,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.machine.hypercube.TileHyperCube.IoMode; import crazypants.enderio.machine.hypercube.TileHyperCube.SubChannel; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketClientState implements IMessage, IMessageHandler { @@ -88,6 +89,7 @@ public class PacketClientState implements IMessage, IMessageHandler @@ -62,6 +63,7 @@ public class PacketRequestMissingItems extends MessageTileEntity @@ -38,6 +39,7 @@ public class PacketSetExtractionDisabled extends MessageTileEntity { diff --git a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java index 0e3580c9..c5b84ad1 100644 --- a/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java +++ b/src/main/java/crazypants/enderio/machine/invpanel/server/InventoryFactory.java @@ -4,12 +4,11 @@ import java.util.ArrayList; import net.minecraft.inventory.ISidedInventory; -import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; - import com.jaquadro.minecraft.storagedrawers.api.storage.IDrawerGroup; import cpw.mods.fml.common.Loader; import crazypants.enderio.conduit.item.NetworkedInventory; +import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; public abstract class InventoryFactory { diff --git a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java index 26081925..b8fe02c4 100644 --- a/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java +++ b/src/main/java/crazypants/enderio/machine/light/ElectricLightRenderer.java @@ -9,6 +9,7 @@ import net.minecraft.world.IBlockAccess; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; public class ElectricLightRenderer implements ISimpleBlockRenderingHandler { diff --git a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java index dd6741ae..fac4c834 100644 --- a/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java +++ b/src/main/java/crazypants/enderio/machine/monitor/PacketPowerMonitor.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.Log; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketPowerMonitor implements IMessage, IMessageHandler { @@ -58,6 +59,7 @@ public class PacketPowerMonitor implements IMessage, IMessageHandler implements IMessageHandler { @@ -22,6 +23,7 @@ public class PacketActivateWeather extends MessageTileEntity .getTileEntity(ctx.side.isServer() ? message.getWorld(ctx) : EnderIO.proxy.getClientWorld()); if (te != null) { if (ctx.side.isServer()) { + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; te.startTask(); } else { te.stopTask(); diff --git a/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java b/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java index 68b671ea..77c278f6 100644 --- a/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java +++ b/src/main/java/crazypants/enderio/machine/obelisk/xp/BlockExperienceObelisk.java @@ -3,7 +3,6 @@ package crazypants.enderio.machine.obelisk.xp; import java.util.Random; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; @@ -49,7 +48,7 @@ public class BlockExperienceObelisk extends BlockObeliskAbstract { @@ -62,6 +63,7 @@ public class PacketClientState implements IMessage, IMessageHandler { @@ -43,6 +44,7 @@ public class PacketMode implements IMessage, IMessageHandler @@ -35,9 +36,8 @@ public class PacketTankVoidMode extends MessageTileEntity @Override public IMessage onMessage(PacketTankVoidMode message, MessageContext ctx) { TileTank te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - te.setVoidMode(message.mode); - } + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + te.setVoidMode(message.mode); return null; } } diff --git a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java index 7421a78a..7999a7d0 100644 --- a/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java +++ b/src/main/java/crazypants/enderio/machine/tank/TankItemRenderer.java @@ -12,6 +12,7 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.BoundingBox; import com.enderio.core.client.render.CubeRenderer; import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.EnderIO; public class TankItemRenderer implements IItemRenderer { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java index 220f720b..7c4596b1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/Channel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/Channel.java @@ -3,6 +3,7 @@ package crazypants.enderio.machine.transceiver; import net.minecraft.nbt.NBTTagCompound; import com.mojang.authlib.GameProfile; + import crazypants.util.UserIdent; public class Channel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java index a3518b94..f9ac81b2 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketItemFilter.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.conduit.item.filter.ItemFilter; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketItemFilter extends MessageTileEntity @@ -52,9 +53,10 @@ public class PacketItemFilter extends MessageTileEntity public IMessage onMessage(PacketItemFilter message, MessageContext ctx) { EntityPlayer player = ctx.getServerHandler().playerEntity; TileTransceiver tile = message.getTileEntity(player.worldObj); + if (PacketUtil.isInvalidPacketForGui(ctx, tile, getClass())) return null; boolean isSend = message.isSend; ItemFilter filter = message.filter; - if (tile != null && filter != null) { + if (filter != null) { if (isSend) { tile.setSendItemFilter(filter); } else { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java index 0dbb6886..b27cbcaf 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/PacketSendRecieveChannel.java @@ -9,6 +9,7 @@ import com.enderio.core.common.network.NetworkUtil; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketSendRecieveChannel extends MessageTileEntity @@ -50,10 +51,11 @@ public class PacketSendRecieveChannel extends MessageTileEntity public IMessage onMessage(PacketSendRecieveChannel message, MessageContext ctx) { EntityPlayer player = ctx.getServerHandler().playerEntity; TileTransceiver tile = message.getTileEntity(player.worldObj); + if (PacketUtil.isInvalidPacketForGui(ctx, tile, getClass())) return null; Channel channel = message.channel; boolean isSend = message.isSend; boolean isAdd = message.isAdd; - if (tile != null && channel != null) { + if (channel != null) { if (isSend) { if (isAdd) { tile.addSendChanel(channel); diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java index 5abc26ba..c7e08b5c 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModel.java @@ -8,6 +8,7 @@ import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.machine.transceiver.TileTransceiver; public class TransceiverModel extends ModelBase implements IModel { diff --git a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java index d736802f..91e03fc1 100644 --- a/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java +++ b/src/main/java/crazypants/enderio/machine/transceiver/render/TransceiverModelAlt.java @@ -6,6 +6,7 @@ import net.minecraft.client.model.ModelRenderer; import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.machine.transceiver.TileTransceiver; public class TransceiverModelAlt extends ModelBase implements IModel { diff --git a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java index a8e1f59f..f1c42d29 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/ContainerVacuumChest.java @@ -10,10 +10,11 @@ import net.minecraft.item.ItemStack; import com.enderio.core.client.gui.widget.GhostBackgroundItemSlot; import com.enderio.core.client.gui.widget.GhostSlot; -import com.enderio.core.common.ContainerEnder; -import crazypants.enderio.EnderIO; -public class ContainerVacuumChest extends ContainerEnder { +import crazypants.enderio.EnderIO; +import crazypants.enderio.machine.gui.ContainerEnderTileEntity; + +public class ContainerVacuumChest extends ContainerEnderTileEntity { private Slot filterSlot; private Runnable filterChangedCB; diff --git a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java index e071bd27..9e3f840f 100644 --- a/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java +++ b/src/main/java/crazypants/enderio/machine/vacuum/PacketVaccumChest.java @@ -8,6 +8,7 @@ import cpw.mods.fml.common.network.ByteBufUtils; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketVaccumChest extends MessageTileEntity @@ -77,21 +78,20 @@ public class PacketVaccumChest extends MessageTileEntity @Override public IMessage onMessage(PacketVaccumChest msg, MessageContext ctx) { TileVacuumChest te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - switch (msg.cmd) { - case CMD_SET_RANGE: - te.setRange(msg.value); - break; - case CMD_SET_SLOT: - te.setItemFilterSlot(msg.value, msg.stack); - break; - case CMD_SET_BLACKLIST: - te.setFilterBlacklist(msg.value != 0); - break; - case CMD_SET_MATCHMETA: - te.setFilterMatchMeta(msg.value != 0); - break; - } + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + switch (msg.cmd) { + case CMD_SET_RANGE: + te.setRange(msg.value); + break; + case CMD_SET_SLOT: + te.setItemFilterSlot(msg.value, msg.stack); + break; + case CMD_SET_BLACKLIST: + te.setFilterBlacklist(msg.value != 0); + break; + case CMD_SET_MATCHMETA: + te.setFilterMatchMeta(msg.value != 0); + break; } return null; } diff --git a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java index 42723a7c..8e9dc28f 100644 --- a/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java +++ b/src/main/java/crazypants/enderio/machine/vat/PacketDumpTank.java @@ -7,6 +7,7 @@ import com.enderio.core.common.network.MessageTileEntity; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketDumpTank extends MessageTileEntity implements IMessageHandler { @@ -47,9 +48,8 @@ public class PacketDumpTank extends MessageTileEntity implements IMessa @Override public IMessage onMessage(PacketDumpTank message, MessageContext ctx) { TileVat te = message.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); - if (te != null) { - message.getTank(te).setFluid(null); - } + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + message.getTank(te).setFluid(null); return null; } } diff --git a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java index 4ee922dc..52adcdd7 100644 --- a/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/AlloySmelterRecipeHandler.java @@ -11,14 +11,13 @@ import net.minecraftforge.oredict.OreDictionary; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.EnderWidget; +import com.enderio.core.common.util.ItemUtil; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.ItemList; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.enderio.core.client.render.EnderWidget; -import com.enderio.core.common.util.ItemUtil; - import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.alloy.AlloyRecipeManager; import crazypants.enderio.machine.alloy.GuiAlloySmelter; diff --git a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java index 61be4a33..8ab57815 100644 --- a/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/EnchanterRecipeHandler.java @@ -15,12 +15,11 @@ import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; +import com.enderio.core.client.render.EnderWidget; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.enderio.core.client.render.EnderWidget; - import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.enchanter.EnchanterRecipe; diff --git a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java index 8235456f..739352a8 100644 --- a/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SagMillRecipeHandler.java @@ -14,13 +14,12 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.EnderWidget; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.enderio.core.client.render.EnderWidget; - import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.crusher.CrusherRecipeManager; import crazypants.enderio.machine.crusher.GrindingBall; diff --git a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java index f59fcbed..f2476a2a 100644 --- a/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SliceAndSpliceRecipeHandler.java @@ -12,12 +12,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.EnderWidget; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.enderio.core.client.render.EnderWidget; - import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; diff --git a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java index 0c312ccc..e40b2816 100644 --- a/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/SoulBinderRecipeHandler.java @@ -13,12 +13,11 @@ import net.minecraft.util.StatCollector; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.EnderWidget; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.enderio.core.client.render.EnderWidget; - import crazypants.enderio.EnderIO; import crazypants.enderio.ModObject; import crazypants.enderio.gui.GuiContainerBaseEIO; diff --git a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java index fcff9590..452fa32c 100644 --- a/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java +++ b/src/main/java/crazypants/enderio/nei/VatRecipeHandler.java @@ -13,17 +13,16 @@ import net.minecraftforge.fluids.FluidStack; import org.lwjgl.opengl.GL11; +import com.enderio.core.client.render.EnderWidget; +import com.enderio.core.client.render.RenderUtil; +import com.enderio.core.common.util.FluidUtil; + import codechicken.lib.gui.GuiDraw; import codechicken.nei.PositionedStack; import codechicken.nei.recipe.GuiCraftingRecipe; import codechicken.nei.recipe.GuiRecipe; import codechicken.nei.recipe.GuiUsageRecipe; import codechicken.nei.recipe.TemplateRecipeHandler; - -import com.enderio.core.client.render.EnderWidget; -import com.enderio.core.client.render.RenderUtil; -import com.enderio.core.common.util.FluidUtil; - import crazypants.enderio.gui.GuiContainerBaseEIO; import crazypants.enderio.gui.IconEIO; import crazypants.enderio.machine.power.PowerDisplayUtil; diff --git a/src/main/java/crazypants/enderio/network/PacketUtil.java b/src/main/java/crazypants/enderio/network/PacketUtil.java new file mode 100644 index 00000000..f01e8f7b --- /dev/null +++ b/src/main/java/crazypants/enderio/network/PacketUtil.java @@ -0,0 +1,54 @@ +package crazypants.enderio.network; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.tileentity.TileEntity; + +import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import cpw.mods.fml.relauncher.Side; +import crazypants.enderio.Log; +import crazypants.enderio.machine.gui.IContainerWithTileEntity; + +public class PacketUtil { + + /** + * Validates if TileEntity received from client is actually the one player is interacting with. It prevents + * malicious user disturbing random machine settings etc. + */ + public static boolean isInvalidPacketForGui(MessageContext ctx, TileEntity receivedTile, Class messageClass) { + if (receivedTile == null) { + // Invalid, but not harmful + return true; + } + if (ctx.side == Side.CLIENT) return false; + EntityPlayer player = ctx.getServerHandler().playerEntity; + Container container = player.openContainer; + if (!(container instanceof IContainerWithTileEntity)) { + Log.LOGGER.warn( + Log.securityMarker, + "Player {} tried to send {} while not opening correct GUI. Target TileEntity at {}, {}, {}", + player.getGameProfile(), + messageClass.getSimpleName(), + receivedTile.xCoord, + receivedTile.yCoord, + receivedTile.zCoord); + return true; + } + TileEntity expectedTile = ((IContainerWithTileEntity) container).getTileEntity(); + if (receivedTile != expectedTile) { + Log.LOGGER.warn( + Log.securityMarker, + "Player {} tried to send {} which attempts to modify setting of TileEntity at {}, {}, {}. Expected: {}, {}, {}", + player.getGameProfile(), + messageClass.getSimpleName(), + receivedTile.xCoord, + receivedTile.yCoord, + receivedTile.zCoord, + expectedTile.xCoord, + expectedTile.yCoord, + expectedTile.zCoord); + return true; + } + return false; + } +} diff --git a/src/main/java/crazypants/enderio/power/PowerDistributor.java b/src/main/java/crazypants/enderio/power/PowerDistributor.java index 0b848cff..150a6813 100644 --- a/src/main/java/crazypants/enderio/power/PowerDistributor.java +++ b/src/main/java/crazypants/enderio/power/PowerDistributor.java @@ -9,6 +9,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.util.BlockCoord; + import crazypants.enderio.machine.AbstractMachineEntity; public class PowerDistributor { diff --git a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java index b8aa3ca4..6f5d416b 100644 --- a/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java +++ b/src/main/java/crazypants/enderio/rail/RailcraftLinkUtil.java @@ -6,9 +6,6 @@ import java.util.Comparator; import java.util.List; import java.util.UUID; -import mods.railcraft.api.carts.CartTools; -import mods.railcraft.api.carts.ILinkageManager; - import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityMinecart; import net.minecraft.nbt.NBTTagCompound; @@ -17,6 +14,9 @@ import net.minecraftforge.common.util.ForgeDirection; import com.enderio.core.common.vecmath.Vector3d; +import mods.railcraft.api.carts.CartTools; +import mods.railcraft.api.carts.ILinkageManager; + public class RailcraftLinkUtil implements ICartLinkUtil { private Class directionalClass; diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java index cf89a70d..e3a457ea 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAccessable.java @@ -15,10 +15,11 @@ import com.enderio.core.common.ContainerEnder; import com.enderio.core.common.TileEntityEnder; import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.machine.gui.IContainerWithTileEntity; import crazypants.enderio.network.PacketHandler; import crazypants.enderio.teleport.packet.PacketPassword; -public class ContainerTravelAccessable extends ContainerEnder { +public class ContainerTravelAccessable extends ContainerEnder implements IContainerWithTileEntity { ITravelAccessable ta; TileEntity te; @@ -97,4 +98,9 @@ public class ContainerTravelAccessable extends ContainerEnder { } } } + + @Override + public TileEntity getTileEntity() { + return te; + } } diff --git a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java index 87bb22a8..217ab4d3 100644 --- a/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/ContainerTravelAuth.java @@ -6,13 +6,16 @@ import java.util.List; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.common.ContainerEnder; import com.enderio.core.common.util.ArrayInventory; + +import crazypants.enderio.machine.gui.IContainerWithTileEntity; import crazypants.enderio.teleport.ContainerTravelAuth.AuthInventory; -public class ContainerTravelAuth extends ContainerEnder { +public class ContainerTravelAuth extends ContainerEnder implements IContainerWithTileEntity { static class AuthInventory extends ArrayInventory { @@ -86,10 +89,12 @@ public class ContainerTravelAuth extends ContainerEnder { } } + private final TileEntity te; boolean dirty = false; - public ContainerTravelAuth(InventoryPlayer playerInv) { + public ContainerTravelAuth(InventoryPlayer playerInv, TileEntity te) { super(playerInv, new AuthInventory(new ItemStack[5])); + this.te = te; getInv().setContainer(this); } @@ -117,6 +122,11 @@ public class ContainerTravelAuth extends ContainerEnder { return null; } + @Override + public TileEntity getTileEntity() { + return te; + } + private static class AuthGhostSlot extends GhostSlot { private AuthInventory inv; diff --git a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java index 7c767669..e1d12587 100644 --- a/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java +++ b/src/main/java/crazypants/enderio/teleport/GuiTravelAuth.java @@ -5,6 +5,7 @@ import java.awt.Color; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import org.lwjgl.opengl.GL11; @@ -24,7 +25,7 @@ public class GuiTravelAuth extends GuiContainerBaseEIO { private final EntityPlayer player; public GuiTravelAuth(EntityPlayer player, ITravelAccessable te, World world) { - super(new ContainerTravelAuth(player.inventory), "travelAuth"); + super(new ContainerTravelAuth(player.inventory, (TileEntity) te), "travelAuth"); this.ta = te; title = EnderIO.lang.localize("gui.travelAccessable.enterCode"); this.player = player; diff --git a/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java index 41294f94..67ab4d34 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTeleportStaff.java @@ -84,6 +84,11 @@ public class ItemTeleportStaff extends ItemTravelStaff { // Do nothing, as we have infinite energy. } + @Override + public int canExtractInternal(ItemStack equipped, int power) { + return power; + } + @Override @SideOnly(Side.CLIENT) public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List par3List) { diff --git a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java index 86c31e82..2312fc51 100644 --- a/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java +++ b/src/main/java/crazypants/enderio/teleport/ItemTravelStaff.java @@ -10,10 +10,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -import cofh.api.energy.ItemEnergyContainer; - import com.enderio.core.api.client.gui.IResourceTooltipProvider; +import cofh.api.energy.ItemEnergyContainer; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -133,6 +132,11 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave setEnergy(item, res); } + @Override + public int canExtractInternal(ItemStack equipped, int power) { + return Math.min(getEnergyStored(equipped), power); + } + void setEnergy(ItemStack container, int energy) { if (container.stackTagCompound == null) { container.stackTagCompound = new NBTTagCompound(); @@ -178,4 +182,9 @@ public class ItemTravelStaff extends ItemEnergyContainer implements IItemOfTrave public boolean isFull3D() { return true; } + + @Override + public boolean showDurabilityBar(ItemStack stack) { + return Config.renderDurabilityBar && super.showDurabilityBar(stack); + } } diff --git a/src/main/java/crazypants/enderio/teleport/TravelController.java b/src/main/java/crazypants/enderio/teleport/TravelController.java index 70678d56..15ead85f 100644 --- a/src/main/java/crazypants/enderio/teleport/TravelController.java +++ b/src/main/java/crazypants/enderio/teleport/TravelController.java @@ -111,6 +111,47 @@ public class TravelController { } } + public boolean validatePacketTravelEvent(EntityPlayerMP toTp, int x, int y, int z, int powerUse, + boolean conserveMotion, TravelSource source) { + BlockCoord target = new BlockCoord(x, y, z); + double dist = getDistanceSquared(toTp, target); + // allow 15% overshoot to account for rounding + if (dist * 100 > source.getMaxDistanceTravelledSq() * 115) return false; + if (powerUse < getRequiredPower(toTp, source, target)) return false; + ItemStack equippedItem = toTp.getCurrentEquippedItem(); + switch (source) { + case TELEPAD: + // this source is invalid for this type of packet + return false; + case BLOCK: + // this source is only triggered when player is on any active travel anchor + BlockCoord on = getActiveTravelBlock(toTp); + if (on == null) return false; + // target must be a valid selectedCoord + // selectedCoord can either be a block right above/below when the player is on anchor... + if (on.x == x && on.z == z) return true; + // or another anchor + TileEntity maybeAnchor = target.getTileEntity(toTp.worldObj); + if (!(maybeAnchor instanceof ITravelAccessable)) return false; + ITravelAccessable anchor = (ITravelAccessable) maybeAnchor; + return anchor.canBlockBeAccessed(toTp) || !isValidTarget(toTp, target, TravelSource.BLOCK); + case STAFF: + case STAFF_BLINK: + if (equippedItem == null || !(equippedItem.getItem() instanceof IItemOfTravel)) return false; + if (!((IItemOfTravel) equippedItem.getItem()).isActive(toTp, equippedItem)) return false; + int energy = ((IItemOfTravel) equippedItem.getItem()).canExtractInternal(equippedItem, powerUse); + return energy == -1 || energy == powerUse; + case TELEPORT_STAFF_BLINK: + case TELEPORT_STAFF: + // tp staff is creative version of traveling staff + // no energy check or anything else needed + // but the player must actually be equipped with one of these + return equippedItem != null && equippedItem.getItem() instanceof ItemTeleportStaff; + default: + throw new AssertionError("unidentified travel source"); + } + } + public void addBlockToBlinkBlackList(String blockName) { blackList.add(new UniqueIdentifier(blockName)); } @@ -733,35 +774,41 @@ public class TravelController { && y <= 255; i++, y += direction) { // Circumvents the raytracing used to find candidates on the y axis - TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z); - - if (selectedBlock instanceof ITravelAccessable) { - ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock; - BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z); - - if (Config.travelAnchorSkipWarning) { - if (travelBlock.getRequiresPassword(player)) { - showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked")); - } - - if (travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE - && !travelBlock.canUiBeAccessed(player)) { - showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate")); - } - if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) { - showMessage( - player, - new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed")); - } - } - if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) { - selectedCoord = targetBlock; - return; - } + BlockCoord targetBlock = getValidVerticalTarget(player, currentBlock, world, y); + if (targetBlock != null) { + selectedCoord = targetBlock; + return; } } } + private BlockCoord getValidVerticalTarget(EntityPlayer player, BlockCoord currentBlock, World world, int y) { + TileEntity selectedBlock = world.getTileEntity(currentBlock.x, y, currentBlock.z); + + if (selectedBlock instanceof ITravelAccessable) { + ITravelAccessable travelBlock = (ITravelAccessable) selectedBlock; + BlockCoord targetBlock = new BlockCoord(currentBlock.x, y, currentBlock.z); + + if (Config.travelAnchorSkipWarning) { + if (travelBlock.getRequiresPassword(player)) { + showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipLocked")); + } + + if (travelBlock.getAccessMode() == ITravelAccessable.AccessMode.PRIVATE + && !travelBlock.canUiBeAccessed(player)) { + showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipPrivate")); + } + if (!isValidTarget(player, targetBlock, TravelSource.BLOCK)) { + showMessage(player, new ChatComponentTranslation("enderio.gui.travelAccessable.skipObstructed")); + } + } + if (travelBlock.canBlockBeAccessed(player) && isValidTarget(player, targetBlock, TravelSource.BLOCK)) { + return targetBlock; + } + } + return null; + } + @SideOnly(Side.CLIENT) private void updateSelectedTarget(EntityPlayer player) { selectedCoord = null; @@ -923,19 +970,16 @@ public class TravelController { return true; } - @SideOnly(Side.CLIENT) private BlockCoord getActiveTravelBlock(EntityPlayer player) { - World world = Minecraft.getMinecraft().theWorld; - if (world != null && player != null) { - int x = MathHelper.floor_double(player.posX); - int y = MathHelper.floor_double(player.boundingBox.minY) - 1; - int z = MathHelper.floor_double(player.posZ); - TileEntity tileEntity = world.getTileEntity(x, y, z); - if (tileEntity instanceof ITravelAccessable) { - if (((ITravelAccessable) tileEntity).isTravelSource()) { - return new BlockCoord(x, y, z); - } - } + if (player == null) return null; + World world = player.worldObj; + if (world == null) return null; + int x = MathHelper.floor_double(player.posX); + int y = MathHelper.floor_double(player.boundingBox.minY) - 1; + int z = MathHelper.floor_double(player.posZ); + TileEntity tileEntity = world.getTileEntity(x, y, z); + if (tileEntity instanceof ITravelAccessable && ((ITravelAccessable) tileEntity).isTravelSource()) { + return new BlockCoord(x, y, z); } return null; } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index 23512180..d1dee927 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -181,7 +181,7 @@ public class BlockTravelAnchor extends BlockEio if (ID == GuiHandler.GUI_ID_TRAVEL_ACCESSABLE) { return new ContainerTravelAccessable(player.inventory, (ITravelAccessable) te, world); } else { - return new ContainerTravelAuth(player.inventory); + return new ContainerTravelAuth(player.inventory, te); } } return null; diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java index 58f2112e..fe6ce082 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketAccessMode.java @@ -7,6 +7,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.network.PacketUtil; import crazypants.enderio.teleport.anchor.TileTravelAnchor; import io.netty.buffer.ByteBuf; @@ -48,6 +49,7 @@ public class PacketAccessMode implements IMessage, IMessageHandler { @@ -55,6 +56,7 @@ public class PacketLabel implements IMessage, IMessageHandler travelDestination = TravelController.instance.findTravelDestination(player, source); @@ -77,6 +113,14 @@ public class PacketLongDistanceTravelEvent if (powerUse < 0) { return false; } + if (player != null && player.getCurrentEquippedItem() != null + && player.getCurrentEquippedItem().getItem() instanceof IItemOfTravel) { + int used = ((IItemOfTravel) player.getCurrentEquippedItem().getItem()) + .canExtractInternal(player.getCurrentEquippedItem(), powerUse); + if (used != -1 && used != powerUse) { + return false; + } + } TeleportEntityEvent evt = new TeleportEntityEvent(toTp, source, x, y, z); if (MinecraftForge.EVENT_BUS.post(evt)) { diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java b/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java index 67983fd3..323a5b7e 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketPassword.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.api.teleport.ITravelAccessable; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketPassword extends MessageTileEntity { @@ -61,6 +62,7 @@ public class PacketPassword extends MessageTileEntity { @Override public IMessage onMessage(PacketPassword msg, MessageContext ctx) { TileEntityEnder te = msg.getTileEntity(ctx.getServerHandler().playerEntity.worldObj); + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; if (te instanceof ITravelAccessable) { if (((ITravelAccessable) te).canUiBeAccessed(ctx.getServerHandler().playerEntity)) { if (msg.stack != null) { diff --git a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java index a38d8680..fb142639 100644 --- a/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java +++ b/src/main/java/crazypants/enderio/teleport/packet/PacketTravelEvent.java @@ -13,9 +13,11 @@ import com.enderio.core.common.vecmath.Vector3d; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import crazypants.enderio.Log; import crazypants.enderio.api.teleport.IItemOfTravel; import crazypants.enderio.api.teleport.TeleportEntityEvent; import crazypants.enderio.api.teleport.TravelSource; +import crazypants.enderio.teleport.TravelController; import io.netty.buffer.ByteBuf; public class PacketTravelEvent implements IMessage, IMessageHandler { @@ -65,13 +67,31 @@ public class PacketTravelEvent implements IMessage, IMessageHandler { @@ -44,6 +45,7 @@ public class PacketVisibility implements IMessage, IMessageHandler { +import crazypants.enderio.machine.gui.IContainerWithTileEntity; - public ContainerTelePad(InventoryPlayer playerInv) { +public class ContainerTelePad extends ContainerEnder implements IContainerWithTileEntity { + + private final TileTelePad te; + + public ContainerTelePad(InventoryPlayer playerInv, TileTelePad te) { super(playerInv, playerInv); + this.te = te; } @Override @@ -19,4 +25,9 @@ public class ContainerTelePad extends ContainerEnder { p.translate(0, 34); return p; } + + @Override + public TileEntity getTileEntity() { + return te; + } } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java index 74ad183c..0809e57a 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/GuiTelePad.java @@ -51,7 +51,7 @@ public class GuiTelePad extends GuiContainerBaseEIO implements IToggleableGui { public static int SWITCH_X = 155, SWITCH_Y = 5; public GuiTelePad(InventoryPlayer playerInv, TileTelePad te, World world) { - super(new ContainerTelePad(playerInv), "telePad"); + super(new ContainerTelePad(playerInv, te), "telePad"); this.world = world; this.te = te; ySize += 34; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java index d9a01687..6c319c70 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/PacketTeleport.java @@ -1,7 +1,6 @@ package crazypants.enderio.teleport.telepad; import net.minecraft.entity.Entity; -import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import com.enderio.core.common.network.MessageTileEntity; @@ -10,6 +9,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import crazypants.enderio.EnderIO; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketTeleport extends MessageTileEntity @@ -60,20 +60,19 @@ public class PacketTeleport extends MessageTileEntity @Override public IMessage onMessage(PacketTeleport message, MessageContext ctx) { World world = ctx.side.isClient() ? EnderIO.proxy.getClientWorld() : message.getWorld(ctx); - TileEntity te = message.getTileEntity(world); - if (te instanceof TileTelePad) { - Entity e = world.getEntityByID(message.entityId); - switch (message.type) { - case BEGIN: - ((TileTelePad) te).enqueueTeleport(e, false); - break; - case END: - ((TileTelePad) te).dequeueTeleport(e, false); - break; - case TELEPORT: - ((TileTelePad) te).wasBlocked = message.wasBlocked; - break; - } + TileTelePad te = message.getTileEntity(world); + if (PacketUtil.isInvalidPacketForGui(ctx, te, getClass())) return null; + Entity e = world.getEntityByID(message.entityId); + switch (message.type) { + case BEGIN: + te.enqueueTeleport(e, false); + break; + case END: + te.dequeueTeleport(e, false); + break; + case TELEPORT: + te.wasBlocked = message.wasBlocked; + break; } return null; } diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java index 79dfe14a..d4d23c3e 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TelePadRenderer.java @@ -16,6 +16,7 @@ import com.enderio.core.client.render.TechneModelRenderer; import com.enderio.core.client.render.TechneUtil; import com.enderio.core.common.util.BlockCoord; import com.google.common.collect.Lists; + import crazypants.enderio.EnderIO; public class TelePadRenderer extends TechneModelRenderer { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java index 76f37078..cbd31202 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TeleportEntityRenderHandler.java @@ -11,6 +11,7 @@ import net.minecraftforge.client.event.RenderLivingEvent; import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.RenderUtil; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; public class TeleportEntityRenderHandler { diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 81de1cec..9495e348 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -23,8 +23,6 @@ import net.minecraft.world.World; import net.minecraft.world.WorldServer; import net.minecraftforge.common.util.ForgeDirection; -import cofh.api.energy.EnergyStorage; - import com.enderio.core.api.common.util.IProgressTile; import com.enderio.core.common.util.BlockCoord; import com.enderio.core.common.util.Util; @@ -32,6 +30,7 @@ import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Queues; +import cofh.api.energy.EnergyStorage; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java b/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java index 3c704208..7a6e8ea4 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ToggleTravelButton.java @@ -3,6 +3,7 @@ package crazypants.enderio.teleport.telepad; import net.minecraft.client.Minecraft; import com.enderio.core.client.gui.button.IconButton; + import crazypants.enderio.gui.IconEIO; public class ToggleTravelButton extends IconButton { diff --git a/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java b/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java index f8e7d1a1..40ed1999 100644 --- a/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java +++ b/src/main/java/crazypants/enderio/thaumcraft/ThaumcraftCompat.java @@ -10,10 +10,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; -import thaumcraft.api.ThaumcraftApi; -import thaumcraft.api.ThaumcraftApiHelper; -import thaumcraft.api.aspects.Aspect; -import thaumcraft.api.aspects.AspectList; import cpw.mods.fml.common.Loader; import crazypants.enderio.EnderIO; import crazypants.enderio.item.darksteel.upgrade.IDarkSteelUpgrade; @@ -23,6 +19,10 @@ import crazypants.enderio.material.BlockFusedQuartz; import crazypants.enderio.material.FrankenSkull; import crazypants.enderio.material.Material; import crazypants.enderio.power.Capacitors; +import thaumcraft.api.ThaumcraftApi; +import thaumcraft.api.ThaumcraftApiHelper; +import thaumcraft.api.aspects.Aspect; +import thaumcraft.api.aspects.AspectList; public class ThaumcraftCompat { diff --git a/src/main/java/crazypants/enderio/waila/WailaCompat.java b/src/main/java/crazypants/enderio/waila/WailaCompat.java index 5543a3b0..78016c3a 100644 --- a/src/main/java/crazypants/enderio/waila/WailaCompat.java +++ b/src/main/java/crazypants/enderio/waila/WailaCompat.java @@ -6,13 +6,6 @@ import java.text.MessageFormat; import java.util.List; import java.util.Locale; -import mcp.mobius.waila.api.ITaggedList; -import mcp.mobius.waila.api.IWailaConfigHandler; -import mcp.mobius.waila.api.IWailaDataAccessor; -import mcp.mobius.waila.api.IWailaDataProvider; -import mcp.mobius.waila.api.IWailaRegistrar; -import mcp.mobius.waila.api.impl.ConfigHandler; - import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -50,6 +43,12 @@ import crazypants.enderio.machine.invpanel.TileInventoryPanel; import crazypants.enderio.machine.power.PowerDisplayUtil; import crazypants.enderio.power.IInternalPoweredTile; import crazypants.util.IFacade; +import mcp.mobius.waila.api.ITaggedList; +import mcp.mobius.waila.api.IWailaConfigHandler; +import mcp.mobius.waila.api.IWailaDataAccessor; +import mcp.mobius.waila.api.IWailaDataProvider; +import mcp.mobius.waila.api.IWailaRegistrar; +import mcp.mobius.waila.api.impl.ConfigHandler; public class WailaCompat implements IWailaDataProvider { diff --git a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java index a73329db..0d602df1 100644 --- a/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java +++ b/src/main/java/crazypants/enderio/xp/ExperienceBarRenderer.java @@ -8,6 +8,7 @@ import org.lwjgl.opengl.GL11; import com.enderio.core.client.render.ColorUtil; import com.enderio.core.client.render.RenderUtil; + import crazypants.enderio.gui.IconEIO; public class ExperienceBarRenderer { diff --git a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java index a9054724..5ca0e1d2 100644 --- a/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketDrainPlayerXP.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketDrainPlayerXP extends MessageTileEntity @@ -57,6 +58,7 @@ public class PacketDrainPlayerXP extends MessageTileEntity public IMessage onMessage(PacketDrainPlayerXP message, MessageContext ctx) { EntityPlayer player = ctx.getServerHandler().playerEntity; TileEntity tile = message.getTileEntity(player.worldObj); + if (PacketUtil.isInvalidPacketForGui(ctx, tile, getClass())) return null; if (tile instanceof IHaveExperience) { IHaveExperience xpTile = (IHaveExperience) tile; if (player.capabilities.isCreativeMode && message.isContainerLevel) { diff --git a/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java b/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java index 455d3948..dcf40126 100644 --- a/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java +++ b/src/main/java/crazypants/enderio/xp/PacketGivePlayerXP.java @@ -10,6 +10,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import cpw.mods.fml.relauncher.Side; import crazypants.enderio.network.PacketHandler; +import crazypants.enderio.network.PacketUtil; import io.netty.buffer.ByteBuf; public class PacketGivePlayerXP extends MessageTileEntity @@ -53,6 +54,7 @@ public class PacketGivePlayerXP extends MessageTileEntity public IMessage onMessage(PacketGivePlayerXP message, MessageContext ctx) { EntityPlayer player = ctx.getServerHandler().playerEntity; TileEntity tile = message.getTileEntity(player.worldObj); + if (PacketUtil.isInvalidPacketForGui(ctx, tile, getClass())) return null; if (tile instanceof IHaveExperience) { IHaveExperience xpTile = (IHaveExperience) tile; xpTile.getContainer().givePlayerXp(player, message.levels); diff --git a/src/main/java/crazypants/util/BuildcraftUtil.java b/src/main/java/crazypants/util/BuildcraftUtil.java index bc92be9b..9175b903 100644 --- a/src/main/java/crazypants/util/BuildcraftUtil.java +++ b/src/main/java/crazypants/util/BuildcraftUtil.java @@ -4,14 +4,14 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.IFluidHandler; -import buildcraft.api.transport.IPipeTile; -import buildcraft.api.transport.IPipeTile.PipeType; - import com.enderio.core.api.common.util.IFluidReceptor; import com.enderio.core.api.common.util.IItemReceptor; import com.enderio.core.common.util.FluidUtil; import com.enderio.core.common.util.ItemUtil; +import buildcraft.api.transport.IPipeTile; +import buildcraft.api.transport.IPipeTile.PipeType; + public class BuildcraftUtil implements IItemReceptor, IFluidReceptor { static {